diff --git a/ide/frames/codetools_general_options.lfm b/ide/frames/codetools_general_options.lfm
index 8a5dc6402b..894985282f 100644
--- a/ide/frames/codetools_general_options.lfm
+++ b/ide/frames/codetools_general_options.lfm
@@ -1,34 +1,32 @@
-inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
+object CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
+  Left = 0
   Height = 403
+  Top = 0
   Width = 552
   ClientHeight = 403
   ClientWidth = 552
   TabOrder = 0
   Visible = False
-  DesignLeft = 308
-  DesignTop = 350
-  object SrcPathGroupBox: TGroupBox[0]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
+  DesignLeft = 302
+  DesignTop = 344
+  object SrcPathGroupBox: TGroupBox
     Left = 0
-    Height = 57
+    Height = 54
     Top = 0
     Width = 552
     Align = alTop
     AutoSize = True
     Caption = 'SrcPathGroupBox'
-    ClientHeight = 39
-    ClientWidth = 544
+    ClientHeight = 37
+    ClientWidth = 548
     TabOrder = 0
     object SrcPathEdit: TEdit
       AnchorSideLeft.Control = SrcPathGroupBox
       AnchorSideRight.Control = SrcPathButton
       Left = 6
-      Height = 27
+      Height = 25
       Top = 6
-      Width = 509
+      Width = 513
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -42,27 +40,22 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = SrcPathEdit
       AnchorSideBottom.Side = asrBottom
-      Left = 515
-      Height = 27
+      Left = 519
+      Height = 25
       Top = 6
       Width = 23
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
       Caption = '...'
-      Color = clBtnFace
-      NumGlyphs = 0
       OnClick = SrcPathButtonClick
     end
   end
-  object JumpingGroupBox: TGroupBox[1]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = SrcPathGroupBox
+  object JumpingGroupBox: TGroupBox
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 118
-    Top = 63
+    Height = 125
+    Top = 60
     Width = 552
     Align = alTop
     AutoSize = True
@@ -70,16 +63,16 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
     Caption = 'JumpingGroupBox'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
-    ClientHeight = 100
-    ClientWidth = 544
+    ClientHeight = 108
+    ClientWidth = 548
     TabOrder = 1
     object AdjustTopLineDueToCommentCheckBox: TCheckBox
       AnchorSideLeft.Control = JumpingGroupBox
       AnchorSideTop.Control = JumpingGroupBox
       Left = 6
-      Height = 22
+      Height = 24
       Top = 6
-      Width = 287
+      Width = 247
       Caption = 'AdjustTopLineDueToCommentCheckBox'
       TabOrder = 0
     end
@@ -88,9 +81,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = AdjustTopLineDueToCommentCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 28
-      Width = 185
+      Height = 24
+      Top = 30
+      Width = 162
       Caption = 'JumpCenteredCheckBox'
       TabOrder = 1
     end
@@ -99,9 +92,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = JumpCenteredCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 50
-      Width = 209
+      Height = 24
+      Top = 54
+      Width = 179
       Caption = 'CursorBeyondEOLCheckBox'
       TabOrder = 2
     end
@@ -110,34 +103,35 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = CursorBeyondEOLCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 72
-      Width = 256
+      Height = 24
+      Top = 78
+      Width = 216
       Caption = 'SkipForwardDeclarationsCheckBox'
       TabOrder = 3
     end
   end
-  object IndentationGroupBox: TGroupBox[2]
+  object IndentationGroupBox: TGroupBox
     Left = 0
-    Height = 147
-    Top = 181
+    Height = 149
+    Top = 191
     Width = 552
     Align = alTop
     AutoSize = True
+    BorderSpacing.Top = 6
     Caption = 'IndentationGroupBox'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
-    ClientHeight = 129
-    ClientWidth = 544
+    ClientHeight = 132
+    ClientWidth = 548
     TabOrder = 2
     object IndentFileLabel: TLabel
       AnchorSideLeft.Control = IndentationGroupBox
       AnchorSideTop.Control = IndentFileEdit
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 18
-      Top = 100
-      Width = 100
+      Height = 15
+      Top = 105
+      Width = 84
       BorderSpacing.Left = 6
       Caption = 'IndentFileLabel'
       ParentColor = False
@@ -148,10 +142,10 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentFileButton
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = IndentFileButton
-      Left = 112
-      Height = 27
-      Top = 96
-      Width = 301
+      Left = 96
+      Height = 25
+      Top = 100
+      Width = 340
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -164,10 +158,10 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = IndentationGroupBox
       AnchorSideRight.Side = asrBottom
-      Left = 413
+      Left = 436
       Height = 27
-      Top = 96
-      Width = 125
+      Top = 99
+      Width = 106
       Anchors = [akTop, akRight]
       AutoSize = True
       BorderSpacing.Top = 6
@@ -182,9 +176,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentOnPasteCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 68
-      Width = 245
+      Height = 24
+      Top = 69
+      Width = 209
       Caption = 'IndentContextSensitiveCheckBox'
       TabOrder = 2
     end
@@ -193,9 +187,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = GeneralAutoIndent
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 24
-      Width = 217
+      Height = 24
+      Top = 21
+      Width = 187
       Caption = 'IndentOnLineBreakCheckBox'
       OnChange = IndentOnLineBreakCheckBoxChange
       TabOrder = 3
@@ -205,9 +199,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
       AnchorSideTop.Control = IndentOnLineBreakCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 46
-      Width = 187
+      Height = 24
+      Top = 45
+      Width = 162
       Caption = 'IndentOnPasteCheckBox'
       OnChange = IndentOnPasteCheckBoxChange
       TabOrder = 4
@@ -215,9 +209,9 @@ inherited CodetoolsGeneralOptionsFrame: TCodetoolsGeneralOptionsFrame
     object GeneralAutoIndent: TLabel
       Cursor = crHandPoint
       Left = 6
-      Height = 18
+      Height = 15
       Top = 6
-      Width = 123
+      Width = 106
       Caption = 'GeneralAutoIndent'
       Font.Color = clBlue
       ParentColor = False