diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index c28038669d..137c28ac43 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -871,15 +871,15 @@
 						<ToolbarItem id = "SteppingSeparator" type = "Separator"  />
 						<ToolbarItem id      = "Step over"
 						             icon    = "Icons.16x16.Debug.StepOver"
-						             tooltip = "Step over"
+						             tooltip = "${res:XML.MainMenu.DebugMenu.StepOver.Description}"
 						             class   = "ICSharpCode.SharpDevelop.Project.Commands.StepDebuggingCommand"/>
 						<ToolbarItem id      = "Step into"
 						             icon    = "Icons.16x16.Debug.StepInto"
-						             tooltip = "Step into"
+						             tooltip = "${res:XML.MainMenu.DebugMenu.StepInto}"
 						             class   = "ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand"/>
 						<ToolbarItem id      = "Step out"
 						             icon    = "Icons.16x16.Debug.StepOut"
-						             tooltip = "Step out"
+						             tooltip = "${res:XML.MainMenu.DebugMenu.StepOut}"
 						             class   = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"/>
 					</Condition>
 				</Condition>
diff --git a/data/resources/StringResources.cz.resources b/data/resources/StringResources.cz.resources
index bf38869e24..fdca5fa789 100644
Binary files a/data/resources/StringResources.cz.resources and b/data/resources/StringResources.cz.resources differ
diff --git a/data/resources/StringResources.pl.resources b/data/resources/StringResources.pl.resources
index cde4bb10e4..7fdcab2826 100644
Binary files a/data/resources/StringResources.pl.resources and b/data/resources/StringResources.pl.resources differ
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
index 2fef174d92..7d292d8293 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
@@ -38,9 +38,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public CallStackPad()// : base("${res:MainWindow.Windows.Debug.CallStack}", null)
 		{
-			InitializeComponents();	
-		}		
-				
+			InitializeComponents();
+		}
+		
 		void InitializeComponents()
 		{
 			debugger = (WindowsDebugger)DebuggerService.CurrentDebugger;
@@ -82,8 +82,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public override void RedrawContent()
 		{
-			name.Text        = "Name";
-			language.Text    = "Language";
+			name.Text     = ResourceService.GetString("Global.Name");
+			language.Text = ResourceService.GetString("MainWindow.Windows.Debug.CallStack.Language");
 		}
 		
 		public bool ShowArgumentNames {
@@ -115,7 +115,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		ContextMenuStrip CreateContextMenuStrip()
 		{
-			ContextMenuStrip menu = new ContextMenuStrip();			
+			ContextMenuStrip menu = new ContextMenuStrip();
 			menu.Opening += FillContextMenuStrip;
 			return menu;
 		}
@@ -127,33 +127,33 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			
 			ToolStripMenuItem argNamesItem;
 			argNamesItem = new ToolStripMenuItem();
-			argNamesItem.Text = "Show argument names";
-			argNamesItem.Checked = ShowArgumentNames;	
+			argNamesItem.Text = "${res:MainWindow.Windows.Debug.CallStack.ShowArgumentNames}";
+			argNamesItem.Checked = ShowArgumentNames;
 			argNamesItem.Click +=
 				delegate {
-					ShowArgumentNames = !ShowArgumentNames;
-					RefreshList();
-				};
+				ShowArgumentNames = !ShowArgumentNames;
+				RefreshList();
+			};
 			
 			ToolStripMenuItem argValuesItem;
 			argValuesItem = new ToolStripMenuItem();
-			argValuesItem.Text = "Show argument values";
-			argValuesItem.Checked = ShowArgumentValues;	
+			argValuesItem.Text = "${res:MainWindow.Windows.Debug.CallStack.ShowArgumentValues}";
+			argValuesItem.Checked = ShowArgumentValues;
 			argValuesItem.Click +=
 				delegate {
-					ShowArgumentValues = !ShowArgumentValues;
-					RefreshList();
-				};
+				ShowArgumentValues = !ShowArgumentValues;
+				RefreshList();
+			};
 			
 			ToolStripMenuItem extMethodsItem;
 			extMethodsItem = new ToolStripMenuItem();
-			extMethodsItem.Text = "Show external methods";
-			extMethodsItem.Checked = ShowExternalMethods;	
+			extMethodsItem.Text = "${res:MainWindow.Windows.Debug.CallStack.ShowExternalMethods}";
+			extMethodsItem.Checked = ShowExternalMethods;
 			extMethodsItem.Click +=
 				delegate {
-					ShowExternalMethods = !ShowExternalMethods;
-					RefreshList();
-				};
+				ShowExternalMethods = !ShowExternalMethods;
+				RefreshList();
+			};
 			
 			menu.Items.AddRange(new ToolStripItem[] {
 			                    	argNamesItem,
@@ -189,7 +189,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			RefreshList();
 		}
-			
+		
 		public void RefreshList()
 		{
 			bool showArgumentNames = ShowArgumentNames;
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs
index 53d385fd1d..110d07b163 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ExceptionHistoryPad.cs
@@ -38,9 +38,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public ExceptionHistoryPad()
 		{
-			InitializeComponents();	
-		}		
-				
+			InitializeComponents();
+		}
+		
 		void InitializeComponents()
 		{
 			debugger = (WindowsDebugger)DebuggerService.CurrentDebugger;
@@ -81,9 +81,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public override void RedrawContent()
 		{
-			time.Text        = "Time";
-			exception.Text   = "Exception";
-			location.Text    = "Location";
+			time.Text      = ResourceService.GetString("MainWindow.Windows.Debug.ExceptionHistory.Time");
+			exception.Text = ResourceService.GetString("MainWindow.Windows.Debug.ExceptionHistory.Exception");
+			location.Text  = ResourceService.GetString("AddIns.HtmlHelp2.Location");
 		}
 		
 		void ExceptionHistoryListItemActivate(object sender, EventArgs e)
@@ -98,7 +98,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			IWorkbenchWindow window = FileService.GetOpenFile(nextStatement.SourceFullFilename);
 			if (window != null) {
 				IViewContent content = window.ViewContent;
-			
+				
 				if (content is IPositionable) {
 					((IPositionable)content).JumpTo((int)nextStatement.StartLine - 1, (int)nextStatement.StartColumn - 1);
 				}
@@ -120,12 +120,12 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			RefreshList();
 		}
-			
+		
 		public void RefreshList()
 		{
 			exceptionHistoryList.BeginUpdate();
 			exceptionHistoryList.Items.Clear();
-		
+			
 			foreach(Debugger.Exception exception in debugger.ExceptionHistory) {
 				string location;
 				if (exception.Location != null) {
@@ -141,9 +141,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 					item.ForeColor = Color.Red;
 				}
 				if (exception.ExceptionType == ExceptionType.DEBUG_EXCEPTION_FIRST_CHANCE ||
-					exception.ExceptionType == ExceptionType.DEBUG_EXCEPTION_USER_FIRST_CHANCE) {
+				    exception.ExceptionType == ExceptionType.DEBUG_EXCEPTION_USER_FIRST_CHANCE) {
 					item.ForeColor = Color.Blue;
-				}				
+				}
 				exceptionHistoryList.Items.Add(item);
 			}
 
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
index d771e35fbc..d052ca1a83 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
@@ -112,9 +112,9 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public override void RedrawContent()
 		{
-			name.Text = "Name";
-			val.Text  = "Value";
-			type.Text = "Type";
+			name.Text = ResourceService.GetString("Global.Name");
+			val.Text  = ResourceService.GetString("Dialog.HighlightingEditor.Properties.Value");
+			type.Text = ResourceService.GetString("ResourceEditor.ResourceEdit.TypeColumn");
 		}
 
 		private void localVarList_BeforeExpand(object sender, TreeListViewCancelEventArgs e)
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
index 3341c35dc0..fa385ed301 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
@@ -43,7 +43,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			InitializeComponents();
 		}
-			
+		
 		void InitializeComponents()
 		{
 			debugger = (WindowsDebugger)DebuggerService.CurrentDebugger;
@@ -90,16 +90,16 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		
 		public override void RedrawContent()
 		{
-			id.Text          = "ID";
-			name.Text        = "Name";
-			location.Text    = "Location";
-			priority.Text    = "Priority";
-			breaked.Text     = "Frozen";
+			id.Text       = ResourceService.GetString("Global.ID");
+			name.Text     = ResourceService.GetString("Global.Name");
+			location.Text = ResourceService.GetString("AddIns.HtmlHelp2.Location");
+			priority.Text = ResourceService.GetString("MainWindow.Windows.Debug.Threads.Priority");
+			breaked.Text  = ResourceService.GetString("MainWindow.Windows.Debug.Threads.Frozen");
 		}
 		
 		ContextMenuStrip CreateContextMenuStrip()
 		{
-			ContextMenuStrip menu = new ContextMenuStrip();			
+			ContextMenuStrip menu = new ContextMenuStrip();
 			menu.Opening += FillContextMenuStrip;
 			return menu;
 		}
@@ -120,26 +120,26 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			
 			ToolStripMenuItem freezeItem;
 			freezeItem = new ToolStripMenuItem();
-			freezeItem.Text = "Freeze";
+			freezeItem.Text = ResourceService.GetString("MainWindow.Windows.Debug.Threads.Freeze");
 			freezeItem.Checked = (item.Tag as Thread).Suspended;
 			freezeItem.Click +=
 				delegate {
-					ListView.SelectedListViewItemCollection selItems = runningThreadsList.SelectedItems;
-					if (selItems.Count == 0) {
-						return;
-					}
-					bool suspended = (selItems[0].Tag as Thread).Suspended;
-					
-					if (!debuggerCore.IsPaused) {
-						MessageBox.Show("You can not freeze or thaw thread while the debugger is running.", "Thread freeze");
-						return;
-					}
-					
-					foreach(ListViewItem i in selItems) {
-						(i.Tag as Thread).Suspended = !suspended;
-					}
-					RefreshList();
-				};
+				ListView.SelectedListViewItemCollection selItems = runningThreadsList.SelectedItems;
+				if (selItems.Count == 0) {
+					return;
+				}
+				bool suspended = (selItems[0].Tag as Thread).Suspended;
+				
+				if (!debuggerCore.IsPaused) {
+					MessageBox.Show("You can not freeze or thaw thread while the debugger is running.", "Thread freeze");
+					return;
+				}
+				
+				foreach(ListViewItem i in selItems) {
+					(i.Tag as Thread).Suspended = !suspended;
+				}
+				RefreshList();
+			};
 			
 			menu.Items.AddRange(new ToolStripItem[] {
 			                    	freezeItem,
@@ -211,12 +211,31 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 					} else {
 						item.SubItems.Add("N/A");
 					}
-					item.SubItems.Add(thread.Priority.ToString());
-					item.SubItems.Add(thread.Suspended.ToString());
-                    return;
+					switch (thread.Priority) {
+						case System.Threading.ThreadPriority.Highest:
+							item.SubItems.Add(ResourceService.GetString("MainWindow.Windows.Debug.Threads.Priority.Highest"));
+							break;
+						case System.Threading.ThreadPriority.AboveNormal:
+							item.SubItems.Add(ResourceService.GetString("MainWindow.Windows.Debug.Threads.Priority.AboveNormal"));
+							break;
+						case System.Threading.ThreadPriority.Normal:
+							item.SubItems.Add(ResourceService.GetString("MainWindow.Windows.Debug.Threads.Priority.Normal"));
+							break;
+						case System.Threading.ThreadPriority.BelowNormal:
+							item.SubItems.Add(ResourceService.GetString("MainWindow.Windows.Debug.Threads.Priority.BelowNormal"));
+							break;
+						case System.Threading.ThreadPriority.Lowest:
+							item.SubItems.Add(ResourceService.GetString("MainWindow.Windows.Debug.Threads.Priority.Lowest"));
+							break;
+						default:
+							item.SubItems.Add(thread.Priority.ToString());
+							break;
+					}
+					item.SubItems.Add(StringParser.Parse(thread.Suspended ? "${res:Global.Yes}" : "${res:Global.No}"));
+					return;
 				}
-            }
-            AddThread(thread);
+			}
+			AddThread(thread);
 		}
 		
 		void RemoveThread(Thread thread)
diff --git a/src/Main/Base/Project/Resources/FindPanel.xfrm b/src/Main/Base/Project/Resources/FindPanel.xfrm
index 9a2922084b..1ad097c940 100644
--- a/src/Main/Base/Project/Resources/FindPanel.xfrm
+++ b/src/Main/Base/Project/Resources/FindPanel.xfrm
@@ -5,12 +5,10 @@
     <Controls>
       <System.Windows.Forms.Button>
         <Name value="findAllButton" />
-        <Location value="{X=120,Y=280}" />
-        <UseCompatibleTextRendering value="True" />
+        <Location value="{X=124,Y=280}" />
         <Text value="${res:Dialog.NewProject.SearchReplace.FindAll}" />
         <Anchor value="Top, Right" />
         <Size value="{Width=96, Height=23}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="14" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.ComboBox>
@@ -24,7 +22,6 @@
       <System.Windows.Forms.Label>
         <Name value="label4" />
         <Location value="{X=8,Y=224}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.UseMethodLabel}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -33,42 +30,34 @@
       </System.Windows.Forms.Label>
       <System.Windows.Forms.Button>
         <Name value="findNextButton" />
-        <Location value="{X=224,Y=280}" />
-        <UseCompatibleTextRendering value="True" />
+        <Location value="{X=226,Y=280}" />
         <Text value="${res:Dialog.NewProject.SearchReplace.FindButton}" />
         <Anchor value="Top, Right" />
         <Size value="{Width=96, Height=23}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="12" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.Button>
         <Name value="bookmarkAllButton" />
         <Location value="{X=328,Y=280}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.MarkAllButton}" />
         <Anchor value="Top, Right" />
         <Size value="{Width=96, Height=23}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="13" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.CheckBox>
         <Name value="matchWholeWordCheckBox" />
         <Location value="{X=8,Y=200}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="${res:Dialog.NewProject.SearchReplace.MatchWholeWord}" />
         <TabIndex value="9" />
         <Size value="{Width=416, Height=24}" />
-        <UseCompatibleTextRendering value="True" />
         <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
       <System.Windows.Forms.CheckBox>
         <Name value="matchCaseCheckBox" />
         <Location value="{X=8,Y=176}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="${res:Dialog.NewProject.SearchReplace.MatchCase}" />
         <TabIndex value="8" />
         <Size value="{Width=416, Height=24}" />
-        <UseCompatibleTextRendering value="True" />
         <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
       <System.Windows.Forms.ComboBox>
@@ -81,7 +70,6 @@
       <System.Windows.Forms.Label>
         <Name value="lookAtTypesLabel" />
         <Location value="{X=8,Y=128}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.LookAtFileTypes}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -91,21 +79,17 @@
       <System.Windows.Forms.CheckBox>
         <Name value="includeSubFolderCheckBox" />
         <Location value="{X=24,Y=104}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="${res:Dialog.NewProject.SearchReplace.IncludeSubFolders}" />
         <TabIndex value="5" />
         <Size value="{Width=400, Height=24}" />
-        <UseCompatibleTextRendering value="True" />
         <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
       <System.Windows.Forms.Button>
         <Name value="lookInBrowseButton" />
-        <Location value="{X=400,Y=80}" />
-        <UseCompatibleTextRendering value="True" />
+        <Location value="{X=395,Y=80}" />
         <Text value="..." />
         <Anchor value="Top, Right" />
-        <Size value="{Width=24, Height=21}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
+        <Size value="{Width=29, Height=21}" />
         <TabIndex value="4" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.ComboBox>
@@ -118,7 +102,6 @@
       <System.Windows.Forms.Label>
         <Name value="label2" />
         <Location value="{X=8,Y=56}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.SearchIn}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -135,7 +118,6 @@
       <System.Windows.Forms.Label>
         <Name value="label1" />
         <Location value="{X=8,Y=8}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.FindWhat}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
diff --git a/src/Main/Base/Project/Resources/ReplacePanel.xfrm b/src/Main/Base/Project/Resources/ReplacePanel.xfrm
index 35fdb452f0..343acea8a0 100644
--- a/src/Main/Base/Project/Resources/ReplacePanel.xfrm
+++ b/src/Main/Base/Project/Resources/ReplacePanel.xfrm
@@ -14,7 +14,6 @@
       <System.Windows.Forms.Label>
         <Name value="label5" />
         <Location value="{X=8,Y=272}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.UseMethodLabel}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -24,11 +23,9 @@
       <System.Windows.Forms.Button>
         <Name value="replaceAllButton" />
         <Location value="{X=328,Y=328}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.ReplaceAllButton}" />
         <Anchor value="Top, Right" />
         <Size value="{Width=96, Height=23}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="16" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.ComboBox>
@@ -41,7 +38,6 @@
       <System.Windows.Forms.Label>
         <Name value="label4" />
         <Location value="{X=8,Y=56}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.ReplaceWith}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -50,42 +46,34 @@
       </System.Windows.Forms.Label>
       <System.Windows.Forms.Button>
         <Name value="findNextButton" />
-        <Location value="{X=120,Y=328}" />
-        <UseCompatibleTextRendering value="True" />
+        <Location value="{X=124,Y=328}" />
         <Text value="${res:Dialog.NewProject.SearchReplace.FindNextButton}" />
         <Anchor value="Top, Right" />
         <Size value="{Width=96, Height=23}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="14" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.Button>
         <Name value="replaceButton" />
-        <Location value="{X=224,Y=328}" />
-        <UseCompatibleTextRendering value="True" />
+        <Location value="{X=226,Y=328}" />
         <Text value="${res:Dialog.NewProject.SearchReplace.ReplaceButton}" />
         <Anchor value="Top, Right" />
         <Size value="{Width=96, Height=23}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <TabIndex value="15" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.CheckBox>
         <Name value="matchWholeWordCheckBox" />
         <Location value="{X=8,Y=248}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="${res:Dialog.NewProject.SearchReplace.MatchWholeWord}" />
         <TabIndex value="11" />
         <Size value="{Width=416, Height=24}" />
-        <UseCompatibleTextRendering value="True" />
         <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
       <System.Windows.Forms.CheckBox>
         <Name value="matchCaseCheckBox" />
         <Location value="{X=8,Y=224}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="${res:Dialog.NewProject.SearchReplace.MatchCase}" />
         <TabIndex value="10" />
         <Size value="{Width=416, Height=24}" />
-        <UseCompatibleTextRendering value="True" />
         <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
       <System.Windows.Forms.ComboBox>
@@ -98,7 +86,6 @@
       <System.Windows.Forms.Label>
         <Name value="lookAtTypesLabel" />
         <Location value="{X=8,Y=176}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.LookAtFileTypes}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -108,26 +95,22 @@
       <System.Windows.Forms.CheckBox>
         <Name value="includeSubFolderCheckBox" />
         <Location value="{X=24,Y=152}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
         <Text value="${res:Dialog.NewProject.SearchReplace.IncludeSubFolders}" />
         <TabIndex value="7" />
         <Size value="{Width=400, Height=24}" />
-        <UseCompatibleTextRendering value="True" />
         <Anchor value="Top, Left, Right" />
       </System.Windows.Forms.CheckBox>
       <System.Windows.Forms.Button>
         <Name value="lookInBrowseButton" />
-        <Location value="{X=400,Y=128}" />
-        <UseCompatibleTextRendering value="True" />
+        <Location value="{X=393,Y=128}" />
         <Text value="..." />
         <Anchor value="Top, Right" />
-        <Size value="{Width=24, Height=21}" />
-        <FlatAppearance value="System.Windows.Forms.FlatButtonAppearance" />
+        <Size value="{Width=31, Height=21}" />
         <TabIndex value="6" />
       </System.Windows.Forms.Button>
       <System.Windows.Forms.ComboBox>
         <Name value="lookInComboBox" />
-        <Size value="{Width=384, Height=21}" />
+        <Size value="{Width=379, Height=21}" />
         <TabIndex value="5" />
         <Location value="{X=8,Y=128}" />
         <Anchor value="Top, Left, Right" />
@@ -135,7 +118,6 @@
       <System.Windows.Forms.Label>
         <Name value="label2" />
         <Location value="{X=8,Y=104}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.SearchIn}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
@@ -152,7 +134,6 @@
       <System.Windows.Forms.Label>
         <Name value="label1" />
         <Location value="{X=8,Y=8}" />
-        <UseCompatibleTextRendering value="True" />
         <Text value="${res:Dialog.NewProject.SearchReplace.FindWhat}" />
         <Anchor value="Top, Left, Right" />
         <TextAlign value="BottomLeft" />
diff --git a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs
index 96927bb07c..fb44eb18a9 100644
--- a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs
+++ b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs
@@ -45,7 +45,8 @@ namespace SearchAndReplace
 						break;
 				}
 				
-				Get<Button>("findNext").Click += new EventHandler(FindNextButtonClicked);
+				ControlDictionary["findNextButton"].Click     += FindNextButtonClicked;
+				ControlDictionary["lookInBrowseButton"].Click += LookInBrowseButtonClicked;
 				SetOptions();
 				RightToLeftConverter.ReConvertRecursive(this);
 				ResumeLayout(false);
@@ -56,6 +57,15 @@ namespace SearchAndReplace
 		{
 		}
 		
+		void LookInBrowseButtonClicked(object sender, EventArgs e)
+		{
+			FolderDialog dlg = new FolderDialog();
+			if (dlg.DisplayDialog("${res:Dialog.NewProject.SearchReplace.LookIn.SelectDirectory}") == DialogResult.OK) {
+				Get<ComboBox>("lookIn").SelectedIndex = customDirectoryIndex;
+				Get<ComboBox>("lookIn").Text = dlg.Path;
+			}
+		}
+		
 		void FindNextButtonClicked(object sender, EventArgs e)
 		{
 			WritebackOptions();
@@ -104,6 +114,8 @@ namespace SearchAndReplace
 			}
 		}
 		
+		const int customDirectoryIndex = 5;
+		
 		void SetOptions()
 		{
 			Get<ComboBox>("find").Text = SearchOptions.FindPattern;
@@ -163,7 +175,7 @@ namespace SearchAndReplace
 		
 		void LookInSelectedIndexChanged(object sender, EventArgs e)
 		{
-			if (Get<ComboBox>("lookIn").SelectedIndex == 5) {
+			if (Get<ComboBox>("lookIn").SelectedIndex == customDirectoryIndex) {
 				Get<ComboBox>("lookIn").DropDownStyle = ComboBoxStyle.DropDown;
 				Get<CheckBox>("includeSubFolder").Enabled = true;
 				Get<ComboBox>("fileTypes").Enabled = true;
diff --git a/src/Main/StartUp/Project/Resources/StringResources.resources b/src/Main/StartUp/Project/Resources/StringResources.resources
index a3fa29239e..c56c1fdbc3 100644
Binary files a/src/Main/StartUp/Project/Resources/StringResources.resources and b/src/Main/StartUp/Project/Resources/StringResources.resources differ