diff --git a/ide/frames/codetools_general_options.lfm b/ide/frames/codetools_general_options.lfm
index 1bd999d209..c2c06fba3d 100644
--- a/ide/frames/codetools_general_options.lfm
+++ b/ide/frames/codetools_general_options.lfm
@@ -13,20 +13,20 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 52
+    Height = 53
     Top = 0
     Width = 552
     Align = alTop
     AutoSize = True
     Caption = 'SrcPathGroupBox'
-    ClientHeight = 33
+    ClientHeight = 35
     ClientWidth = 548
     TabOrder = 0
     object SrcPathEdit: TEdit
       AnchorSideLeft.Control = SrcPathGroupBox
       AnchorSideRight.Control = SrcPathButton
       Left = 6
-      Height = 27
+      Height = 23
       Top = 6
       Width = 513
       Anchors = [akTop, akLeft, akRight]
@@ -43,11 +43,12 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideBottom.Control = SrcPathEdit
       AnchorSideBottom.Side = asrBottom
       Left = 519
-      Height = 27
+      Height = 23
       Top = 6
       Width = 23
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
+      Caption = '...'
       Color = clBtnFace
       NumGlyphs = 0
       OnClick = SrcPathButtonClick
@@ -60,23 +61,23 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 155
-    Top = 58
+    Height = 142
+    Top = 59
     Width = 552
     Align = alTop
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'JumpingGroupBox'
-    ClientHeight = 136
+    ClientHeight = 124
     ClientWidth = 548
     TabOrder = 1
     object AdjustTopLineDueToCommentCheckBox: TCheckBox
       AnchorSideLeft.Control = JumpingGroupBox
       AnchorSideTop.Control = JumpingGroupBox
       Left = 6
-      Height = 22
+      Height = 19
       Top = 6
-      Width = 277
+      Width = 238
       BorderSpacing.Around = 6
       Caption = 'AdjustTopLineDueToCommentCheckBox'
       TabOrder = 0
@@ -86,9 +87,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = AdjustTopLineDueToCommentCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 40
-      Width = 178
+      Height = 19
+      Top = 37
+      Width = 149
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'JumpCenteredCheckBox'
@@ -99,9 +100,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = JumpCenteredCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 74
-      Width = 202
+      Height = 19
+      Top = 68
+      Width = 168
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'CursorBeyondEOLCheckBox'
@@ -112,9 +113,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = CursorBeyondEOLCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 108
-      Width = 244
+      Height = 19
+      Top = 99
+      Width = 202
       BorderSpacing.Top = 6
       BorderSpacing.Around = 6
       Caption = 'SkipForwardDeclarationsCheckBox'
@@ -123,13 +124,13 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
   end
   object IndentationGroupBox: TGroupBox[2]
     Left = 0
-    Height = 144
-    Top = 213
+    Height = 130
+    Top = 201
     Width = 552
     Align = alTop
     AutoSize = True
     Caption = 'IndentationGroupBox'
-    ClientHeight = 125
+    ClientHeight = 112
     ClientWidth = 548
     TabOrder = 2
     object IndentFileLabel: TLabel
@@ -137,9 +138,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentFileEdit
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 18
-      Top = 95
-      Width = 95
+      Height = 16
+      Top = 85
+      Width = 81
       BorderSpacing.Left = 6
       Caption = 'IndentFileLabel'
       ParentColor = False
@@ -150,10 +151,10 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentFileButton
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = IndentFileButton
-      Left = 107
-      Height = 27
-      Top = 91
-      Width = 320
+      Left = 93
+      Height = 23
+      Top = 82
+      Width = 335
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -166,10 +167,10 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = IndentationGroupBox
       AnchorSideRight.Side = asrBottom
-      Left = 427
-      Height = 29
-      Top = 90
-      Width = 115
+      Left = 428
+      Height = 25
+      Top = 81
+      Width = 114
       Anchors = [akTop, akRight]
       AutoSize = True
       BorderSpacing.Top = 6
@@ -184,9 +185,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentOnPasteCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 62
-      Width = 235
+      Height = 19
+      Top = 56
+      Width = 193
       BorderSpacing.Around = 6
       Caption = 'IndentContextSensitiveCheckBox'
       TabOrder = 2
@@ -195,9 +196,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideLeft.Control = IndentationGroupBox
       AnchorSideTop.Control = IndentationGroupBox
       Left = 6
-      Height = 22
+      Height = 19
       Top = 6
-      Width = 208
+      Width = 173
       BorderSpacing.Around = 6
       Caption = 'IndentOnLineBreakCheckBox'
       OnChange = IndentOnLineBreakCheckBoxChange
@@ -208,9 +209,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentOnLineBreakCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 34
-      Width = 180
+      Height = 19
+      Top = 31
+      Width = 150
       BorderSpacing.Around = 6
       Caption = 'IndentOnPasteCheckBox'
       OnChange = IndentOnPasteCheckBoxChange