diff --git a/components/anchordocking/anchordockoptionsdlg.lfm b/components/anchordocking/anchordockoptionsdlg.lfm
index 5841126d61..c078e26703 100644
--- a/components/anchordocking/anchordockoptionsdlg.lfm
+++ b/components/anchordocking/anchordockoptionsdlg.lfm
@@ -14,9 +14,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = HeaderStyleComboBox
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 15
-    Top = 41
-    Width = 111
+    Height = 16
+    Top = 32
+    Width = 127
     BorderSpacing.Left = 10
     Caption = 'DragThresholdLabel'
     ParentColor = False
@@ -26,9 +26,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = FilledHeaders
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 15
-    Top = 357
-    Width = 117
+    Height = 16
+    Top = 308
+    Width = 135
     BorderSpacing.Top = 10
     Caption = 'HeaderAlignTopLabel'
     ParentColor = False
@@ -38,9 +38,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = HeaderAlignTopTrackBar
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 15
-    Top = 428
-    Width = 120
+    Height = 16
+    Top = 380
+    Width = 134
     BorderSpacing.Top = 10
     Caption = 'HeaderAlignLeftLabel'
     ParentColor = False
@@ -50,9 +50,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = DragThresholdTrackBar
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 15
-    Top = 112
-    Width = 103
+    Height = 16
+    Top = 104
+    Width = 114
     BorderSpacing.Top = 10
     Caption = 'SplitterWidthLabel'
     ParentColor = False
@@ -62,9 +62,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = SaveLayoutOnCloseCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 24
-    Top = 203
-    Width = 160
+    Height = 18
+    Top = 190
+    Width = 172
     Caption = 'ScaleOnResizeCheckBox'
     ParentShowHint = False
     ShowHint = True
@@ -78,7 +78,7 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 10
     Height = 46
-    Top = 56
+    Top = 48
     Width = 396
     Max = 20
     OnChange = DragThresholdTrackBarChange
@@ -97,7 +97,7 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 10
     Height = 46
-    Top = 372
+    Top = 324
     Width = 396
     Frequency = 10
     Max = 150
@@ -117,7 +117,7 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 10
     Height = 46
-    Top = 443
+    Top = 396
     Width = 396
     Frequency = 10
     Max = 200
@@ -137,7 +137,7 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideRight.Side = asrBottom
     Left = 10
     Height = 46
-    Top = 127
+    Top = 120
     Width = 396
     Min = 1
     OnChange = SplitterWidthTrackBarChange
@@ -152,9 +152,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = ShowHeaderCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 25
-    Height = 24
-    Top = 251
-    Width = 191
+    Height = 18
+    Top = 226
+    Width = 209
     BorderSpacing.Left = 15
     Caption = 'ShowHeaderCaptionCheckBox'
     ParentShowHint = False
@@ -166,9 +166,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = ShowHeaderCaptionCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 25
-    Height = 24
-    Top = 275
-    Width = 249
+    Height = 18
+    Top = 244
+    Width = 275
     Caption = 'HideHeaderCaptionForFloatingCheckBox'
     ParentShowHint = False
     ShowHint = True
@@ -179,9 +179,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = ScaleOnResizeCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 24
-    Top = 227
-    Width = 149
+    Height = 18
+    Top = 208
+    Width = 160
     Caption = 'ShowHeaderCheckBox'
     OnChange = ShowHeaderCheckBoxChange
     ParentShowHint = False
@@ -194,10 +194,10 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 112
-    Height = 29
+    Left = 124
+    Height = 20
     Top = 6
-    Width = 294
+    Width = 282
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Right = 4
     BorderSpacing.Around = 6
@@ -211,9 +211,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = HeaderStyleComboBox
     AnchorSideTop.Side = asrCenter
     Left = 10
-    Height = 15
-    Top = 13
-    Width = 96
+    Height = 16
+    Top = 8
+    Width = 108
     BorderSpacing.Left = 10
     Caption = 'HeaderStyleLabel'
     ParentColor = False
@@ -223,9 +223,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = HideHeaderCaptionForFloatingCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 25
-    Height = 24
-    Top = 299
-    Width = 110
+    Height = 18
+    Top = 262
+    Width = 114
     Caption = 'FlattenHeaders'
     ParentShowHint = False
     ShowHint = True
@@ -236,9 +236,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = FlattenHeaders
     AnchorSideTop.Side = asrBottom
     Left = 25
-    Height = 24
-    Top = 323
-    Width = 100
+    Height = 18
+    Top = 280
+    Width = 105
     Caption = 'FilledHeaders'
     ParentShowHint = False
     ShowHint = True
@@ -249,9 +249,9 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     AnchorSideTop.Control = SplitterWidthTrackBar
     AnchorSideTop.Side = asrBottom
     Left = 10
-    Height = 24
-    Top = 179
-    Width = 187
+    Height = 18
+    Top = 172
+    Width = 204
     BorderSpacing.Top = 6
     Caption = 'SaveLayoutOnCloseCheckBox'
     TabOrder = 11
diff --git a/components/anchordocking/anchordockoptionsdlg.pas b/components/anchordocking/anchordockoptionsdlg.pas
index 5454b1f59a..df0e7193e3 100644
--- a/components/anchordocking/anchordockoptionsdlg.pas
+++ b/components/anchordocking/anchordockoptionsdlg.pas
@@ -228,6 +228,10 @@ var
   HasHeaders: Boolean;
 begin
   ShowHeaderCheckBox.Visible:=adofShow_ShowHeader in Flags;
+  if ShowHeaderCheckBox.Visible then
+    ShowHeaderCaptionCheckBox.BorderSpacing.Left:=15
+  else
+    ShowHeaderCaptionCheckBox.BorderSpacing.Left:=0;
   SaveLayoutOnCloseCheckBox.Visible:=adofShow_ShowSaveOnClose in Flags;
 
   HasHeaders:=ShowHeaderCheckBox.Checked;