diff --git a/ide/frames/editor_dividerdraw_options.lfm b/ide/frames/editor_dividerdraw_options.lfm
index e6fc06b339..e272a9a377 100644
--- a/ide/frames/editor_dividerdraw_options.lfm
+++ b/ide/frames/editor_dividerdraw_options.lfm
@@ -4,6 +4,7 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
   Anchors = [akTop]
   ClientHeight = 334
   ClientWidth = 521
+  TabOrder = 0
   Visible = False
   DesignLeft = 207
   DesignTop = 207
@@ -13,9 +14,9 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
     AnchorSideTop.Control = LanguageComboBox
     AnchorSideTop.Side = asrCenter
     Left = 206
-    Height = 16
-    Top = 9
-    Width = 81
+    Height = 18
+    Top = 12
+    Width = 98
     BorderSpacing.Left = 6
     BorderSpacing.Right = 6
     Caption = 'LanguageLabel'
@@ -30,13 +31,13 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 299
-    Top = 35
+    Height = 291
+    Top = 43
     Width = 521
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Top = 6
     BevelOuter = bvNone
-    ClientHeight = 299
+    ClientHeight = 291
     ClientWidth = 521
     TabOrder = 1
     object DividerSpinPanel: TPanel
@@ -45,14 +46,14 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
       AnchorSideRight.Control = DividerConfPanel
       AnchorSideRight.Side = asrBottom
       Left = 206
-      Height = 25
+      Height = 27
       Top = 0
       Width = 315
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Left = 6
       BevelOuter = bvNone
-      ClientHeight = 25
+      ClientHeight = 27
       ClientWidth = 315
       TabOrder = 1
       object DividerSpinLabel: TLabel
@@ -63,7 +64,7 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
         AnchorSideRight.Control = DividerSpinPanel
         AnchorSideRight.Side = asrBottom
         Left = 53
-        Height = 16
+        Height = 18
         Top = 4
         Width = 262
         Anchors = [akTop, akLeft, akRight]
@@ -75,10 +76,12 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
         AnchorSideLeft.Control = DividerSpinPanel
         AnchorSideTop.Control = DividerSpinPanel
         Left = 0
-        Height = 25
+        Height = 27
         Top = 0
         Width = 50
         OnChange = DividerSpinEditChange
+        ParentShowHint = False
+        ShowHint = True
         TabOrder = 0
       end
     end
@@ -89,15 +92,15 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
       AnchorSideRight.Control = DividerConfPanel
       AnchorSideRight.Side = asrBottom
       Left = 206
-      Height = 44
-      Top = 81
+      Height = 55
+      Top = 94
       Width = 315
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BevelOuter = bvNone
-      ClientHeight = 44
+      ClientHeight = 55
       ClientWidth = 315
       TabOrder = 2
       Visible = False
@@ -105,9 +108,9 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
         AnchorSideLeft.Control = NestLvlPanel
         AnchorSideTop.Control = NestLvlPanel
         Left = 0
-        Height = 16
+        Height = 18
         Top = 0
-        Width = 97
+        Width = 115
         Caption = 'NestLvlColorLabel'
         ParentColor = False
       end
@@ -115,27 +118,32 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
         AnchorSideLeft.Control = NestLvlPanel
         AnchorSideTop.Control = NestLvlColorLabel
         AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = NestLvlColorCheckBox
         Left = 0
-        Height = 22
-        Top = 22
-        Width = 100
+        Height = 31
+        Top = 24
+        Width = 136
         DefaultColorColor = clWhite
         Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames]
+        Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
+        BorderSpacing.Right = 6
         ItemHeight = 16
         OnChange = NestLvlColorBoxChange
         TabOrder = 0
       end
       object NestLvlColorCheckBox: TCheckBox
-        AnchorSideLeft.Control = NestLvlColorBox
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = NestLvlColorBox
         AnchorSideTop.Side = asrCenter
-        Left = 106
-        Height = 19
-        Top = 24
-        Width = 140
-        BorderSpacing.Left = 6
+        AnchorSideRight.Control = NestLvlPanel
+        AnchorSideRight.Side = asrBottom
+        Left = 142
+        Height = 22
+        Top = 28
+        Width = 167
+        Anchors = [akTop, akRight]
+        BorderSpacing.Right = 6
         Caption = 'NestLvlColorCheckBox'
         OnChange = NestLvlColorCheckBoxChange
         TabOrder = 1
@@ -148,24 +156,24 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
       AnchorSideRight.Control = DividerConfPanel
       AnchorSideRight.Side = asrBottom
       Left = 206
-      Height = 44
-      Top = 31
+      Height = 55
+      Top = 33
       Width = 315
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BevelOuter = bvNone
-      ClientHeight = 44
+      ClientHeight = 55
       ClientWidth = 315
       TabOrder = 3
       object TopLvlColorLabel: TLabel
         AnchorSideLeft.Control = TopLvlPanel
         AnchorSideTop.Control = TopLvlPanel
         Left = 0
-        Height = 16
+        Height = 18
         Top = 0
-        Width = 94
+        Width = 106
         Caption = 'TopLvlColorLabel'
         ParentColor = False
       end
@@ -173,27 +181,32 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
         AnchorSideLeft.Control = TopLvlPanel
         AnchorSideTop.Control = TopLvlColorLabel
         AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = TopLvlColorCheckBox
         Left = 0
-        Height = 22
-        Top = 22
-        Width = 100
+        Height = 31
+        Top = 24
+        Width = 145
         DefaultColorColor = clWhite
         Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames]
+        Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
+        BorderSpacing.Right = 6
         ItemHeight = 16
         OnChange = TopLvlColorBoxChange
         TabOrder = 0
       end
       object TopLvlColorCheckBox: TCheckBox
-        AnchorSideLeft.Control = TopLvlColorBox
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = TopLvlColorBox
         AnchorSideTop.Side = asrCenter
-        Left = 106
-        Height = 19
-        Top = 24
-        Width = 137
-        BorderSpacing.Left = 6
+        AnchorSideRight.Control = TopLvlPanel
+        AnchorSideRight.Side = asrBottom
+        Left = 151
+        Height = 22
+        Top = 28
+        Width = 158
+        Anchors = [akTop, akRight]
+        BorderSpacing.Right = 6
         Caption = 'TopLvlColorCheckBox'
         OnChange = TopLvlColorCheckBoxChange
         TabOrder = 1
@@ -206,7 +219,7 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
       AnchorSideBottom.Control = DividerConfPanel
       AnchorSideBottom.Side = asrBottom
       Left = 0
-      Height = 299
+      Height = 291
       Top = 0
       Width = 200
       Anchors = [akTop, akLeft, akBottom]
@@ -216,17 +229,18 @@ inherited EditorDividerDrawOptionsFrame: TEditorDividerDrawOptionsFrame
       OnExit = DividerConfigListBoxClick
       OnKeyUp = DividerConfigListBoxKeyUp
       TabOrder = 0
+      TopIndex = -1
     end
   end
   object LanguageComboBox: TComboBox[2]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 23
+    Height = 31
     Top = 6
     Width = 200
     BorderSpacing.Top = 6
-    ItemHeight = 15
+    ItemHeight = 0
     OnChange = LanguageComboBoxChange
     OnExit = LanguageComboBoxExit
     OnKeyDown = LanguageComboBoxKeyDown
diff --git a/ide/frames/editor_dividerdraw_options.lrs b/ide/frames/editor_dividerdraw_options.lrs
index f897c3f645..c7825148f2 100644
--- a/ide/frames/editor_dividerdraw_options.lrs
+++ b/ide/frames/editor_dividerdraw_options.lrs
@@ -3,89 +3,96 @@
 LazarusResources.Add('TEditorDividerDrawOptionsFrame','FORMDATA',[
   'TPF0'#241#30'TEditorDividerDrawOptionsFrame'#29'EditorDividerDrawOptionsFram'
   +'e'#6'Height'#3'N'#1#5'Width'#3#9#2#7'Anchors'#11#5'akTop'#0#12'ClientHeight'
-  +#3'N'#1#11'ClientWidth'#3#9#2#7'Visible'#8#10'DesignLeft'#3#207#0#9'DesignTo'
-  +'p'#3#207#0#0#242#2#0#6'TLabel'#13'LanguageLabel'#22'AnchorSideLeft.Control'
-  +#7#16'LanguageComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide'
-  +'Top.Control'#7#16'LanguageComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
-  +'Left'#3#206#0#6'Height'#2#16#3'Top'#2#9#5'Width'#2'Q'#18'BorderSpacing.Left'
-  +#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'LanguageLabel'#11'ParentCol'
-  +'or'#8#0#0#242#2#1#6'TPanel'#16'DividerConfPanel'#22'AnchorSideLeft.Control'
-  +#7#5'Owner'#21'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide'
-  +'Right.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Ancho'
-  +'rSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3'+'#1#3'Top'#2'#'#5
-  +'Width'#3#9#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'B'
-  +'orderSpacing.Top'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#3'+'#1#11
-  +'ClientWidth'#3#9#2#8'TabOrder'#2#1#0#6'TPanel'#16'DividerSpinPanel'#19'Anch'
-  +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'DividerConfP'
-  +'anel'#23'AnchorSideRight.Control'#7#16'DividerConfPanel'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#25#3'Top'#2#0#5'Width'#3
-  +';'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderS'
-  +'pacing.Left'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#25#11'Client'
-  +'Width'#3';'#1#8'TabOrder'#2#1#0#6'TLabel'#16'DividerSpinLabel'#22'AnchorSid'
-  +'eLeft.Control'#7#15'DividerSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#21'AnchorSideTop.Control'#7#15'DividerSpinEdit'#18'AnchorSideTop.Side'#7#9
-  +'asrCenter'#23'AnchorSideRight.Control'#7#16'DividerSpinPanel'#20'AnchorSide'
-  +'Right.Side'#7#9'asrBottom'#4'Left'#2'5'#6'Height'#2#16#3'Top'#2#4#5'Width'#3
-  +#6#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#3
-  +#7'Caption'#6#16'DividerSpinLabel'#11'ParentColor'#8#0#0#9'TSpinEdit'#15'Div'
-  +'iderSpinEdit'#22'AnchorSideLeft.Control'#7#16'DividerSpinPanel'#21'AnchorSi'
-  +'deTop.Control'#7#16'DividerSpinPanel'#4'Left'#2#0#6'Height'#2#25#3'Top'#2#0
-  +#5'Width'#2'2'#8'OnChange'#7#21'DividerSpinEditChange'#8'TabOrder'#2#0#0#0#0
-  +#6'TPanel'#12'NestLvlPanel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anchor'
-  +'SideTop.Control'#7#11'TopLvlPanel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#16'DividerConfPanel'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#3#206#0#6'Height'#2','#3'Top'#2'Q'#5'Width'#3';'#1#7'Anc'
-  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Lef'
-  +'t'#2#6#17'BorderSpacing.Top'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'
-  +#2','#11'ClientWidth'#3';'#1#8'TabOrder'#2#2#7'Visible'#8#0#6'TLabel'#17'Nes'
-  +'tLvlColorLabel'#22'AnchorSideLeft.Control'#7#12'NestLvlPanel'#21'AnchorSide'
-  +'Top.Control'#7#12'NestLvlPanel'#4'Left'#2#0#6'Height'#2#16#3'Top'#2#0#5'Wid'
-  +'th'#2'a'#7'Caption'#6#17'NestLvlColorLabel'#11'ParentColor'#8#0#0#9'TColorB'
-  +'ox'#15'NestLvlColorBox'#22'AnchorSideLeft.Control'#7#12'NestLvlPanel'#21'An'
-  +'chorSideTop.Control'#7#17'NestLvlColorLabel'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Bottom'#4'Left'#2#0#6'Height'#2#22#3'Top'#2#22#5'Width'#2'd'#17'DefaultColo'
-  +'rColor'#7#7'clWhite'#5'Style'#11#16'cbStandardColors'#16'cbExtendedColors'
-  +#14'cbSystemColors'#16'cbIncludeDefault'#13'cbCustomColor'#13'cbPrettyNames'
-  +#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#16#8'OnChange'#7#21'NestLvlCol'
-  +'orBoxChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#20'NestLvlColorCheckBox'#22'A'
-  +'nchorSideLeft.Control'#7#15'NestLvlColorBox'#19'AnchorSideLeft.Side'#7#9'as'
-  +'rBottom'#21'AnchorSideTop.Control'#7#15'NestLvlColorBox'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#19#3'Top'#2#24#5'Width'#3#140#0
-  +#18'BorderSpacing.Left'#2#6#7'Caption'#6#20'NestLvlColorCheckBox'#8'OnChange'
-  +#7#26'NestLvlColorCheckBoxChange'#8'TabOrder'#2#1#0#0#0#6'TPanel'#11'TopLvlP'
-  +'anel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16
-  +'DividerSpinPanel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.'
-  +'Control'#7#16'DividerConfPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
-  +'eft'#3#206#0#6'Height'#2','#3'Top'#2#31#5'Width'#3';'#1#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'Bord'
-  +'erSpacing.Top'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2','#11'Clie'
-  +'ntWidth'#3';'#1#8'TabOrder'#2#3#0#6'TLabel'#16'TopLvlColorLabel'#22'AnchorS'
-  +'ideLeft.Control'#7#11'TopLvlPanel'#21'AnchorSideTop.Control'#7#11'TopLvlPan'
-  +'el'#4'Left'#2#0#6'Height'#2#16#3'Top'#2#0#5'Width'#2'^'#7'Caption'#6#16'Top'
-  +'LvlColorLabel'#11'ParentColor'#8#0#0#9'TColorBox'#14'TopLvlColorBox'#22'Anc'
-  +'horSideLeft.Control'#7#11'TopLvlPanel'#21'AnchorSideTop.Control'#7#16'TopLv'
-  ,'lColorLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2
-  +#22#3'Top'#2#22#5'Width'#2'd'#17'DefaultColorColor'#7#7'clWhite'#5'Style'#11
-  +#16'cbStandardColors'#16'cbExtendedColors'#14'cbSystemColors'#16'cbIncludeDe'
-  +'fault'#13'cbCustomColor'#13'cbPrettyNames'#0#17'BorderSpacing.Top'#2#6#10'I'
-  +'temHeight'#2#16#8'OnChange'#7#20'TopLvlColorBoxChange'#8'TabOrder'#2#0#0#0#9
-  +'TCheckBox'#19'TopLvlColorCheckBox'#22'AnchorSideLeft.Control'#7#14'TopLvlCo'
-  +'lorBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#14'TopLvlColorBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Hei'
-  +'ght'#2#19#3'Top'#2#24#5'Width'#3#137#0#18'BorderSpacing.Left'#2#6#7'Caption'
-  +#6#19'TopLvlColorCheckBox'#8'OnChange'#7#25'TopLvlColorCheckBoxChange'#8'Tab'
-  +'Order'#2#1#0#0#0#13'TCheckListBox'#20'DividerConfigListBox'#22'AnchorSideLe'
-  +'ft.Control'#7#16'DividerConfPanel'#21'AnchorSideTop.Control'#7#16'DividerCo'
-  +'nfPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
-  +'l'#7#16'DividerConfPanel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2
-  +#0#6'Height'#3'+'#1#3'Top'#2#0#5'Width'#3#200#0#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#8'akBottom'#0#14'ExtendedSelect'#8#10'ItemHeight'#2#0#7'OnClick'#7#25
-  +'DividerConfigListBoxClick'#6'OnExit'#7#25'DividerConfigListBoxClick'#7'OnKe'
-  +'yUp'#7#25'DividerConfigListBoxKeyUp'#8'TabOrder'#2#0#0#0#0#242#2#2#9'TCombo'
-  +'Box'#16'LanguageComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
-  +'deTop.Control'#7#5'Owner'#4'Left'#2#0#6'Height'#2#23#3'Top'#2#6#5'Width'#3
-  +#200#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#15#8'OnChange'#7#22'Langua'
-  +'geComboBoxChange'#6'OnExit'#7#20'LanguageComboBoxExit'#9'OnKeyDown'#7#23'La'
-  +'nguageComboBoxKeyDown'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#0
+  +#3'N'#1#11'ClientWidth'#3#9#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3
+  +#207#0#9'DesignTop'#3#207#0#0#242#2#0#6'TLabel'#13'LanguageLabel'#22'AnchorS'
+  +'ideLeft.Control'#7#16'LanguageComboBox'#19'AnchorSideLeft.Side'#7#9'asrBott'
+  +'om'#21'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'AnchorSideTop.Side'
+  +#7#9'asrCenter'#4'Left'#3#206#0#6'Height'#2#18#3'Top'#2#12#5'Width'#2'b'#18
+  +'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'Languag'
+  +'eLabel'#11'ParentColor'#8#0#0#242#2#1#6'TPanel'#16'DividerConfPanel'#22'Anc'
+  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'LanguageComb'
+  +'oBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
+  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3
+  +'#'#1#3'Top'#2'+'#5'Width'#3#9#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#8'akBottom'#0#17'BorderSpacing.Top'#2#6#10'BevelOuter'#7#6'bvNone'#12'Clien'
+  +'tHeight'#3'#'#1#11'ClientWidth'#3#9#2#8'TabOrder'#2#1#0#6'TPanel'#16'Divide'
+  +'rSpinPanel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
+  +#7#16'DividerConfPanel'#23'AnchorSideRight.Control'#7#16'DividerConfPanel'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#27#3'Top'#2
+  +#0#5'Width'#3';'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'
+  +#9#18'BorderSpacing.Left'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2
+  +#27#11'ClientWidth'#3';'#1#8'TabOrder'#2#1#0#6'TLabel'#16'DividerSpinLabel'
+  +#22'AnchorSideLeft.Control'#7#15'DividerSpinEdit'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#15'DividerSpinEdit'#18'AnchorSideTop'
+  +'.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#16'DividerSpinPanel'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'5'#6'Height'#2#18#3'Top'#2#4
+  +#5'Width'#3#6#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpaci'
+  +'ng.Left'#2#3#7'Caption'#6#16'DividerSpinLabel'#11'ParentColor'#8#0#0#9'TSpi'
+  +'nEdit'#15'DividerSpinEdit'#22'AnchorSideLeft.Control'#7#16'DividerSpinPanel'
+  +#21'AnchorSideTop.Control'#7#16'DividerSpinPanel'#4'Left'#2#0#6'Height'#2#27
+  +#3'Top'#2#0#5'Width'#2'2'#8'OnChange'#7#21'DividerSpinEditChange'#14'ParentS'
+  +'howHint'#8#8'ShowHint'#9#8'TabOrder'#2#0#0#0#0#6'TPanel'#12'NestLvlPanel'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'TopLvlPa'
+  +'nel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#16
+  +'DividerConfPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#206#0#6
+  +'Height'#2'7'#3'Top'#2'^'#5'Width'#3';'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
+  +#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'7'#11'ClientWidth'#3';'#1#8
+  +'TabOrder'#2#2#7'Visible'#8#0#6'TLabel'#17'NestLvlColorLabel'#22'AnchorSideL'
+  +'eft.Control'#7#12'NestLvlPanel'#21'AnchorSideTop.Control'#7#12'NestLvlPanel'
+  +#4'Left'#2#0#6'Height'#2#18#3'Top'#2#0#5'Width'#2's'#7'Caption'#6#17'NestLvl'
+  +'ColorLabel'#11'ParentColor'#8#0#0#9'TColorBox'#15'NestLvlColorBox'#22'Ancho'
+  +'rSideLeft.Control'#7#12'NestLvlPanel'#21'AnchorSideTop.Control'#7#17'NestLv'
+  +'lColorLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr'
+  +'ol'#7#20'NestLvlColorCheckBox'#4'Left'#2#0#6'Height'#2#31#3'Top'#2#24#5'Wid'
+  +'th'#3#136#0#17'DefaultColorColor'#7#7'clWhite'#5'Style'#11#16'cbStandardCol'
+  +'ors'#16'cbExtendedColors'#14'cbSystemColors'#16'cbIncludeDefault'#13'cbCust'
+  +'omColor'#13'cbPrettyNames'#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#10'ItemHeight'#2#16#8
+  +'OnChange'#7#21'NestLvlColorBoxChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#20'N'
+  +'estLvlColorCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
+  +'p.Control'#7#15'NestLvlColorBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'A'
+  +'nchorSideRight.Control'#7#12'NestLvlPanel'#20'AnchorSideRight.Side'#7#9'asr'
+  +'Bottom'#4'Left'#3#142#0#6'Height'#2#22#3'Top'#2#28#5'Width'#3#167#0#7'Ancho'
+  +'rs'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#20'Ne'
+  +'stLvlColorCheckBox'#8'OnChange'#7#26'NestLvlColorCheckBoxChange'#8'TabOrder'
+  +#2#1#0#0#0#6'TPanel'#11'TopLvlPanel'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#16'DividerSpinPanel'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#16'DividerConfPanel'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2'7'#3'Top'#2'!'#5'Wid'
+  +'th'#3';'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'B'
+  +'orderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#10'BevelOuter'#7#6'bvNone'
+  +#12'ClientHeight'#2'7'#11'ClientWidth'#3';'#1#8'TabOrder'#2#3#0#6'TLabel'#16
+  +'TopLvlColorLabel'#22'AnchorSideLeft.Control'#7#11'TopLvlPanel'#21'AnchorSid'
+  ,'eTop.Control'#7#11'TopLvlPanel'#4'Left'#2#0#6'Height'#2#18#3'Top'#2#0#5'Wid'
+  +'th'#2'j'#7'Caption'#6#16'TopLvlColorLabel'#11'ParentColor'#8#0#0#9'TColorBo'
+  +'x'#14'TopLvlColorBox'#22'AnchorSideLeft.Control'#7#11'TopLvlPanel'#21'Ancho'
+  +'rSideTop.Control'#7#16'TopLvlColorLabel'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#23'AnchorSideRight.Control'#7#19'TopLvlColorCheckBox'#4'Left'#2#0#6'Hei'
+  +'ght'#2#31#3'Top'#2#24#5'Width'#3#145#0#17'DefaultColorColor'#7#7'clWhite'#5
+  +'Style'#11#16'cbStandardColors'#16'cbExtendedColors'#14'cbSystemColors'#16'c'
+  +'bIncludeDefault'#13'cbCustomColor'#13'cbPrettyNames'#0#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'
+  +#2#6#10'ItemHeight'#2#16#8'OnChange'#7#20'TopLvlColorBoxChange'#8'TabOrder'#2
+  +#0#0#0#9'TCheckBox'#19'TopLvlColorCheckBox'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#21'AnchorSideTop.Control'#7#14'TopLvlColorBox'#18'AnchorSideTop.Side'
+  +#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'TopLvlPanel'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#4'Left'#3#151#0#6'Height'#2#22#3'Top'#2#28#5'Widt'
+  +'h'#3#158#0#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7
+  +'Caption'#6#19'TopLvlColorCheckBox'#8'OnChange'#7#25'TopLvlColorCheckBoxChan'
+  +'ge'#8'TabOrder'#2#1#0#0#0#13'TCheckListBox'#20'DividerConfigListBox'#22'Anc'
+  +'horSideLeft.Control'#7#16'DividerConfPanel'#21'AnchorSideTop.Control'#7#16
+  +'DividerConfPanel'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBott'
+  +'om.Control'#7#16'DividerConfPanel'#21'AnchorSideBottom.Side'#7#9'asrBottom'
+  +#4'Left'#2#0#6'Height'#3'#'#1#3'Top'#2#0#5'Width'#3#200#0#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#8'akBottom'#0#14'ExtendedSelect'#8#10'ItemHeight'#2#0#7'OnCl'
+  +'ick'#7#25'DividerConfigListBoxClick'#6'OnExit'#7#25'DividerConfigListBoxCli'
+  +'ck'#7'OnKeyUp'#7#25'DividerConfigListBoxKeyUp'#8'TabOrder'#2#0#8'TopIndex'#2
+  +#255#0#0#0#242#2#2#9'TComboBox'#16'LanguageComboBox'#22'AnchorSideLeft.Contr'
+  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#0#6'Height'#2
+  +#31#3'Top'#2#6#5'Width'#3#200#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#0
+  +#8'OnChange'#7#22'LanguageComboBoxChange'#6'OnExit'#7#20'LanguageComboBoxExi'
+  +'t'#9'OnKeyDown'#7#23'LanguageComboBoxKeyDown'#5'Style'#7#14'csDropDownList'
+  +#8'TabOrder'#2#0#0#0#0
 ]);
diff --git a/ide/frames/editor_dividerdraw_options.pas b/ide/frames/editor_dividerdraw_options.pas
index 0167f50426..55a2d636b0 100644
--- a/ide/frames/editor_dividerdraw_options.pas
+++ b/ide/frames/editor_dividerdraw_options.pas
@@ -263,6 +263,7 @@ end;
 procedure TEditorDividerDrawOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
 begin
   LanguageLabel.Caption := dlgLang;
+  DividerSpinEdit.Hint := lis0No1DrawDividerLinesOnlyForTopLevel2DrawLinesForFi;
   DividerSpinLabel.Caption := dlgDividerDrawDepth;
   TopLvlColorLabel.Caption := dlgDividerTopColor;
   TopLvlColorCheckBox.Caption := dlgDividerColorDefault;
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 456b7bb636..b2ccf88876 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1332,6 +1332,9 @@ resourcestring
   lisEdOptsChooseScheme = 'Choose Scheme';
   dlgEdHintCommand = 'Hint: click on the command you want to edit';
   dlgLang = 'Language';
+  lis0No1DrawDividerLinesOnlyForTopLevel2DrawLinesForFi = '0 = no, 1 = draw '
+    +'divider lines only for top level, 2 = draw lines for first two '
+    +'levels, ...';
   dlgClrScheme = 'Color Scheme';
   dlgFileExts = 'File extensions';
   dlgSetElementDefault = 'Set element to default';