diff --git a/uppsrc/Draw/SImageDraw.cpp b/uppsrc/Draw/SImageDraw.cpp
index 259f5a293..c279f4aa7 100644
--- a/uppsrc/Draw/SImageDraw.cpp
+++ b/uppsrc/Draw/SImageDraw.cpp
@@ -33,10 +33,10 @@ SImageDraw::operator Image() const
 {
 	ImageBuffer b(ib.GetSize());
 	memcpy(b, ib.Begin(), sizeof(RGBA) * ib.GetLength());
-	const RGBA *s = alpha.ib.Begin();
 	RGBA *t = b;
 	const RGBA *e = b.End();;
 	if(has_alpha) {
+		const RGBA *s = alpha.ib.Begin();
 		while(t < e) {
 			t->a = s->r;
 			t++;
@@ -57,11 +57,13 @@ SImageDraw::operator Image() const
 
 SImageDraw::SImageDraw(Size sz)
 {
+	has_alpha = false;
 	SImageDraw1::Create(sz);
 }
 
 SImageDraw::SImageDraw(int cx, int cy)
 {
+	has_alpha = false;
 	SImageDraw1::Create(Size(cx, cy));
 }
 
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index e0ea0587c..ed674dab4 100644
Binary files a/uppsrc/ide/icon.ico and b/uppsrc/ide/icon.ico differ
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 49d47f3bb..a041da940 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -374,14 +374,14 @@ void Ide::FilePropertiesMenu(Bar& menu)
 	menu.MenuSeparator();
 	menu.Add(IsActiveFile(), AK_FILEPROPERTIES, THISBACK(FileProperties))
 		.Help("File properties stored in package");
-	menu.Add(IsActiveFile(), AK_SAVEENCODING, THISBACK(ChangeCharset))
+	menu.Add(IsActiveFile() && !designer, AK_SAVEENCODING, THISBACK(ChangeCharset))
 	    .Help("Convert actual file to different encoding");
-	menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_DIFF, IdeImg::Diff(), THISBACK(Diff))
+	menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_DIFF, IdeImg::Diff(), THISBACK(Diff))
 	    .Help("Show differences between the project and arbitrary files");
-	menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_PATCH, IdeImg::Patch(), THISBACK(Patch))
+	menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_PATCH, IdeImg::Patch(), THISBACK(Patch))
 	    .Help("Show differences with patch file applied");
 	if(IsSvnDir(GetFileFolder(editfile)))
-		menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
+		menu.AddMenu(IsActiveFile() && !IsFolder(editfile) && !designer, AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
 		    .Help("Show svn history of file");
 }