diff --git a/uppsrc/CtrlLib/Button.cpp b/uppsrc/CtrlLib/Button.cpp
index 5b0c67a4d..cd20ba322 100644
--- a/uppsrc/CtrlLib/Button.cpp
+++ b/uppsrc/CtrlLib/Button.cpp
@@ -636,19 +636,56 @@ void ButtonOption::Serialize(Stream& s) {
 }
 
 void  ButtonOption::Paint(Draw& w) {
+	const Style *st;
+	if (style)
+		st = style;
+	else
+		st = &StyleDefault();
+	
 	Size sz = GetSize();
-	Size isz = image.GetSize();
-	Rect r = sz;
+	bool ds = !IsShowEnabled();
+	DrawLabel dl;
+	dl.text = label;
+	dl.font = StdFont();
+	dl.limg = DisabledImage((option && !IsNull(image1)) ? image1 : image, !IsEnabled());
+	dl.disabled = ds;
+	dl.lspc = !label.IsEmpty() && !image.IsEmpty() ? 4 : 0;
+	if(VisibleAccessKeys() && IsEnabled())
+		dl.accesskey = accesskey;
 	int i = !IsShowEnabled() ? CTRL_DISABLED :
 	         push ? CTRL_PRESSED :
 	         HasMouse() || HasFocus() ? CTRL_HOT :
 	         CTRL_NORMAL;
 	if(option) i = CTRL_PRESSED;
-	ChPaint(w, sz, style ? style->look[i] : GetButtonStyle(this)->look[i]);
-	Point p = r.CenterPos(image.GetSize());
-	w.DrawImage(p.x, p.y, DisabledImage((option && !IsNull(image1)) ? image1 : image, !IsEnabled()));
+	ChPaint(w, sz, st->look[i]);
+	dl.ink = st->textcolor[i];
+	dl.Paint(w, 3, 3, sz.cx - 6, sz.cy - 6, true);
+	if(HasFocus() && st->drawfocus)
+		DrawFocus(w, Rect(sz).Deflated(3));
 }
 
+CH_STYLE(ButtonOption, Style, StyleDefault)
+{
+	const Button::Style& bs = Button::StyleNormal(); 
+	for (int i = 0; i < 4; i++)
+	{
+		look[i] = bs.look[i];
+		textcolor[i] = bs.textcolor[i];
+	}
+	drawfocus = false;
+}
+
+CH_STYLE(ButtonOption, Style, StyleFlat)
+{
+	const ToolButton::Style& tbs = ToolButton::StyleDefault(); 
+	for (int i = 0; i < 4; i++)
+	{
+		look[i] = tbs.look[i];
+		textcolor[i] = tbs.textcolor[i];
+	}
+	drawfocus = false;
+}
+	
 void  ButtonOption::LeftDown(Point, dword) {
 	push = true;
 	Refresh();
@@ -688,6 +725,27 @@ Value ButtonOption::GetData() const
 	return (int)Get();
 }
 
+dword ButtonOption::GetAccessKeys() const
+{
+	return AccessKeyBit(accesskey);
+}
+
+void  ButtonOption::AssignAccessKeys(dword used)
+{
+	if(!accesskey) {
+		accesskey = ChooseAccessKey(label, used);
+		if(accesskey) Refresh();
+		used |= AccessKeyBit(accesskey);
+	}
+	Ctrl::AssignAccessKeys(used);
+}
+
+ButtonOption& ButtonOption::SetLabel(const String& text) {
+	accesskey = ExtractAccessKey(text, label);
+	Refresh();
+	return *this;
+}
+
 // --------------------
 
 DataPusher::DataPusher()
diff --git a/uppsrc/CtrlLib/Prompt.cpp b/uppsrc/CtrlLib/Prompt.cpp
index d9ab2d904..6e02e11d2 100644
--- a/uppsrc/CtrlLib/Prompt.cpp
+++ b/uppsrc/CtrlLib/Prompt.cpp
@@ -110,7 +110,7 @@ int Prompt(Callback1<const String&> WhenLink,
 	Vector<Ctrl *> wins = Ctrl::GetTopWindows();
 	for(int i = 0; i < wins.GetCount(); i++) {
 		TopWindow *w = dynamic_cast<TopWindow *>(wins[i]);
-		if(w && w->GetScreenRect().Intersects(dlg.GetScreenRect()) && w->IsTopMost()) {
+		if(w && w->IsTopMost()) {
 			dlg.TopMost();
 			break;
 		}
diff --git a/uppsrc/CtrlLib/PushCtrl.h b/uppsrc/CtrlLib/PushCtrl.h
index 5360719cd..ef06d592c 100644
--- a/uppsrc/CtrlLib/PushCtrl.h
+++ b/uppsrc/CtrlLib/PushCtrl.h
@@ -207,30 +207,42 @@ public:
 	virtual void  SetData(const Value& v);
 	virtual Value GetData() const;
 	virtual void  Serialize(Stream& s);
+	virtual dword GetAccessKeys() const;
+	virtual void  AssignAccessKeys(dword used);
 
 public:
 	struct Style : ChStyle<Style> {
 		Value look[4];
+		Color textcolor[4];
+		bool  drawfocus;
 	};
 
 private:
 	Image        image;
 	Image        image1;
+	String       label;
 	const Style *style;
 	bool         option;
 	bool         push;
+	byte         accesskey;
 
 public:
 	ButtonOption&  SetImage(const Image& img)                 { image = img; Refresh(); return *this; }
 	ButtonOption&  SetImage(const Image& m, const Image& m1)  { image = m; image1 = m1; Refresh(); return *this; }
 	void operator=(const Image& img)                          { SetImage(img); }
-
+	
+	ButtonOption& SetLabel(const String& text);
+	String GetLabel() const                                   { return label; }        
+	
 	void Set(bool b)                                          { option = b; UpdateRefresh(); }
 	bool Get() const                                          { return option; }
 
 	void operator=(bool b)                                    { Set(b); }
 	operator bool() const                                     { return Get(); }
 
+	static const Style& StyleDefault();
+	static const Style& StyleFlat();
+	
 	ButtonOption& SetStyle(const Style& s)                    { style = &s; Refresh(); return *this; }
 	ButtonOption& AutoStyle()                                 { style = NULL; Refresh(); return *this; }
 
diff --git a/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp b/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp
index 5d9acb717..83727ba67 100644
--- a/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp
+++ b/uppsrc/CtrlLib/src.tpp/Pusher$en-us.tpp
@@ -72,8 +72,8 @@ It should be used as reaction to accelerator key by derived class.&]
 [s3;%% &]
 [s4; &]
 [s5;:Pusher`:`:FinishPush`(`): [@(0.0.255) bool]_[* FinishPush]()&]
-[s7;%% [*/ Return value]-|Forces end of pushed state and invokes PerformAction 
-method (default implementation invokes standard WhenAction callback).&]
+[s2;%% Forces end of pushed state and invokes PerformAction method 
+(default implementation invokes standard WhenAction callback).&]
 [s3;%% &]
 [s4;%% &]
 [s5;:Pusher`:`:RefreshPush`(`): [@(0.0.255) virtual] [@(0.0.255) void]_[* RefreshPush]()&]
diff --git a/uppsrc/TextDiffCtrl/DiffCtrl.cpp b/uppsrc/TextDiffCtrl/DiffCtrl.cpp
index a6f083709..31587d1bf 100644
--- a/uppsrc/TextDiffCtrl/DiffCtrl.cpp
+++ b/uppsrc/TextDiffCtrl/DiffCtrl.cpp
@@ -8,9 +8,8 @@ TextDiffCtrl::TextDiffCtrl()
 	right.NoGutter();
 	Horz(left, right);
 	left.WhenScroll = right.ScrollWhen(left);
-	right.HideSb();
 	right.WhenScroll = left.ScrollWhen(right);
-//	compright.NumberBgColor(HistoryBg());
+	right.HideSb();
 }
 
 static bool SmallDiff(const char *s1, const char *s2)
diff --git a/uppsrc/TextDiffCtrl/TextCtrl.cpp b/uppsrc/TextDiffCtrl/TextCtrl.cpp
index 05b3ba20c..0e2f306af 100644
--- a/uppsrc/TextDiffCtrl/TextCtrl.cpp
+++ b/uppsrc/TextDiffCtrl/TextCtrl.cpp
@@ -142,17 +142,18 @@ void TextCompareCtrl::Paint(Draw& draw)
 	if(gutter_width > 0)
 	{
 		int t = 0, b = 0;
+		int gx = sz.cx - gutter_width;
 		for(int i = 0; i < lcnt; i++)
 			if(lines[i].level > 1) {
 				b = idivceil(sz.cy * i, lcnt);
 				if(b >= t) {
-					draw.DrawRect(0, t, gutter_width, b - t, gutter_bg);
-					draw.DrawRect(0, b, gutter_width, 1, gutter_fg);
+					draw.DrawRect(gx, t, gutter_width, b - t, gutter_bg);
+					draw.DrawRect(gx, b, gutter_width, 1, gutter_fg);
 					t = b + 1;
 				}
 			}
 
-		draw.DrawRect(0, t, gutter_width, sz.cy - t, gutter_bg);
+		draw.DrawRect(gx, t, gutter_width, sz.cy - t, gutter_bg);
 
 		int total = letter.cy * lcnt;
 		if(total <= 0)
@@ -160,30 +161,30 @@ void TextCompareCtrl::Paint(Draw& draw)
 		int page_height = (sz.cy * sz.cy) / total;
 		int ty = max(0, (sz.cy * offset.cy) / total);
 		int by = min(sz.cy, ty + page_height);
-		draw.DrawRect(0, ty, gutter_width, 2, Black);
-		draw.DrawRect(0, by - 2, gutter_width, 2, Black);
-		draw.DrawRect(0, ty, 2, by - ty, Black);
-		draw.DrawRect(gutter_width - 2, ty, 2, by - ty, Black);
+		draw.DrawRect(gx, ty, gutter_width, 2, Black);
+		draw.DrawRect(gx, by - 2, gutter_width, 2, Black);
+		draw.DrawRect(gx, ty, 2, by - ty, Black);
+		draw.DrawRect(gx + gutter_width - 2, ty, 2, by - ty, Black);
 	}
 
 	Font ifont = Font(font).Italic();
 	for(int i = first_line; i <= last_line; i++) {
 		const Line& l = lines[i];
 		int y = i * letter.cy - offset.cy;
-		draw.DrawRect(gutter_width, y, number_width, letter.cy, number_bg);
+		draw.DrawRect(0, y, number_width, letter.cy, number_bg);
 		if(!IsNull(l.number))
-			draw.DrawText(gutter_width, y + number_yshift, FormatInt(l.number), number_font, l.color);
+			draw.DrawText(0, y + number_yshift, FormatInt(l.number), number_font, l.color);
 	}
-	draw.Clip(gutter_width + number_width, 0, sz.cx - gutter_width - number_width, sz.cy);
+	draw.Clip(number_width, 0, sz.cx - gutter_width - number_width, sz.cy);
 	for(int i = first_line; i <= last_line; i++) {
 		const Line& l = lines[i];
 		int y = i * letter.cy - offset.cy;
 		draw.DrawRect(0, y, sz.cx, letter.cy, SWhite());
-		draw.DrawText(gutter_width + number_width - offset.cx, y, ExpandTabs(l.text), l.level == 1 ? ifont : font, l.color);
+		draw.DrawText(number_width - offset.cx, y, ExpandTabs(l.text), l.level == 1 ? ifont : font, l.color);
 	}
-	draw.End();
 	int lcy = lcnt * letter.cy - offset.cy;
-	draw.DrawRect(gutter_width, lcy, sz.cx, sz.cy - lcy, SGray());
+	draw.DrawRect(0, lcy, sz.cx, sz.cy - lcy, SGray());
+	draw.End();
 }
 
 void TextCompareCtrl::TabSize(int t)
diff --git a/uppsrc/ide/Builders/MscBuilder.cpp b/uppsrc/ide/Builders/MscBuilder.cpp
index 73dd7aa2e..2641e4914 100644
--- a/uppsrc/ide/Builders/MscBuilder.cpp
+++ b/uppsrc/ide/Builders/MscBuilder.cpp
@@ -380,7 +380,7 @@ bool MscBuilder::BuildPackage(const String& package, Vector<String>& linkfile, S
 					if(HasAnyDebug())
 						lib << " -debug -OPT:NOREF";
 					else
-						lib << " -release -OPT:REF,ICF,NOWIN98";
+						lib << " -release -OPT:REF,ICF";
 					if(IsMscArm())
 						lib <<  " -subsystem:windowsce,4.20 /ARMPADCODE";
 					else
diff --git a/uppsrc/ide/Diff.cpp b/uppsrc/ide/Diff.cpp
index 496f5be10..3da0c0eee 100644
--- a/uppsrc/ide/Diff.cpp
+++ b/uppsrc/ide/Diff.cpp
@@ -65,7 +65,7 @@ DiffDlg::DiffDlg()
 struct FileDiff : DiffDlg {
 	FrameTop<DataPusher> r;
 	
-	void Open();
+	virtual void Open();
 	void Execute(const String& f);
 	
 	typedef FileDiff CLASSNAME;
@@ -107,6 +107,127 @@ void Ide::Diff()
 	dlg.Execute(editfile);
 }
 
+FileSel& DiffFs() {
+	static FileSel fs;
+	ONCELOCK {
+		fs.Type("Patch file (*.diff, *.patch)", "*.diff *.patch");
+		fs.AllFilesType();
+	}
+	return fs;
+}
+
+struct PatchDiff : FileDiff {
+	virtual void Open();
+	
+	void Copy(FileIn& in, FileIn& oin, int& l, int ln, int n);
+	void LoadDiff(const char *fn);
+};
+
+void PatchDiff::Copy(FileIn& in, FileIn& oin, int& l, int ln, int n)
+{
+	if(ln < l)
+		throw CParser::Error("");
+	while(l < ln) {
+		if(oin.IsEof())
+			throw CParser::Error("");
+		extfile << oin.GetLine() << "\r\n";
+		l++;
+	}
+	l += n;
+	while(n--)
+		oin.GetLine();
+}
+
+void PatchDiff::LoadDiff(const char *fn)
+{
+	try {
+		FileIn in(fn);
+		FileIn oin(editfile);
+		extfile.Clear();
+		int l = 1;
+		String s = in.GetLine();
+		if(IsDigit(*s)) {
+			in.Seek(0);
+			while(!in.IsEof()) {
+				s = in.GetLine();
+				if(IsDigit(*s)) {
+					CParser p(s);
+					int ln = p.ReadNumber();
+					int n = 0;
+					if(p.Char('a'))
+						ln++;
+					else {
+						n = p.Char(',') ? p.ReadNumber() - ln + 1 : 1;
+						if(!p.Char('c'))
+							p.PassChar('d');
+					}
+					Copy(in, oin, l, ln, n);
+				}
+				else
+				if(*s == '>') {
+					if(s[1] != ' ')
+						throw CParser::Error("");
+					extfile << s.Mid(2) << "\r\n";
+				}
+				else
+				if(*s != '<' && *s != '-')
+					throw CParser::Error("");
+			}
+		}
+		else {
+			for(;;) {
+				if(in.IsEof())
+					throw CParser::Error("");
+				if(in.GetLine().Mid(0, 4) == "+++ ")
+					break;
+			}
+			while(!in.IsEof()) {
+				String s = in.GetLine();
+				if(*s == '@') {
+					CParser p(s);
+					p.PassChar2('@', '@');
+					p.PassChar('-');
+					int ln = p.ReadNumber();
+					int n = 1;
+					if(p.Char(','))
+						n = p.ReadNumber();
+					Copy(in, oin, l, ln, n);
+				}
+				else
+				if(*s == '+' || *s == ' ')
+					extfile << s.Mid(1) << "\r\n";
+				else
+				if(*s != '-')
+					throw CParser::Error("");
+			}
+		}
+		while(!oin.IsEof())
+			extfile << oin.GetLine() << "\r\n";
+	}
+	catch(CParser::Error&) {
+		Exclamation("Invalid file format!");
+		extfile = LoadFile(fn);
+	}
+}
+
+void PatchDiff::Open()
+{
+	if(!DiffFs().ExecuteOpen())
+		return;
+	String f = ~DiffFs();
+	r <<= f;
+	LoadDiff(f);
+	diff.Set(LoadFile(editfile), extfile);
+}
+
+void Ide::Patch()
+{
+	if(IsNull(editfile))
+		return;
+	PatchDiff dlg;
+	dlg.Execute(editfile);	
+}
+
 struct SvnDiff : DiffDlg {
 	FrameTop<DropList> r;
 	
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index ed674dab4..c4b629f3c 100644
Binary files a/uppsrc/ide/icon.ico and b/uppsrc/ide/icon.ico differ
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index b09cf4cde..636ec38db 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -362,6 +362,7 @@ String ResolveTParam(const String& type, const Vector<String>& tparam);
 void   ResolveTParam(Vector<String>& type, const Vector<String>& tparam);
 String Qualify(const String& scope, const String& type);
 int    CharFilterMacro(int c);
+FileSel& DiffFs();
 
 struct AssistEditor : CodeEditor {
 	virtual bool Key(dword key, int count);
@@ -861,6 +862,7 @@ public:
 		void   GoOpposite();
 		void   Print();
 		void   Diff();
+		void   Patch();
 		void   SvnHistory();
 
 	void      Edit(Bar& menu);
diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml
index b6539509d..7c4142e14 100644
--- a/uppsrc/ide/ide.iml
+++ b/uppsrc/ide/ide.iml
@@ -71,7 +71,7 @@ IMAGE_ID(svn)
 IMAGE_ID(svn_dir)
 IMAGE_ID(Diff)
 IMAGE_ID(SvnDiff)
-IMAGE_ID(DiffDiff)
+IMAGE_ID(Patch)
 
 IMAGE_BEGIN_DATA
 IMAGE_DATA(120,156,237,152,77,210,155,48,12,134,125,129,206,124,187,206,116,213,235,244,84,229,68,61,67,206,145,35,116,217,46,187)
diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key
index 74df4dac5..4510e723a 100644
--- a/uppsrc/ide/ide.key
+++ b/uppsrc/ide/ide.key
@@ -99,3 +99,4 @@ KEY(SWAPCASE, "Swap case", 0)
 
 KEY(DIFF, "Compare with file..", 0)
 KEY(SVNDIFF, "Show svn history of file..", 0)
+KEY(PATCH, "Patch/diff..", 0)
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 538ae38d8..07371bb94 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -344,8 +344,10 @@ void Ide::FilePropertiesMenu(Bar& menu)
 	    .Help("Convert actual file to different encoding");
 	menu.AddMenu(IsActiveFile() && !IsFolder(editfile), 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))
+	    .Help("Show differences with patch file applied");
 	if(IsSvnDir(GetFileFolder(editfile)))
-		menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_SVNDIFF, IdeImg::Diff(), THISBACK(SvnHistory))
+		menu.AddMenu(IsActiveFile() && !IsFolder(editfile), AK_SVNDIFF, IdeImg::SvnDiff(), THISBACK(SvnHistory))
 		    .Help("Show svn history of file");
 }
 
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index a79deabae..d41ad7a05 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -80,7 +80,7 @@ void Ide::ConsolePaste()
 }
 
 void Ide::Serialize(Stream& s) {
-	int version = 11;
+	int version = 12;
 	s.Magic(0x1234);
 	s / version;
 	s % main;
@@ -182,6 +182,8 @@ void Ide::Serialize(Stream& s) {
 		String d;
 		s % d;
 	}
+	if(version >= 12)
+		s % DiffFs();
 	s.Magic();
 }