diff --git a/components/anchordocking/anchordocking.pas b/components/anchordocking/anchordocking.pas
index a544343b45..7205a07608 100644
--- a/components/anchordocking/anchordocking.pas
+++ b/components/anchordocking/anchordocking.pas
@@ -1287,6 +1287,8 @@ begin
   HideHeaderCaptionFloatingControl:=Config.GetValue('HideHeaderCaptionFloatingControl',true);
   AllowDragging:=Config.GetValue('AllowDragging',true);
   HeaderStyle:=StrToADHeaderStyle(Config.GetValue('HeaderStyle',ADHeaderStyleNames[adhsDefault]));
+  HeaderFlatten:=Config.GetValue('HeaderFlatten',true);
+  HeaderFilled:=Config.GetValue('HeaderFilled',true);
   Config.UndoAppendBasePath;
 end;
 
@@ -1306,6 +1308,8 @@ begin
   Config.SetDeleteValue('HideHeaderCaptionFloatingControl',HideHeaderCaptionFloatingControl,true);
   Config.SetDeleteValue('AllowDragging',AllowDragging,true);
   Config.SetDeleteValue('HeaderStyle',ADHeaderStyleNames[HeaderStyle],ADHeaderStyleNames[adhsDefault]);
+  Config.SetDeleteValue('HeaderFlatten',HeaderFlatten,true);
+  Config.SetDeleteValue('HeaderFilled',HeaderFilled,true);
   Config.UndoAppendBasePath;
 end;
 
@@ -1325,6 +1329,8 @@ begin
       and (HideHeaderCaptionFloatingControl=Settings.HideHeaderCaptionFloatingControl)
       and (AllowDragging=Settings.AllowDragging)
       and (HeaderStyle=Settings.HeaderStyle)
+      and (HeaderFlatten=Settings.HeaderFlatten)
+      and (HeaderFilled=Settings.HeaderFilled)
       ;
 end;
 
diff --git a/components/anchordocking/anchordockoptionsdlg.lfm b/components/anchordocking/anchordockoptionsdlg.lfm
index 69ee7dc5ad..b048061014 100644
--- a/components/anchordocking/anchordockoptionsdlg.lfm
+++ b/components/anchordocking/anchordockoptionsdlg.lfm
@@ -225,6 +225,8 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     Top = 253
     Width = 99
     Caption = 'FlattenHeaders'
+    ParentShowHint = False
+    ShowHint = True
     TabOrder = 9
   end
   object FilledHeaders: TCheckBox
@@ -236,6 +238,8 @@ object AnchorDockOptionsFrame: TAnchorDockOptionsFrame
     Top = 272
     Width = 91
     Caption = 'FilledHeaders'
+    ParentShowHint = False
+    ShowHint = True
     TabOrder = 10
   end
 end
diff --git a/components/anchordocking/anchordockoptionsdlg.pas b/components/anchordocking/anchordockoptionsdlg.pas
index cf26b8deb4..92c2ec7afb 100644
--- a/components/anchordocking/anchordockoptionsdlg.pas
+++ b/components/anchordocking/anchordockoptionsdlg.pas
@@ -313,7 +313,12 @@ begin
     TheSettings.HideHeaderCaptionFloatingControl;
 
   FlattenHeaders.Checked:=TheSettings.HeaderFlatten;
+  FlattenHeaders.Caption:=adrsFlattenHeaders;
+  FlattenHeaders.Hint:=adrsFlattenHeadersHint;
+
   FilledHeaders.Checked:=TheSettings.HeaderFilled;
+  FilledHeaders.Caption:=adrsFilledHeaders;
+  FilledHeaders.Hint:=adrsFilledHeadersHint;
 end;
 
 end.
diff --git a/components/anchordocking/anchordockstr.pas b/components/anchordocking/anchordockstr.pas
index ced96c9eed..04cb25e467 100644
--- a/components/anchordocking/anchordockstr.pas
+++ b/components/anchordocking/anchordockstr.pas
@@ -122,6 +122,11 @@ resourcestring
   adrsDockingAnchordocking = 'Docking / Anchordocking';
   adrsHeaderStyle = 'Header Style:';
 
+  adrsFlattenHeaders = 'Flatten headers';
+  adrsFlattenHeadersHint = 'Flat headers of docked controls';
+  adrsFilledHeaders = 'Filled headers';
+  adrsFilledHeadersHint = 'Fill headers of docked controls';
+
 implementation
 
 end.
diff --git a/components/anchordocking/languages/anchordockstr.cs.po b/components/anchordocking/languages/anchordockstr.cs.po
index bc91800985..c69469f999 100644
--- a/components/anchordocking/languages/anchordockstr.cs.po
+++ b/components/anchordocking/languages/anchordockstr.cs.po
@@ -110,6 +110,22 @@ msgstr "Chyba načítání rozvržení oken ze souboru \"%s\"%s%s"
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Chyba zapisování rozvržení oken do souboru \"%s\"%s%s"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Obecné volby ukotvení"
diff --git a/components/anchordocking/languages/anchordockstr.de.po b/components/anchordocking/languages/anchordockstr.de.po
index 9f17f27aaa..eece6066df 100644
--- a/components/anchordocking/languages/anchordockstr.de.po
+++ b/components/anchordocking/languages/anchordockstr.de.po
@@ -109,6 +109,22 @@ msgstr ""
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr ""
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Allgemeine Docking-Einstellungen"
diff --git a/components/anchordocking/languages/anchordockstr.es.po b/components/anchordocking/languages/anchordockstr.es.po
index e411ee0b8a..512aa4e7ab 100644
--- a/components/anchordocking/languages/anchordockstr.es.po
+++ b/components/anchordocking/languages/anchordockstr.es.po
@@ -110,6 +110,22 @@ msgstr "Error al cargar el diseño de ventana de archivo \"%s\"%s%s"
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Error al escribir archivo \"%s\"%s%s diseño de ventana"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Opciones generales de acoplamiento"
diff --git a/components/anchordocking/languages/anchordockstr.it.po b/components/anchordocking/languages/anchordockstr.it.po
index 3b6ed176ff..c7a159f129 100644
--- a/components/anchordocking/languages/anchordockstr.it.po
+++ b/components/anchordocking/languages/anchordockstr.it.po
@@ -113,6 +113,22 @@ msgstr "Errore nel caricamento del layout della finestra dal file \"%s\"%s%s"
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Errore nella scrittura del layout della finestra dal file \"%s\"%s%s"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Opzioni generiche di docking"
diff --git a/components/anchordocking/languages/anchordockstr.lt.po b/components/anchordocking/languages/anchordockstr.lt.po
index 37e7efe200..4147162891 100644
--- a/components/anchordocking/languages/anchordockstr.lt.po
+++ b/components/anchordocking/languages/anchordockstr.lt.po
@@ -113,6 +113,22 @@ msgstr "Iš failo „%s“ nepavyko įkelti lango maketo, nes:%s%s"
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Lango maketo nepavyko įrašyti failan „%s“, nes:%s%s"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Pagrindinės pritvirtinimo parinktys"
diff --git a/components/anchordocking/languages/anchordockstr.po b/components/anchordocking/languages/anchordockstr.po
index 1805a5cbe5..53b58d2a54 100644
--- a/components/anchordocking/languages/anchordockstr.po
+++ b/components/anchordocking/languages/anchordockstr.po
@@ -101,6 +101,22 @@ msgstr ""
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr ""
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr ""
diff --git a/components/anchordocking/languages/anchordockstr.pt_BR.po b/components/anchordocking/languages/anchordockstr.pt_BR.po
index 4b4550c0d1..8dd64a560c 100644
--- a/components/anchordocking/languages/anchordockstr.pt_BR.po
+++ b/components/anchordocking/languages/anchordockstr.pt_BR.po
@@ -112,6 +112,22 @@ msgstr "Erro ao carregar \"layout\" da janela do arquivo \"%s\"%s%s"
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Erro ao gravar \"layout\" da janela para arquivo \"%s\"%s%s"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Opções gerais de ancoragem"
diff --git a/components/anchordocking/languages/anchordockstr.ru.po b/components/anchordocking/languages/anchordockstr.ru.po
index 220614695b..bbba633e31 100644
--- a/components/anchordocking/languages/anchordockstr.ru.po
+++ b/components/anchordocking/languages/anchordockstr.ru.po
@@ -110,6 +110,22 @@ msgstr "Ошибка загрузки разбивки окна из файла
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Ошибка записи разбивки окна в файл \"%s\"%s%s"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Общие параметры стыковки"
diff --git a/components/anchordocking/languages/anchordockstr.uk.po b/components/anchordocking/languages/anchordockstr.uk.po
index 6e36c9e9a9..1c9febbef6 100644
--- a/components/anchordocking/languages/anchordockstr.uk.po
+++ b/components/anchordocking/languages/anchordockstr.uk.po
@@ -113,6 +113,22 @@ msgstr "Помилка завантаження віконної схеми з 
 msgid "Error writing window layout to file \"%s\"%s%s"
 msgstr "Помилка запису віконної схеми в файл \"%s\"%s%s"
 
+#: anchordockstr.adrsfilledheaders
+msgid "Filled headers"
+msgstr ""
+
+#: anchordockstr.adrsfilledheadershint
+msgid "Fill headers of docked controls"
+msgstr ""
+
+#: anchordockstr.adrsflattenheaders
+msgid "Flatten headers"
+msgstr ""
+
+#: anchordockstr.adrsflattenheadershint
+msgid "Flat headers of docked controls"
+msgstr ""
+
 #: anchordockstr.adrsgeneraldockingoptions
 msgid "General docking options"
 msgstr "Загальні параметри стикування"