diff --git a/debugger/frames/debugger_general_options.lfm b/debugger/frames/debugger_general_options.lfm
index 6b3a1906ed..81b2d2ab94 100644
--- a/debugger/frames/debugger_general_options.lfm
+++ b/debugger/frames/debugger_general_options.lfm
@@ -1,24 +1,27 @@
-inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
+object DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
+  Left = 0
   Height = 427
+  Top = 0
   Width = 519
   ClientHeight = 427
   ClientWidth = 519
+  TabOrder = 0
   Visible = False
   DesignLeft = 812
-  DesignTop = 438
-  object gbDebuggerType: TGroupBox[0]
+  DesignTop = 313
+  object gbDebuggerType: TGroupBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 82
+    Height = 97
     Top = 0
     Width = 519
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     Caption = 'Debugger type and path'
-    ClientHeight = 64
+    ClientHeight = 78
     ClientWidth = 515
     TabOrder = 0
     object cmdOpenDebuggerPath: TSpeedButton
@@ -27,14 +30,13 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = cmbDebuggerPath
       AnchorSideBottom.Side = asrBottom
-      Left = 486
-      Height = 23
-      Top = 35
-      Width = 23
+      Left = 459
+      Height = 29
+      Top = 43
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
       Caption = '...'
-      NumGlyphs = 0
       OnClick = cmdOpenDebuggerPathClick
     end
     object cmbDebuggerType: TComboBox
@@ -43,12 +45,12 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
       AnchorSideRight.Control = gbDebuggerType
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 23
+      Height = 31
       Top = 6
       Width = 503
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Around = 6
-      ItemHeight = 15
+      ItemHeight = 0
       OnEditingDone = cmbDebuggerTypeEditingDone
       OnSelect = cmbDebuggerTypeEditingDone
       Style = csDropDownList
@@ -60,32 +62,32 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = cmdOpenDebuggerPath
       Left = 6
-      Height = 23
-      Top = 35
-      Width = 480
+      Height = 29
+      Top = 43
+      Width = 453
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
-      ItemHeight = 15
+      ItemHeight = 0
       TabOrder = 1
     end
   end
-  object gbAdditionalSearchPath: TGroupBox[1]
+  object gbAdditionalSearchPath: TGroupBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = gbDebuggerType
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 53
-    Top = 88
+    Height = 58
+    Top = 103
     Width = 519
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'Additional search path'
-    ClientHeight = 35
+    ClientHeight = 39
     ClientWidth = 515
     TabOrder = 1
     object cmdOpenAdditionalPath: TSpeedButton
@@ -94,14 +96,13 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = txtAdditionalPath
       AnchorSideBottom.Side = asrBottom
-      Left = 486
-      Height = 23
+      Left = 459
+      Height = 27
       Top = 6
-      Width = 23
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
       Caption = '...'
-      NumGlyphs = 0
       OnClick = cmdOpenAdditionalPathClick
     end
     object txtAdditionalPath: TEdit
@@ -109,9 +110,9 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
       AnchorSideTop.Control = gbAdditionalSearchPath
       AnchorSideRight.Control = cmdOpenAdditionalPath
       Left = 6
-      Height = 23
+      Height = 27
       Top = 6
-      Width = 480
+      Width = 453
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -119,15 +120,15 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
       TabOrder = 0
     end
   end
-  object gcbDebuggerGeneralOptions: TCheckGroup[2]
+  object gcbDebuggerGeneralOptions: TCheckGroup
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = gbAdditionalSearchPath
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 56
-    Top = 147
+    Height = 19
+    Top = 167
     Width = 519
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
@@ -144,7 +145,7 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
     ChildSizing.ControlsPerLine = 1
     TabOrder = 2
   end
-  object gbDebuggerSpecific: TGroupBox[3]
+  object gbDebuggerSpecific: TGroupBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = gcbDebuggerGeneralOptions
     AnchorSideTop.Side = asrBottom
@@ -153,8 +154,8 @@ inherited DebuggerGeneralOptionsFrame: TDebuggerGeneralOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 218
-    Top = 209
+    Height = 235
+    Top = 192
     Width = 519
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Top = 6
diff --git a/ide/frames/compiler_compilation_options.lfm b/ide/frames/compiler_compilation_options.lfm
index 5dcf197c56..91b2fd60e0 100644
--- a/ide/frames/compiler_compilation_options.lfm
+++ b/ide/frames/compiler_compilation_options.lfm
@@ -12,9 +12,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 19
+    Height = 24
     Top = 0
-    Width = 118
+    Width = 152
     Caption = 'chkCreateMakefile'
     ParentShowHint = False
     ShowHint = True
@@ -27,23 +27,23 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 105
-    Top = 222
+    Height = 120
+    Top = 252
     Width = 741
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'ExecuteAfterGroupBox'
-    ClientHeight = 85
+    ClientHeight = 101
     ClientWidth = 737
     TabOrder = 3
     object lblRunIfExecAfter: TLabel
       AnchorSideLeft.Control = ExecuteAfterGroupBox
       AnchorSideTop.Control = ExecuteAfterGroupBox
       Left = 6
-      Height = 15
+      Height = 17
       Top = 6
-      Width = 90
+      Width = 119
       BorderSpacing.Around = 6
       Caption = 'lblRunIfExecAfter'
       ParentColor = False
@@ -53,9 +53,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = ExecuteAfterCommandComboBox
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 35
-      Width = 151
+      Height = 17
+      Top = 42
+      Width = 195
       BorderSpacing.Around = 6
       Caption = 'ExecuteAfterCommandLabel'
       ParentColor = False
@@ -64,10 +64,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = lblRunIfExecAfter
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteAfterGroupBox
-      Left = 126
-      Height = 19
+      Left = 155
+      Height = 24
       Top = 6
-      Width = 133
+      Width = 172
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkExecAfterCompile'
@@ -77,10 +77,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = chkExecAfterCompile
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteAfterGroupBox
-      Left = 289
-      Height = 19
+      Left = 357
+      Height = 24
       Top = 6
-      Width = 115
+      Width = 150
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkExecAfterBuild'
@@ -90,10 +90,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = chkExecAfterBuild
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteAfterGroupBox
-      Left = 434
-      Height = 19
+      Left = 537
+      Height = 24
       Top = 6
-      Width = 109
+      Width = 141
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkExecAfterRun'
@@ -104,10 +104,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteAfterScanMakeCheckBox
       AnchorSideTop.Side = asrCenter
-      Left = 353
-      Height = 19
-      Top = 60
-      Width = 184
+      Left = 448
+      Height = 24
+      Top = 71
+      Width = 238
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'ExecuteAfterScanFPCCheckBox'
@@ -118,10 +118,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteAfterCommandComboBox
       AnchorSideTop.Side = asrBottom
-      Left = 131
-      Height = 19
-      Top = 60
-      Width = 192
+      Left = 169
+      Height = 24
+      Top = 71
+      Width = 249
       BorderSpacing.Around = 6
       Caption = 'ExecuteAfterScanMakeCheckBox'
       TabOrder = 5
@@ -131,10 +131,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteAfterScanMakeCheckBox
       AnchorSideTop.Side = asrCenter
-      Left = 567
-      Height = 19
-      Top = 60
-      Width = 181
+      Left = 716
+      Height = 24
+      Top = 71
+      Width = 235
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'ExecuteAfterShowAllCheckBox'
@@ -145,9 +145,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = ExecuteAfterScanMakeCheckBox
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 62
-      Width = 119
+      Height = 17
+      Top = 75
+      Width = 157
       BorderSpacing.Left = 6
       Caption = 'ExecuteAfterScanLabel'
       ParentColor = False
@@ -158,15 +158,15 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = chkExecAfterCompile
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = ExecAfterBrowseButton
-      Left = 169
-      Height = 23
-      Top = 31
-      Width = 527
+      Left = 213
+      Height = 29
+      Top = 36
+      Width = 468
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 12
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
-      ItemHeight = 15
+      ItemHeight = 0
       TabOrder = 3
       Text = 'ExecuteAfterCommandComboBox'
     end
@@ -176,12 +176,11 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = ExecuteAfterCommandComboBox
       AnchorSideBottom.Side = asrBottom
-      Left = 696
-      Height = 23
-      Top = 31
-      Width = 35
+      Left = 681
+      Height = 29
+      Top = 36
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
-      AutoSize = True
       BorderSpacing.Right = 6
       Caption = '...'
       OnClick = CompCmdBrowseButtonClick
@@ -195,23 +194,23 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 80
-    Top = 136
+    Height = 90
+    Top = 156
     Width = 741
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'grpCompiler'
-    ClientHeight = 60
+    ClientHeight = 71
     ClientWidth = 737
     TabOrder = 2
     object lblRunIfCompiler: TLabel
       AnchorSideLeft.Control = grpCompiler
       AnchorSideTop.Control = grpCompiler
       Left = 6
-      Height = 15
+      Height = 17
       Top = 6
-      Width = 90
+      Width = 114
       BorderSpacing.Around = 6
       Caption = 'lblRunIfCompiler'
       ParentColor = False
@@ -221,9 +220,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = cobCompiler
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 35
-      Width = 62
+      Height = 17
+      Top = 42
+      Width = 79
       BorderSpacing.Around = 6
       Caption = 'lblCompiler'
       ParentColor = False
@@ -232,10 +231,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = lblRunIfCompiler
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = grpCompiler
-      Left = 126
-      Height = 19
+      Left = 150
+      Height = 24
       Top = 6
-      Width = 133
+      Width = 167
       BorderSpacing.Left = 30
       BorderSpacing.Top = 6
       Caption = 'chkCompilerCompile'
@@ -245,10 +244,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = chkCompilerCompile
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = grpCompiler
-      Left = 289
-      Height = 19
+      Left = 347
+      Height = 24
       Top = 6
-      Width = 115
+      Width = 145
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkCompilerBuild'
@@ -258,10 +257,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = chkCompilerBuild
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = grpCompiler
-      Left = 434
-      Height = 19
+      Left = 522
+      Height = 24
       Top = 6
-      Width = 109
+      Width = 136
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkCompilerRun'
@@ -273,15 +272,15 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = chkCompilerCompile
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = BrowseCompilerButton
-      Left = 80
-      Height = 23
-      Top = 31
-      Width = 616
+      Left = 97
+      Height = 29
+      Top = 36
+      Width = 584
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 12
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
-      ItemHeight = 15
+      ItemHeight = 0
       TabOrder = 3
       Text = 'cobCompiler'
     end
@@ -291,12 +290,11 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = cobCompiler
       AnchorSideBottom.Side = asrBottom
-      Left = 696
-      Height = 23
-      Top = 31
-      Width = 35
+      Left = 681
+      Height = 29
+      Top = 36
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
-      AutoSize = True
       BorderSpacing.Right = 6
       Caption = '...'
       OnClick = CompCmdBrowseButtonClick
@@ -312,23 +310,23 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 105
-    Top = 25
+    Height = 120
+    Top = 30
     Width = 741
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'ExecuteBeforeGroupBox'
-    ClientHeight = 85
+    ClientHeight = 101
     ClientWidth = 737
     TabOrder = 1
     object lblRunIfExecBefore: TLabel
       AnchorSideLeft.Control = ExecuteBeforeGroupBox
       AnchorSideTop.Control = ExecuteBeforeGroupBox
       Left = 6
-      Height = 15
+      Height = 17
       Top = 6
-      Width = 98
+      Width = 129
       BorderSpacing.Around = 6
       Caption = 'lblRunIfExecBefore'
       ParentColor = False
@@ -338,9 +336,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = ExecuteBeforeCommandComboBox
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 35
-      Width = 159
+      Height = 17
+      Top = 42
+      Width = 205
       BorderSpacing.Around = 6
       Caption = 'ExecuteBeforeCommandLabel'
       ParentColor = False
@@ -349,10 +347,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = lblRunIfExecBefore
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteBeforeGroupBox
-      Left = 134
-      Height = 19
+      Left = 165
+      Height = 24
       Top = 6
-      Width = 141
+      Width = 182
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkExecBeforeCompile'
@@ -362,10 +360,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = chkExecBeforeCompile
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteBeforeGroupBox
-      Left = 305
-      Height = 19
+      Left = 377
+      Height = 24
       Top = 6
-      Width = 123
+      Width = 160
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkExecBeforeBuild'
@@ -375,10 +373,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Control = chkExecBeforeBuild
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteBeforeGroupBox
-      Left = 458
-      Height = 19
+      Left = 567
+      Height = 24
       Top = 6
-      Width = 117
+      Width = 151
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'chkExecBeforeRun'
@@ -389,10 +387,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteBeforeScanMakeCheckBox
       AnchorSideTop.Side = asrCenter
-      Left = 369
-      Height = 19
-      Top = 60
-      Width = 192
+      Left = 468
+      Height = 24
+      Top = 71
+      Width = 248
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'ExecuteBeforeScanFPCCheckBox'
@@ -403,10 +401,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteBeforeCommandComboBox
       AnchorSideTop.Side = asrBottom
-      Left = 139
-      Height = 19
-      Top = 60
-      Width = 200
+      Left = 179
+      Height = 24
+      Top = 71
+      Width = 259
       BorderSpacing.Around = 6
       Caption = 'ExecuteBeforeScanMakeCheckBox'
       TabOrder = 5
@@ -416,10 +414,10 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExecuteBeforeScanMakeCheckBox
       AnchorSideTop.Side = asrCenter
-      Left = 591
-      Height = 19
-      Top = 60
-      Width = 189
+      Left = 746
+      Height = 24
+      Top = 71
+      Width = 245
       BorderSpacing.Left = 24
       BorderSpacing.Around = 6
       Caption = 'ExecuteBeforeShowAllCheckBox'
@@ -430,9 +428,9 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = ExecuteBeforeScanMakeCheckBox
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 15
-      Top = 62
-      Width = 127
+      Height = 17
+      Top = 75
+      Width = 167
       BorderSpacing.Left = 6
       Caption = 'ExecuteBeforeScanLabel'
       ParentColor = False
@@ -443,15 +441,15 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideTop.Control = chkExecBeforeCompile
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = ExecBeforeBrowseButton
-      Left = 177
-      Height = 23
-      Top = 31
-      Width = 519
+      Left = 223
+      Height = 29
+      Top = 36
+      Width = 458
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 12
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
-      ItemHeight = 15
+      ItemHeight = 0
       TabOrder = 3
       Text = 'ExecuteBeforeCommandComboBox'
     end
@@ -462,12 +460,11 @@ object CompilerCompilationOptionsFrame: TCompilerCompilationOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = ExecuteBeforeCommandComboBox
       AnchorSideBottom.Side = asrBottom
-      Left = 696
-      Height = 23
-      Top = 31
-      Width = 35
+      Left = 681
+      Height = 29
+      Top = 36
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
-      AutoSize = True
       BorderSpacing.Right = 6
       Caption = '...'
       OnClick = CompCmdBrowseButtonClick
diff --git a/ide/frames/compiler_path_options.pas b/ide/frames/compiler_path_options.pas
index 97a6556a7a..cea674c84f 100644
--- a/ide/frames/compiler_path_options.pas
+++ b/ide/frames/compiler_path_options.pas
@@ -73,6 +73,9 @@ implementation
 
 {$R *.lfm}
 
+const
+  cBrowseBtnSize = 50;
+
 function CheckSearchPath(const Context, ExpandedPath: string; Level: TCheckCompileOptionsMsgLvl): boolean;
 var
   CurPath: string;
@@ -500,7 +503,7 @@ begin
     AnchorParallel(akTop, 0, OtherUnitsEdit);
     AnchorParallel(akBottom, 0, OtherUnitsEdit);
     AnchorParallel(akRight, 0, Self);
-    AutoSize := True;
+    Width := cBrowseBtnSize;
     AssociatedEdit := OtherUnitsEdit;
     ContextCaption := OtherUnitsLabel.Caption;
     Templates:='$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)' +
@@ -527,7 +530,7 @@ begin
     AnchorParallel(akTop, 0, IncludeFilesEdit);
     AnchorParallel(akBottom, 0, IncludeFilesEdit);
     AnchorParallel(akRight, 0, Self);
-    AutoSize := True;
+    Width := cBrowseBtnSize;
     AssociatedEdit := IncludeFilesEdit;
     ContextCaption := IncludeFilesLabel.Caption;
     Templates := 'include;inc';
@@ -550,7 +553,7 @@ begin
     AnchorParallel(akTop, 0, OtherSourcesEdit);
     AnchorParallel(akBottom, 0, OtherSourcesEdit);
     AnchorParallel(akRight, 0, Self);
-    AutoSize := True;
+    Width := cBrowseBtnSize;
     AssociatedEdit := OtherSourcesEdit;
     ContextCaption := OtherSourcesLabel.Caption;
     Templates := '$(LazarusDir)/lcl' +
@@ -576,7 +579,7 @@ begin
     AnchorParallel(akTop, 0, LibrariesEdit);
     AnchorParallel(akBottom, 0, LibrariesEdit);
     AnchorParallel(akRight, 0, Self);
-    AutoSize := True;
+    Width := cBrowseBtnSize;
     AssociatedEdit := LibrariesEdit;
     ContextCaption := LibrariesLabel.Caption;
     Templates := '/usr/X11R6/lib;/sw/lib';
@@ -599,7 +602,7 @@ begin
     AnchorParallel(akTop, 0, UnitOutputDirEdit);
     AnchorParallel(akBottom, 0, UnitOutputDirEdit);
     AnchorParallel(akRight, 0, Self);
-    AutoSize := True;
+    Width := cBrowseBtnSize;
     OnClick := @FileBrowseBtnClick;
   end;
   UnitOutputDirEdit.AnchorToNeighbour(akRight, 0, btnUnitOutputDir);
@@ -618,7 +621,7 @@ begin
     AnchorParallel(akTop, 0, DebugPathEdit);
     AnchorParallel(akBottom, 0, DebugPathEdit);
     AnchorParallel(akRight, 0, Self);
-    AutoSize := True;
+    Width := cBrowseBtnSize;
     AssociatedEdit := DebugPathEdit;
     ContextCaption := DebugPathLabel.Caption;
     Templates := '$(LazarusDir)/lcl/include' +
diff --git a/ide/frames/editor_display_options.lfm b/ide/frames/editor_display_options.lfm
index 7597d4c879..990e943367 100644
--- a/ide/frames/editor_display_options.lfm
+++ b/ide/frames/editor_display_options.lfm
@@ -12,13 +12,13 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
   object MarginAndGutterGroupBox: TGroupBox
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 149
+    Height = 175
     Top = 0
     Width = 501
     Align = alTop
     AutoSize = True
     Caption = 'MarginAndGutterGroupBox'
-    ClientHeight = 131
+    ClientHeight = 156
     ClientWidth = 497
     TabOrder = 0
     object RightMarginLabel: TLabel
@@ -26,10 +26,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = RightMarginComboBox
       AnchorSideTop.Side = asrCenter
-      Left = 296
-      Height = 16
-      Top = 9
-      Width = 95
+      Left = 344
+      Height = 17
+      Top = 12
+      Width = 119
       BorderSpacing.Left = 6
       Caption = 'RightMarginLabel'
       ParentColor = False
@@ -39,10 +39,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ShowOnlyLineNumbersMultiplesOfSpinEdit
       AnchorSideTop.Side = asrCenter
-      Left = 294
-      Height = 16
-      Top = 67
-      Width = 122
+      Left = 342
+      Height = 17
+      Top = 79
+      Width = 147
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       Caption = 'Every n-th line number'
@@ -52,10 +52,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Control = RightMarginLabel
       AnchorSideTop.Control = GutterSeparatorIndexSpinBox
       AnchorSideTop.Side = asrCenter
-      Left = 296
-      Height = 16
-      Top = 38
-      Width = 140
+      Left = 344
+      Height = 17
+      Top = 46
+      Width = 186
       Caption = 'GutterSeparatorIndexLabel'
       ParentColor = False
     end
@@ -65,10 +65,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = RightMarginLabel
       AnchorSideTop.Side = asrCenter
       Cursor = crHandPoint
-      Left = 397
-      Height = 16
-      Top = 9
-      Width = 118
+      Left = 469
+      Height = 17
+      Top = 12
+      Width = 147
       BorderSpacing.Left = 6
       Caption = 'RightMarginColorLink'
       Font.Color = clBlue
@@ -82,9 +82,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Control = MarginAndGutterGroupBox
       AnchorSideTop.Control = MarginAndGutterGroupBox
       Left = 6
-      Height = 19
+      Height = 24
       Top = 6
-      Width = 172
+      Width = 220
       BorderSpacing.Around = 6
       Caption = 'VisibleRightMarginCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -95,9 +95,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = VisibleRightMarginCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 31
-      Width = 139
+      Height = 24
+      Top = 36
+      Width = 182
       BorderSpacing.Around = 6
       Caption = 'VisibleGutterCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -108,9 +108,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = VisibleGutterCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 56
-      Width = 172
+      Height = 24
+      Top = 66
+      Width = 218
       BorderSpacing.Around = 6
       Caption = 'ShowLineNumbersCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -121,13 +121,13 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Control = VisibleRightMarginCheckBox
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = MarginAndGutterGroupBox
-      Left = 234
-      Height = 23
+      Left = 282
+      Height = 29
       Top = 6
       Width = 56
       BorderSpacing.Left = 50
       BorderSpacing.Around = 6
-      ItemHeight = 15
+      ItemHeight = 0
       Items.Strings = (
         '80'
         '78'
@@ -142,9 +142,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Control = GutterSeparatorIndexSpinBox
       AnchorSideTop.Control = GutterSeparatorIndexSpinBox
       AnchorSideTop.Side = asrBottom
-      Left = 234
-      Height = 23
-      Top = 64
+      Left = 282
+      Height = 27
+      Top = 74
       Width = 54
       BorderSpacing.Top = 6
       MinValue = 1
@@ -156,9 +156,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Control = RightMarginComboBox
       AnchorSideTop.Control = RightMarginComboBox
       AnchorSideTop.Side = asrBottom
-      Left = 234
-      Height = 23
-      Top = 35
+      Left = 282
+      Height = 27
+      Top = 41
       Width = 56
       MaxValue = 4
       MinValue = -1
@@ -170,9 +170,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = ShowLineNumbersCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 81
-      Width = 117
+      Height = 24
+      Top = 96
+      Width = 147
       BorderSpacing.Around = 6
       Caption = 'chkShowOverview'
       OnChange = GeneralCheckBoxOnChange
@@ -183,9 +183,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = chkShowOverview
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 106
-      Width = 106
+      Height = 24
+      Top = 126
+      Width = 134
       BorderSpacing.Around = 6
       Caption = 'chkTopInfoView'
       TabOrder = 7
@@ -194,14 +194,14 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
   object EditorFontGroupBox: TGroupBox
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 111
-    Top = 155
+    Height = 130
+    Top = 181
     Width = 501
     Align = alTop
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'EditorFontGroupBox'
-    ClientHeight = 93
+    ClientHeight = 111
     ClientWidth = 497
     TabOrder = 1
     object EditorFontSizeLabel: TLabel
@@ -210,9 +210,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = EditorFontSizeSpinEdit
       AnchorSideTop.Side = asrCenter
       Left = 62
-      Height = 16
-      Top = 38
-      Width = 104
+      Height = 17
+      Top = 46
+      Width = 137
       BorderSpacing.Around = 6
       Caption = 'EditorFontSizeLabel'
       ParentColor = False
@@ -222,10 +222,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExtraLineSpacingComboBox
       AnchorSideTop.Side = asrCenter
-      Left = 298
-      Height = 16
-      Top = 38
-      Width = 118
+      Left = 331
+      Height = 17
+      Top = 47
+      Width = 153
       BorderSpacing.Around = 6
       Caption = 'ExtraLineSpacingLabel'
       ParentColor = False
@@ -235,10 +235,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = ExtraCharSpacingComboBox
       AnchorSideTop.Side = asrCenter
-      Left = 298
-      Height = 16
-      Top = 67
-      Width = 121
+      Left = 331
+      Height = 17
+      Top = 82
+      Width = 156
       BorderSpacing.Around = 6
       Caption = 'ExtraCharSpacingLabel'
       ParentColor = False
@@ -248,13 +248,13 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = EditorFontGroupBox
       AnchorSideRight.Control = EditorFontButton
       Left = 6
-      Height = 23
+      Height = 29
       Top = 6
-      Width = 460
+      Width = 435
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
-      ItemHeight = 15
+      ItemHeight = 0
       OnEditingDone = EditorFontComboBoxEditingDone
       TabOrder = 0
       Text = 'EditorFontComboBox'
@@ -265,10 +265,10 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = EditorFontComboBox
       AnchorSideBottom.Side = asrBottom
-      Left = 466
-      Height = 23
+      Left = 441
+      Height = 29
       Top = 6
-      Width = 25
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
       Caption = '...'
@@ -280,8 +280,8 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = EditorFontComboBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 23
-      Top = 35
+      Height = 27
+      Top = 41
       Width = 50
       BorderSpacing.Around = 6
       OnChange = EditorFontSizeSpinEditChange
@@ -292,13 +292,13 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = EditorFontComboBox
       AnchorSideTop.Side = asrBottom
-      Left = 192
-      Height = 23
-      Top = 35
+      Left = 225
+      Height = 29
+      Top = 41
       Width = 100
       BorderSpacing.Left = 20
       BorderSpacing.Around = 6
-      ItemHeight = 15
+      ItemHeight = 0
       Items.Strings = (
         '0'
         '1'
@@ -313,12 +313,12 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideLeft.Control = ExtraLineSpacingComboBox
       AnchorSideTop.Control = ExtraLineSpacingComboBox
       AnchorSideTop.Side = asrBottom
-      Left = 192
-      Height = 23
-      Top = 64
+      Left = 225
+      Height = 29
+      Top = 76
       Width = 100
       BorderSpacing.Bottom = 6
-      ItemHeight = 15
+      ItemHeight = 0
       Items.Strings = (
         '0'
         '1'
@@ -334,9 +334,9 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       AnchorSideTop.Control = EditorFontSizeSpinEdit
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 23
-      Top = 64
-      Width = 172
+      Height = 31
+      Top = 74
+      Width = 221
       Anchors = [akTop, akLeft, akBottom]
       BorderSpacing.Around = 6
       Caption = 'DisableAntialiasingCheckBox'
@@ -348,8 +348,8 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 183
-    Top = 272
+    Height = 138
+    Top = 317
     Width = 501
     Align = alClient
     BorderSpacing.Top = 6
@@ -361,7 +361,7 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     ParentFont = False
     TabOrder = 2
     BookMarkOptions.Xoffset = 30
-    Gutter.Width = 59
+    Gutter.Width = 61
     Gutter.MouseActions = <    
       item
         ClickCount = ccAny
@@ -758,6 +758,7 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
         ShiftMask = [ssShift, ssAlt, ssCtrl]
         Command = emcMouseLink
       end>
+    MouseTextActions = <>
     MouseSelActions = <    
       item
         ClickDir = cdDown
@@ -768,6 +769,13 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     )
     VisibleSpecialChars = [vscSpace, vscTabAtLast]
     ReadOnly = True
+    SelectedColor.BackPriority = 50
+    SelectedColor.ForePriority = 50
+    SelectedColor.FramePriority = 50
+    SelectedColor.BoldPriority = 50
+    SelectedColor.ItalicPriority = 50
+    SelectedColor.UnderlinePriority = 50
+    SelectedColor.StrikeOutPriority = 50
     BracketHighlightStyle = sbhsBoth
     BracketMatchColor.Background = clNone
     BracketMatchColor.Foreground = clNone
@@ -785,7 +793,7 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
         MouseActions = <>
       end
       object TSynGutterLineNumber
-        Width = 19
+        Width = 21
         MouseActions = <>
         MarkupInfo.Background = clBtnFace
         MarkupInfo.Foreground = clNone
@@ -803,6 +811,8 @@ object EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       object TSynGutterSeparator
         Width = 2
         MouseActions = <>
+        MarkupInfo.Background = clWhite
+        MarkupInfo.Foreground = clGray
       end
       object TSynGutterCodeFolding
         MouseActions = <        
diff --git a/ide/frames/files_options.lfm b/ide/frames/files_options.lfm
index 55fcfadd16..ade1bd6678 100644
--- a/ide/frames/files_options.lfm
+++ b/ide/frames/files_options.lfm
@@ -1,33 +1,33 @@
 object FilesOptionsFrame: TFilesOptionsFrame
   Left = 0
-  Height = 460
+  Height = 505
   Top = 0
-  Width = 569
+  Width = 622
   ChildSizing.LeftRightSpacing = 2
   ChildSizing.TopBottomSpacing = 2
-  ClientHeight = 460
-  ClientWidth = 569
+  ClientHeight = 505
+  ClientWidth = 622
   TabOrder = 0
   Visible = False
-  DesignLeft = 441
-  DesignTop = 249
+  DesignLeft = 395
+  DesignTop = 121
   object MaxRecentOpenFilesLabel: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 2
-    Height = 15
+    Height = 17
     Top = 2
-    Width = 138
+    Width = 179
     Caption = 'MaxRecentOpenFilesLabel'
     ParentColor = False
   end
   object MaxRecentProjectFilesLabel: TLabel
     AnchorSideLeft.Control = lblCenter
     AnchorSideTop.Control = Owner
-    Left = 287
-    Height = 15
+    Left = 314
+    Height = 17
     Top = 2
-    Width = 146
+    Width = 192
     BorderSpacing.Left = 3
     Caption = 'MaxRecentProjectFilesLabel'
     ParentColor = False
@@ -38,9 +38,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 2
-    Height = 19
-    Top = 48
-    Width = 195
+    Height = 24
+    Top = 54
+    Width = 256
     BorderSpacing.Top = 6
     Caption = 'OpenLastProjectAtStartCheckBox'
     TabOrder = 0
@@ -51,9 +51,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 2
-    Height = 19
-    Top = 94
-    Width = 180
+    Height = 24
+    Top = 113
+    Width = 227
     BorderSpacing.Top = 2
     Caption = 'ShowCompileDialogCheckBox'
     OnChange = ShowCompileDialogCheckBoxChange
@@ -64,9 +64,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = AutoCloseCompileDialogCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 2
-    Height = 15
-    Top = 142
-    Width = 82
+    Height = 17
+    Top = 171
+    Width = 109
     BorderSpacing.Top = 10
     Caption = 'LazarusDirLabel'
     ParentColor = False
@@ -78,10 +78,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = LazarusDirComboBox
     AnchorSideBottom.Side = asrBottom
-    Left = 542
-    Height = 23
-    Top = 157
-    Width = 25
+    Left = 570
+    Height = 29
+    Top = 188
+    Width = 50
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
     OnClick = DirectoriesButtonClick
@@ -93,11 +93,11 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = LazarusDirButton
     Left = 2
-    Height = 23
-    Top = 157
-    Width = 540
+    Height = 29
+    Top = 188
+    Width = 568
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 3
     Text = 'LazarusDirComboBox'
   end
@@ -107,11 +107,11 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = CompilerPathButton
     Left = 2
-    Height = 23
-    Top = 201
-    Width = 540
+    Height = 29
+    Top = 240
+    Width = 568
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 4
     Text = 'CompilerPathComboBox'
   end
@@ -121,10 +121,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = CompilerPathComboBox
     AnchorSideBottom.Side = asrBottom
-    Left = 542
-    Height = 23
-    Top = 201
-    Width = 25
+    Left = 570
+    Height = 29
+    Top = 240
+    Width = 50
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
     OnClick = FilesButtonClick
@@ -135,9 +135,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = LazarusDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 2
-    Height = 15
-    Top = 186
-    Width = 101
+    Height = 17
+    Top = 223
+    Width = 130
     BorderSpacing.Top = 6
     Caption = 'CompilerPathLabel'
     ParentColor = False
@@ -148,11 +148,11 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = FPCSourceDirButton
     Left = 2
-    Height = 23
-    Top = 245
-    Width = 540
+    Height = 29
+    Top = 292
+    Width = 568
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 6
     Text = 'FPCSourceDirComboBox'
   end
@@ -162,10 +162,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = FPCSourceDirComboBox
     AnchorSideBottom.Side = asrBottom
-    Left = 542
-    Height = 23
-    Top = 245
-    Width = 25
+    Left = 570
+    Height = 29
+    Top = 292
+    Width = 50
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
     OnClick = DirectoriesButtonClick
@@ -176,9 +176,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = CompilerPathComboBox
     AnchorSideTop.Side = asrBottom
     Left = 2
-    Height = 15
-    Top = 230
-    Width = 100
+    Height = 17
+    Top = 275
+    Width = 129
     BorderSpacing.Top = 6
     Caption = 'FPCSourceDirLabel'
     ParentColor = False
@@ -188,9 +188,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = FPCSourceDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 2
-    Height = 15
-    Top = 274
-    Width = 81
+    Height = 17
+    Top = 327
+    Width = 105
     BorderSpacing.Top = 6
     Caption = 'MakePathLabel'
     ParentColor = False
@@ -200,9 +200,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = MakePathComboBox
     AnchorSideTop.Side = asrBottom
     Left = 2
-    Height = 15
-    Top = 318
-    Width = 92
+    Height = 17
+    Top = 379
+    Width = 119
     BorderSpacing.Top = 6
     Caption = 'TestBuildDirLabel'
     ParentColor = False
@@ -213,11 +213,11 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = MakePathButton
     Left = 2
-    Height = 23
-    Top = 289
-    Width = 540
+    Height = 29
+    Top = 344
+    Width = 568
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 8
     Text = 'MakePathComboBox'
   end
@@ -227,10 +227,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = MakePathComboBox
     AnchorSideBottom.Side = asrBottom
-    Left = 542
-    Height = 23
-    Top = 289
-    Width = 25
+    Left = 570
+    Height = 29
+    Top = 344
+    Width = 50
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
     OnClick = FilesButtonClick
@@ -242,11 +242,11 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = TestBuildDirButton
     Left = 2
-    Height = 23
-    Top = 333
-    Width = 540
+    Height = 29
+    Top = 396
+    Width = 568
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 10
     Text = 'TestBuildDirComboBox'
   end
@@ -256,10 +256,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = TestBuildDirComboBox
     AnchorSideBottom.Side = asrBottom
-    Left = 542
-    Height = 23
-    Top = 333
-    Width = 25
+    Left = 570
+    Height = 29
+    Top = 396
+    Width = 50
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
     OnClick = DirectoriesButtonClick
@@ -271,9 +271,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 32
-    Height = 19
-    Top = 113
-    Width = 206
+    Height = 24
+    Top = 137
+    Width = 261
     BorderSpacing.Left = 30
     Caption = 'AutoCloseCompileDialogCheckBox'
     TabOrder = 12
@@ -283,9 +283,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = TestBuildDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 2
-    Height = 15
-    Top = 362
-    Width = 154
+    Height = 17
+    Top = 431
+    Width = 198
     Alignment = taRightJustify
     BorderSpacing.Top = 6
     Caption = 'CompilerTranslationFileLabel'
@@ -299,10 +299,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = CompilerTranslationFileComboBox
     AnchorSideBottom.Side = asrBottom
-    Left = 542
-    Height = 23
-    Top = 377
-    Width = 25
+    Left = 570
+    Height = 29
+    Top = 448
+    Width = 50
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
     OnClick = CompilerTranslationFileButtonClick
@@ -316,11 +316,11 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = CompilerTranslationFileButton
     Left = 2
-    Height = 23
-    Top = 377
-    Width = 540
+    Height = 29
+    Top = 448
+    Width = 568
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     ParentShowHint = False
     ShowHint = True
     TabOrder = 14
@@ -329,7 +329,7 @@ object FilesOptionsFrame: TFilesOptionsFrame
   object lblCenter: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideLeft.Side = asrCenter
-    Left = 284
+    Left = 311
     Height = 1
     Top = 105
     Width = 1
@@ -342,9 +342,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Control = lblCenter
     AnchorSideRight.Side = asrBottom
     Left = 2
-    Height = 23
-    Top = 19
-    Width = 278
+    Height = 27
+    Top = 21
+    Width = 305
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Right = 3
     BorderSpacing.Around = 2
@@ -356,10 +356,10 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 289
-    Height = 23
-    Top = 19
-    Width = 278
+    Left = 316
+    Height = 27
+    Top = 21
+    Width = 304
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 3
     BorderSpacing.Around = 2
@@ -370,9 +370,9 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = MultipleInstancesComboBox
     AnchorSideTop.Side = asrCenter
     Left = 2
-    Height = 15
-    Top = 73
-    Width = 121
+    Height = 17
+    Top = 87
+    Width = 156
     Caption = 'MultipleInstancesLabel'
     ParentColor = False
   end
@@ -381,13 +381,13 @@ object FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = OpenLastProjectAtStartCheckBox
     AnchorSideTop.Side = asrBottom
-    Left = 131
-    Height = 23
-    Top = 69
+    Left = 166
+    Height = 31
+    Top = 80
     Width = 294
     BorderSpacing.Left = 8
     BorderSpacing.Top = 2
-    ItemHeight = 15
+    ItemHeight = 0
     Style = csDropDownList
     TabOrder = 17
   end
diff --git a/ide/frames/fpdoc_options.lfm b/ide/frames/fpdoc_options.lfm
index 3245c1345a..300a11453b 100644
--- a/ide/frames/fpdoc_options.lfm
+++ b/ide/frames/fpdoc_options.lfm
@@ -15,13 +15,13 @@ object FpDocOptionsFrame: TFpDocOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 198
+    Height = 207
     Top = 0
     Width = 476
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     Caption = 'LazDocPathsGroupBox'
-    ClientHeight = 180
+    ClientHeight = 188
     ClientWidth = 472
     TabOrder = 0
     object LazDocListBox: TListBox
@@ -33,16 +33,18 @@ object FpDocOptionsFrame: TFpDocOptionsFrame
       BorderSpacing.Around = 6
       ItemHeight = 0
       OnSelectionChange = LazDocListBoxSelectionChange
+      ScrollWidth = 458
       TabOrder = 0
+      TopIndex = -1
     end
     object LazDocAddPathButton: TButton
       AnchorSideLeft.Control = LazDocPathsGroupBox
       AnchorSideTop.Control = LazDocListBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 25
+      Height = 29
       Top = 120
-      Width = 146
+      Width = 166
       AutoSize = True
       BorderSpacing.Around = 6
       Caption = 'LazDocAddPathButton'
@@ -54,10 +56,10 @@ object FpDocOptionsFrame: TFpDocOptionsFrame
       AnchorSideLeft.Control = LazDocAddPathButton
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = LazDocAddPathButton
-      Left = 162
-      Height = 25
+      Left = 182
+      Height = 29
       Top = 120
-      Width = 157
+      Width = 182
       AutoSize = True
       BorderSpacing.Left = 10
       Caption = 'LazDocDeletePathButton'
@@ -72,10 +74,10 @@ object FpDocOptionsFrame: TFpDocOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = LazDocPathEdit
       AnchorSideBottom.Side = asrBottom
-      Left = 442
-      Height = 23
-      Top = 151
-      Width = 24
+      Left = 416
+      Height = 27
+      Top = 155
+      Width = 50
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
       Caption = '...'
@@ -88,9 +90,9 @@ object FpDocOptionsFrame: TFpDocOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = LazDocBrowseButton
       Left = 6
-      Height = 23
-      Top = 151
-      Width = 436
+      Height = 27
+      Top = 155
+      Width = 410
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6