diff --git a/ide/frames/editor_indent_options.lfm b/ide/frames/editor_indent_options.lfm
index 0dda6414c8..bb5c8e149b 100644
--- a/ide/frames/editor_indent_options.lfm
+++ b/ide/frames/editor_indent_options.lfm
@@ -15,9 +15,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = BlockIndentComboBox
     AnchorSideTop.Side = asrCenter
     Left = 322
-    Height = 15
-    Top = 137
-    Width = 91
+    Height = 13
+    Top = 125
+    Width = 81
     BorderSpacing.Around = 6
     Caption = 'BlockIndentLabel'
     ParentColor = False
@@ -28,9 +28,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = TabWidthsComboBox
     AnchorSideTop.Side = asrCenter
     Left = 322
-    Height = 15
-    Top = 31
-    Width = 85
+    Height = 13
+    Top = 29
+    Width = 76
     BorderSpacing.Around = 6
     Caption = 'TabWidthsLabel'
     ParentColor = False
@@ -41,9 +41,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = BlockIndentTypeComboBox
     AnchorSideTop.Side = asrCenter
     Left = 322
-    Height = 15
-    Top = 90
-    Width = 114
+    Height = 13
+    Top = 82
+    Width = 104
     BorderSpacing.Around = 6
     Caption = 'AutoIndentTypeLabel'
     ParentColor = False
@@ -53,11 +53,11 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = lblBlockIndentKeys
     AnchorSideBottom.Control = TabWidthsComboBox
     Left = 216
-    Height = 23
-    Top = 133
+    Height = 21
+    Top = 121
     Width = 100
     BorderSpacing.Top = 3
-    ItemHeight = 15
+    ItemHeight = 13
     Items.Strings = (
       '0'
       '1'
@@ -77,11 +77,11 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 216
-    Height = 23
-    Top = 27
+    Height = 21
+    Top = 25
     Width = 100
     BorderSpacing.Top = 6
-    ItemHeight = 15
+    ItemHeight = 13
     Items.Strings = (
       '1'
       '2'
@@ -100,8 +100,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = CenterLabel1
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 86
+    Height = 17
+    Top = 78
     Width = 201
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -117,8 +117,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = CenterLabel1
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 166
+    Height = 17
+    Top = 150
     Width = 201
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -135,8 +135,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = CenterLabel1
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 46
+    Height = 17
+    Top = 42
     Width = 201
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -152,8 +152,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = CenterLabel1
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 19
-    Top = 27
+    Height = 17
+    Top = 25
     Width = 201
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 6
@@ -168,10 +168,10 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = AutoIndentCheckBox
     AnchorSideBottom.Control = TabWidthsComboBox
     Left = 216
-    Height = 23
-    Top = 86
+    Height = 21
+    Top = 78
     Width = 100
-    ItemHeight = 15
+    ItemHeight = 13
     ItemWidth = 200
     OnChange = ComboboxOnChange
     OnExit = ComboBoxOnExit
@@ -185,9 +185,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Side = asrBottom
     Cursor = crHandPoint
     Left = 24
-    Height = 15
-    Top = 105
-    Width = 82
+    Height = 13
+    Top = 95
+    Width = 73
     BorderSpacing.Left = 18
     Caption = 'AutoIndentLink'
     Font.Color = clBlue
@@ -212,7 +212,7 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 15
+    Height = 13
     Top = 6
     Width = 433
     Caption = 'TabsGroupDivider'
@@ -228,11 +228,11 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = TabWidthsComboBox
     Left = 216
-    Height = 23
-    Top = 159
+    Height = 21
+    Top = 145
     Width = 100
     BorderSpacing.Top = 3
-    ItemHeight = 15
+    ItemHeight = 13
     Items.Strings = (
       '0'
       '1'
@@ -249,9 +249,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = BlockTabIndentComboBox
     AnchorSideTop.Side = asrCenter
     Left = 322
-    Height = 15
-    Top = 163
-    Width = 91
+    Height = 13
+    Top = 149
+    Width = 81
     BorderSpacing.Around = 6
     Caption = 'BlockIndentLabel'
     ParentColor = False
@@ -261,10 +261,10 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = lblBlockIndentKeys
     Cursor = crHandPoint
-    Left = 112
-    Height = 15
-    Top = 130
-    Width = 85
+    Left = 101
+    Height = 13
+    Top = 118
+    Width = 74
     BorderSpacing.Left = 6
     Caption = 'BlockIndentLink'
     Font.Color = clBlue
@@ -279,9 +279,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = AutoIndentLink
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 15
-    Top = 130
-    Width = 100
+    Height = 13
+    Top = 118
+    Width = 89
     BorderSpacing.Left = 6
     BorderSpacing.Top = 10
     Caption = 'lblBlockIndentKeys'
@@ -294,8 +294,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 15
-    Top = 71
+    Height = 13
+    Top = 65
     Width = 433
     Caption = 'IndentsGroupDivider'
     Autosize = True
@@ -309,9 +309,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideTop.Control = lblBlockIndentKeys
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 15
-    Top = 148
-    Width = 121
+    Height = 13
+    Top = 134
+    Width = 107
     BorderSpacing.Left = 6
     BorderSpacing.Top = 3
     Caption = 'lblBlockIndentShortcut'
@@ -324,8 +324,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 15
-    Top = 191
+    Height = 13
+    Top = 173
     Width = 433
     Caption = 'CommentsGroupDivider'
     Autosize = True
@@ -341,8 +341,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 25
-    Top = 206
+    Height = 24
+    Top = 186
     Width = 433
     Align = alNone
     Anchors = [akTop, akLeft, akRight]
@@ -363,7 +363,7 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     end
     object tbCurly: TToolButton
       Tag = 1
-      Left = 43
+      Left = 39
       Top = 0
       AutoSize = True
       Caption = 'tbCurly'
@@ -373,7 +373,7 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     end
     object tbShlash: TToolButton
       Tag = 2
-      Left = 90
+      Left = 82
       Top = 0
       AutoSize = True
       Caption = 'tbShlash'
@@ -398,26 +398,24 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 142
-    Top = 231
+    Height = 189
+    Top = 210
     Width = 433
     PageIndex = 0
+    AutoSize = True
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 9
     TabStop = True
     object AnsiPage: TPage
       object cbAnsiEnableAutoContinue: TCheckBox
         AnchorSideLeft.Control = AnsiPage
-        AnchorSideRight.Control = AnsiCenterLabel
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 19
+        Height = 17
         Top = 3
-        Width = 201
-        Anchors = [akTop, akLeft, akRight]
+        Width = 147
         BorderSpacing.Left = 6
         BorderSpacing.Top = 3
-        BorderSpacing.Right = 10
         Caption = 'cbAnsiEnableAutoContinue'
         OnChange = cbAnsiEnableAutoContinueChange
         TabOrder = 0
@@ -427,9 +425,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Control = edAnsiMatch
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 15
-        Top = 36
-        Width = 67
+        Height = 13
+        Top = 34
+        Width = 57
         BorderSpacing.Left = 6
         Caption = 'lbAnsiMatch'
         ParentColor = False
@@ -439,12 +437,12 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = cbAnsiEnableAutoContinue
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = AnsiCenterLabel
+        AnchorSideRight.Control = AnsiPage
         AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 23
-        Top = 32
-        Width = 128
+        Left = 69
+        Height = 21
+        Top = 30
+        Width = 354
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 6
         BorderSpacing.Top = 10
@@ -457,65 +455,62 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Control = edAnsiPrefix
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 15
-        Top = 65
-        Width = 62
+        Height = 13
+        Top = 98
+        Width = 56
         BorderSpacing.Left = 6
         Caption = 'lbAnsiPrefix'
         ParentColor = False
       end
       object edAnsiPrefix: TEdit
-        AnchorSideLeft.Control = edAnsiMatch
-        AnchorSideTop.Control = edAnsiMatch
+        AnchorSideLeft.Control = lbAnsiPrefix
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = cbAnsiMatchMode
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = AnsiCenterLabel
+        AnchorSideRight.Control = AnsiPage
         AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 23
-        Top = 61
-        Width = 128
+        Left = 68
+        Height = 21
+        Top = 94
+        Width = 355
         Anchors = [akTop, akLeft, akRight]
-        BorderSpacing.Top = 6
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 16
         BorderSpacing.Right = 10
         Constraints.MinWidth = 50
         TabOrder = 2
       end
       object cbAnsiMatchMode: TComboBox
-        AnchorSideLeft.Control = AnsiCenterLabel
+        AnchorSideLeft.Control = edAnsiMatch
         AnchorSideTop.Control = edAnsiMatch
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = AnsiPage
         AnchorSideRight.Side = asrBottom
-        Left = 216
-        Height = 23
-        Top = 32
-        Width = 207
+        Left = 69
+        Height = 21
+        Top = 57
+        Width = 354
         Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         Style = csDropDownList
         TabOrder = 3
       end
-      object AnsiCenterLabel: TLabel
-        AnchorSideLeft.Control = AnsiPage
-        AnchorSideLeft.Side = asrCenter
-        Left = 216
-        Height = 1
-        Top = 0
-        Width = 1
-        ParentColor = False
-      end
       object cbAnsiIndentMode: TComboBox
-        AnchorSideLeft.Control = AnsiCenterLabel
+        AnchorSideLeft.Control = edAnsiPrefix
         AnchorSideTop.Control = edAnsiPrefix
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = AnsiPage
         AnchorSideRight.Side = asrBottom
-        Left = 216
-        Height = 23
-        Top = 61
-        Width = 207
+        Left = 68
+        Height = 21
+        Top = 121
+        Width = 355
         Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         OnChange = cbAnsiIndentModeChange
         Style = csDropDownList
         TabOrder = 4
@@ -526,8 +521,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 23
-        Top = 108
+        Height = 21
+        Top = 168
         Width = 100
         BorderSpacing.Left = 6
         BorderSpacing.Top = 3
@@ -536,17 +531,15 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
       end
       object lbAnsiAlignMax: TLabel
         AnchorSideLeft.Control = AnsiPage
-        AnchorSideTop.Control = edAnsiPrefix
+        AnchorSideTop.Control = cbAnsiIndentMode
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = AnsiPage
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 15
-        Top = 90
-        Width = 427
-        Anchors = [akTop, akLeft, akRight]
+        Height = 13
+        Top = 152
+        Width = 71
         BorderSpacing.Left = 6
-        BorderSpacing.Top = 6
+        BorderSpacing.Top = 10
         Caption = 'lbAnsiAlignMax'
         ParentColor = False
         WordWrap = True
@@ -555,16 +548,13 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     object CurlyPage: TPage
       object cbCurlyEnableAutoContinue: TCheckBox
         AnchorSideLeft.Control = CurlyPage
-        AnchorSideRight.Control = CurlyCenterLabel
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 19
+        Height = 17
         Top = 3
-        Width = 197
-        Anchors = [akTop, akLeft, akRight]
+        Width = 152
         BorderSpacing.Left = 6
         BorderSpacing.Top = 3
-        BorderSpacing.Right = 10
         Caption = 'cbCurlyEnableAutoContinue'
         OnChange = cbCurlyEnableAutoContinueChange
         TabOrder = 0
@@ -574,9 +564,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Control = edCurlyMatch
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 15
-        Top = 36
-        Width = 67
+        Height = 13
+        Top = 34
+        Width = 62
         BorderSpacing.Left = 6
         Caption = 'lbCurlyMatch'
         ParentColor = False
@@ -586,12 +576,12 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = cbCurlyEnableAutoContinue
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = CurlyCenterLabel
+        AnchorSideRight.Control = CurlyPage
         AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 23
-        Top = 32
-        Width = 124
+        Left = 74
+        Height = 21
+        Top = 30
+        Width = 349
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 6
         BorderSpacing.Top = 10
@@ -603,64 +593,61 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Control = edCurlyPrefix
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 15
-        Top = 65
-        Width = 62
+        Height = 13
+        Top = 98
+        Width = 61
         BorderSpacing.Left = 6
         Caption = 'lbCurlyPrefix'
         ParentColor = False
       end
       object edCurlyPrefix: TEdit
-        AnchorSideLeft.Control = edCurlyMatch
-        AnchorSideTop.Control = edCurlyMatch
+        AnchorSideLeft.Control = lbCurlyPrefix
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = cbCurlyMatchMode
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = CurlyCenterLabel
+        AnchorSideRight.Control = CurlyPage
         AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 23
-        Top = 61
-        Width = 124
+        Left = 73
+        Height = 21
+        Top = 94
+        Width = 350
         Anchors = [akTop, akLeft, akRight]
-        BorderSpacing.Top = 6
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 16
         BorderSpacing.Right = 10
         TabOrder = 2
       end
       object cbCurlyMatchMode: TComboBox
-        AnchorSideLeft.Control = CurlyCenterLabel
+        AnchorSideLeft.Control = edCurlyMatch
         AnchorSideTop.Control = edCurlyMatch
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = CurlyPage
         AnchorSideRight.Side = asrBottom
-        Left = 212
-        Height = 23
-        Top = 32
-        Width = 203
+        Left = 74
+        Height = 21
+        Top = 57
+        Width = 349
         Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         Style = csDropDownList
         TabOrder = 3
       end
-      object CurlyCenterLabel: TLabel
-        AnchorSideLeft.Control = CurlyPage
-        AnchorSideLeft.Side = asrCenter
-        Left = 212
-        Height = 1
-        Top = 0
-        Width = 1
-        ParentColor = False
-      end
       object cbCurlyIndentMode: TComboBox
-        AnchorSideLeft.Control = CurlyCenterLabel
+        AnchorSideLeft.Control = edCurlyPrefix
         AnchorSideTop.Control = edCurlyPrefix
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = CurlyPage
         AnchorSideRight.Side = asrBottom
-        Left = 212
-        Height = 23
-        Top = 61
-        Width = 203
+        Left = 73
+        Height = 21
+        Top = 121
+        Width = 350
         Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         OnChange = cbCurlyIndentModeChange
         Style = csDropDownList
         TabOrder = 4
@@ -671,8 +658,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 23
-        Top = 108
+        Height = 21
+        Top = 168
         Width = 100
         BorderSpacing.Left = 6
         BorderSpacing.Top = 3
@@ -681,17 +668,15 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
       end
       object lbCurlyAlignMax: TLabel
         AnchorSideLeft.Control = CurlyPage
-        AnchorSideTop.Control = edCurlyPrefix
+        AnchorSideTop.Control = cbCurlyIndentMode
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = CurlyPage
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 15
-        Top = 90
-        Width = 427
-        Anchors = [akTop, akLeft, akRight]
+        Height = 13
+        Top = 152
+        Width = 76
         BorderSpacing.Left = 6
-        BorderSpacing.Top = 6
+        BorderSpacing.Top = 10
         Caption = 'lbCurlyAlignMax'
         ParentColor = False
         WordWrap = True
@@ -700,16 +685,13 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
     object SlashPage: TPage
       object cbSlashEnableAutoContinue: TCheckBox
         AnchorSideLeft.Control = SlashPage
-        AnchorSideRight.Control = SlashCenterLabel
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 19
+        Height = 17
         Top = 3
-        Width = 197
-        Anchors = [akTop, akLeft, akRight]
+        Width = 152
         BorderSpacing.Left = 6
         BorderSpacing.Top = 3
-        BorderSpacing.Right = 10
         Caption = 'cbSlashEnableAutoContinue'
         OnChange = cbSlashEnableAutoContinueChange
         TabOrder = 0
@@ -719,9 +701,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Control = edSlashMatch
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 15
-        Top = 36
-        Width = 71
+        Height = 13
+        Top = 64
+        Width = 62
         BorderSpacing.Left = 6
         Caption = 'lbSlashMatch'
         ParentColor = False
@@ -729,17 +711,17 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
       object edSlashMatch: TEdit
         AnchorSideLeft.Control = lbSlashMatch
         AnchorSideLeft.Side = asrBottom
-        AnchorSideTop.Control = cbSlashEnableAutoContinue
+        AnchorSideTop.Control = cbSlashExtend
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = SlashCenterLabel
+        AnchorSideRight.Control = SlashPage
         AnchorSideRight.Side = asrBottom
-        Left = 83
-        Height = 23
-        Top = 32
-        Width = 120
+        Left = 74
+        Height = 21
+        Top = 60
+        Width = 349
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 6
-        BorderSpacing.Top = 10
+        BorderSpacing.Top = 16
         BorderSpacing.Right = 10
         TabOrder = 1
       end
@@ -748,81 +730,79 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Control = edSlashPrefix
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 15
-        Top = 65
-        Width = 66
+        Height = 13
+        Top = 128
+        Width = 61
         BorderSpacing.Left = 6
         Caption = 'lbSlashPrefix'
         ParentColor = False
       end
       object edSlashPrefix: TEdit
-        AnchorSideLeft.Control = edSlashMatch
-        AnchorSideTop.Control = edSlashMatch
+        AnchorSideLeft.Control = lbSlashPrefix
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = cbSlashMatchMode
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = SlashCenterLabel
+        AnchorSideRight.Control = SlashPage
         AnchorSideRight.Side = asrBottom
-        Left = 83
-        Height = 23
-        Top = 61
-        Width = 120
+        Left = 73
+        Height = 21
+        Top = 124
+        Width = 350
         Anchors = [akTop, akLeft, akRight]
-        BorderSpacing.Top = 6
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 16
         BorderSpacing.Right = 10
         TabOrder = 2
       end
       object cbSlashMatchMode: TComboBox
-        AnchorSideLeft.Control = SlashCenterLabel
+        AnchorSideLeft.Control = edSlashMatch
         AnchorSideTop.Control = edSlashMatch
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = SlashPage
         AnchorSideRight.Side = asrBottom
-        Left = 212
-        Height = 23
-        Top = 32
-        Width = 203
+        Left = 74
+        Height = 21
+        Top = 87
+        Width = 349
         Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         Style = csDropDownList
         TabOrder = 3
       end
-      object SlashCenterLabel: TLabel
-        AnchorSideLeft.Control = SlashPage
-        AnchorSideLeft.Side = asrCenter
-        Left = 212
-        Height = 1
-        Top = 0
-        Width = 1
-        ParentColor = False
-      end
       object cbSlashIndentMode: TComboBox
-        AnchorSideLeft.Control = SlashCenterLabel
+        AnchorSideLeft.Control = edSlashPrefix
         AnchorSideTop.Control = edSlashPrefix
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = SlashPage
         AnchorSideRight.Side = asrBottom
-        Left = 212
-        Height = 23
-        Top = 61
-        Width = 203
+        Left = 73
+        Height = 21
+        Top = 151
+        Width = 350
         Anchors = [akTop, akLeft, akRight]
+        BorderSpacing.Top = 6
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         OnChange = cbSlashIndentModeChange
         Style = csDropDownList
         TabOrder = 4
       end
       object cbSlashExtend: TComboBox
-        AnchorSideLeft.Control = SlashCenterLabel
-        AnchorSideTop.Control = SlashPage
+        AnchorSideLeft.Control = cbSlashEnableAutoContinue
+        AnchorSideTop.Control = cbSlashEnableAutoContinue
+        AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = SlashPage
         AnchorSideRight.Side = asrBottom
-        Left = 212
-        Height = 23
-        Top = 3
-        Width = 203
+        Left = 6
+        Height = 21
+        Top = 23
+        Width = 417
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 3
         BorderSpacing.Right = 10
-        ItemHeight = 15
+        ItemHeight = 13
         Style = csDropDownList
         TabOrder = 6
       end
@@ -832,8 +812,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
         AnchorSideTop.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 23
-        Top = 108
+        Height = 21
+        Top = 198
         Width = 100
         BorderSpacing.Left = 6
         BorderSpacing.Top = 3
@@ -842,17 +822,15 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
       end
       object lbSlashAlignMax: TLabel
         AnchorSideLeft.Control = SlashPage
-        AnchorSideTop.Control = edSlashPrefix
+        AnchorSideTop.Control = cbSlashIndentMode
         AnchorSideTop.Side = asrBottom
-        AnchorSideRight.Control = SlashPage
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 15
-        Top = 90
-        Width = 427
-        Anchors = [akTop, akLeft, akRight]
+        Height = 13
+        Top = 182
+        Width = 76
         BorderSpacing.Left = 6
-        BorderSpacing.Top = 6
+        BorderSpacing.Top = 10
         Caption = 'lbSlashAlignMax'
         ParentColor = False
         WordWrap = True
diff --git a/ide/frames/editor_indent_options.pas b/ide/frames/editor_indent_options.pas
index 3e41fdbf0c..b0744f8bda 100644
--- a/ide/frames/editor_indent_options.pas
+++ b/ide/frames/editor_indent_options.pas
@@ -47,7 +47,6 @@ type
     CommentsGroupDivider: TDividerBevel;
     lblBlockIndentShortcut: TLabel;
 
-    AnsiCenterLabel: TLabel;
     cbAnsiEnableAutoContinue: TCheckBox;
     edAnsiMatch: TEdit;
     edAnsiPrefix: TEdit;
@@ -59,7 +58,6 @@ type
     edAnsiAlignMax: TSpinEdit;
 
 
-    CurlyCenterLabel: TLabel;
     cbCurlyEnableAutoContinue: TCheckBox;
     edCurlyMatch: TEdit;
     edCurlyPrefix: TEdit;
@@ -70,7 +68,6 @@ type
     lbCurlyAlignMax: TLabel;
     edCurlyAlignMax: TSpinEdit;
 
-    SlashCenterLabel: TLabel;
     cbSlashEnableAutoContinue: TCheckBox;
     edSlashMatch: TEdit;
     edSlashPrefix: TEdit;