diff --git a/locales/Afrikaans.lng b/locales/Afrikaans.lng
index be24f3a85..3ffb7fa61 100644
--- a/locales/Afrikaans.lng
+++ b/locales/Afrikaans.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Belarusian.lng b/locales/Belarusian.lng
index 10c5ffad9..57cc321ad 100644
--- a/locales/Belarusian.lng
+++ b/locales/Belarusian.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Chinese Simplified.lng b/locales/Chinese Simplified.lng
index 0bebbf3e8..9a7749cef 100644
--- a/locales/Chinese Simplified.lng	
+++ b/locales/Chinese Simplified.lng	
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Dutch.lng b/locales/Dutch.lng
index 1bbc6e058..0d0e16124 100644
--- a/locales/Dutch.lng
+++ b/locales/Dutch.lng
@@ -870,7 +870,7 @@
 866=Afbeeldingen gebruiken in SVG
 867=Uitgebreide notities gebruiken
 868=Uitgebreide namen behouden (alleen geavanceerde gebruikers)
-869=Grafiekvensters maximaliseren
+869=Chart windows show mode
 870=Verlengde boom
 871=Cirkelgrafiek (alleen voorouders)
 872=Open in nieuw venster
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/English.lng b/locales/English.lng
index 74b751dac..2ef2afdf6 100644
--- a/locales/English.lng
+++ b/locales/English.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG		; options dialog
 867=Use extended notes				; options dialog
 868=Keep rich names (only advanced users)	; options dialog
-869=Maximize chart windows			; options dialog
+869=Chart windows show mode			; options dialog
 870=Extended tree					; options dialog
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Hungarian.lng b/locales/Hungarian.lng
index fda88acaa..f40a7055e 100644
--- a/locales/Hungarian.lng
+++ b/locales/Hungarian.lng
@@ -870,7 +870,7 @@
 866=Használjon beágyazott képeket SVG formátumban
 867=Használjon kiterjesztett jegyzeteket
 868=A gazdag nevek megtartása (csak haladó felhasználók)
-869=Legagyobb ablak méret
+869=Chart windows show mode
 870=Kiterjesztett fa
 871=Rajongói diagram (csak ősök)
 872=Megnyitás új ablakban
@@ -952,3 +952,8 @@
 944=Eltávolítja a legfelső szintű linket?
 945=Ezen a nyelven nem érhető el súgó. Megjelenik egy angol nyelvű súgó.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Icelandic.lng b/locales/Icelandic.lng
index 975f33a4b..78ec6d382 100644
--- a/locales/Icelandic.lng
+++ b/locales/Icelandic.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Japanese.lng b/locales/Japanese.lng
index fe0f5cd11..6e3895042 100644
--- a/locales/Japanese.lng
+++ b/locales/Japanese.lng
@@ -870,7 +870,7 @@
 866=SVGでインライン画像を使用する
 867=拡張ノートを使用する
 868=リッチネームを保持する (アドバンスドユーザーのみ)
-869=チャートウィンドウの最大化
+869=Chart windows show mode
 870=拡張系図
 871=ファンチャート (祖先のみ)
 872=新規ウインドウで開く
@@ -952,3 +952,8 @@
 944=トップレベルのリンクを削除しますか？
 945=この言語ではヘルプを利用できません。英語のヘルプが表示されます。
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Kazakh (Cyrillic).lng b/locales/Kazakh (Cyrillic).lng
index 258e7c492..52790d493 100644
--- a/locales/Kazakh (Cyrillic).lng	
+++ b/locales/Kazakh (Cyrillic).lng	
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Portuguese.lng b/locales/Portuguese.lng
index 058790d6f..aa479d5ad 100644
--- a/locales/Portuguese.lng
+++ b/locales/Portuguese.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Serbian (Latin).lng b/locales/Serbian (Latin).lng
index 938e7c29d..dcd58cde0 100644
--- a/locales/Serbian (Latin).lng	
+++ b/locales/Serbian (Latin).lng	
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/Spanish.lng b/locales/Spanish.lng
index 4269986fd..f1452747b 100644
--- a/locales/Spanish.lng
+++ b/locales/Spanish.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/czech.lng b/locales/czech.lng
index 74a3ce5c7..395b76360 100644
--- a/locales/czech.lng
+++ b/locales/czech.lng
@@ -870,7 +870,7 @@
 866=Použít vložené obrázky ve formátu SVG
 867=Použít rozšířené poznámky
 868=Ponechat zvýrazněné názvy (pouze pokročilí uživatelé)
-869=Maximalizovat okna grafu
+869=Chart windows show mode
 870=Rozšířený strom
 871=Graf vějíř (pouze předci)
 872=Otevřít v novém okně
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/french.lng b/locales/french.lng
index 1fa5662a0..7b2232838 100644
--- a/locales/french.lng
+++ b/locales/french.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Arbre étendu
 871=Fan chart (only ancestors)
 872=Ouvrir dans une nouvelle fenêtre
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/german.lng b/locales/german.lng
index fbc75b9ae..777a5dbbf 100644
--- a/locales/german.lng
+++ b/locales/german.lng
@@ -870,7 +870,7 @@
 866=Bilder in SVG-Dateien einbetten
 867=Erweiterte Formatierung von Bemerkungen
 868=Schreibe immer alle Namensbestandteile (nur für fortgeschrittene Benutzer)
-869=Diagrammfenster maximieren
+869=Chart windows show mode
 870=Erweiterter Stammbaum
 871=Fächerdiagramm (nur Vorfahren)
 872=In neuem Fenster öffnen
@@ -952,3 +952,8 @@
 944=Verweis auf oberster Ebene löschen?
 945=Hilfe ist für diese Sprache nicht verfügbar. Es wird eine englische Hilfe angezeigt.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/help_enu/gkhHistory.html b/locales/help_enu/gkhHistory.html
index 826dc8c08..393137e91 100644
--- a/locales/help_enu/gkhHistory.html
+++ b/locales/help_enu/gkhHistory.html
@@ -12,6 +12,8 @@ <h1>Change log</h1>
 
     <p>
         <b>02.03.2024 [v2.29.1 &amp; v3.5.1]</b><ul>
+            <li>The option to maximize chart windows has been replaced with an option to select a show mode.
+            <li>Fixed scaling of additional symbols on tree diagrams.
             <li>Added localization to Afrikaans language [Steyn van der Walt].
             <li>Added call to detailed information about places in the place management tool (pop-up menu).
             <li>Fixed loading of some jpeg images.
diff --git a/locales/help_rus/gkhHistory.html b/locales/help_rus/gkhHistory.html
index a17b2f965..f09bff913 100644
--- a/locales/help_rus/gkhHistory.html
+++ b/locales/help_rus/gkhHistory.html
@@ -12,6 +12,8 @@ <h1>История версий</h1>
 
     <p>
         <b>02.03.2024 [v2.29.1 &amp; v3.5.1]</b><ul>
+            <li>Опция максимизации окон диаграмм заменена на опцию выбора режима отображения.
+            <li>Исправлено масштабирование дополнительных обозначений на диаграммах деревьев.
             <li>Добавлена локализация на язык африкаанс [Steyn van der Walt].
             <li>Добавлен вызов детальной информации о местах в инструмент управления местами (всплывающее меню).
             <li>Исправлена загрузка некоторых изображений jpeg.
diff --git a/locales/italian.lng b/locales/italian.lng
index 02f4bd4be..589864e4a 100644
--- a/locales/italian.lng
+++ b/locales/italian.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/polish.lng b/locales/polish.lng
index fab86deb5..7ebe2a7f2 100644
--- a/locales/polish.lng
+++ b/locales/polish.lng
@@ -870,7 +870,7 @@
 866=Use inline images in SVG
 867=Use extended notes
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/locales/russian.lng b/locales/russian.lng
index b37cb70e9..65bc9cc92 100644
--- a/locales/russian.lng
+++ b/locales/russian.lng
@@ -870,7 +870,7 @@
 866=Встраивать изображения в SVG
 867=Использовать расширенные заметки
 868=Сохранять "насыщенные" имена (только продвинутые пользователи)
-869=Разворачивать окна диаграмм
+869=Режим окон диаграмм
 870=Расширенные деревья
 871=Веерная диаграмма (только предки)
 872=Открыть в новом окне
@@ -952,3 +952,8 @@
 944=Удалить ссылку на верхний уровень?
 945=Справка недоступна для этого языка. Будет показана справка на английском языке.
 946=Адрес (№№ улицы и дома)
+
+947=Обычный
+948=Максимизировать
+949=Левая половина
+950=Правая половина
diff --git a/locales/ukrainian.lng b/locales/ukrainian.lng
index 85c288c24..1b90f8103 100644
--- a/locales/ukrainian.lng
+++ b/locales/ukrainian.lng
@@ -870,7 +870,7 @@
 866=Використовувати вбудовані зображення у SVG
 867=Використовувати розширені нотатки
 868=Keep rich names (only advanced users)
-869=Maximize chart windows
+869=Chart windows show mode
 870=Extended tree
 871=Fan chart (only ancestors)
 872=Open in a new window
@@ -952,3 +952,8 @@
 944=Remove top level link?
 945=Help is not available for this language. An English help will be shown.
 946=Address (st. & h.n.)
+
+947=Default
+948=Maximize
+949=Left half
+950=Right half
diff --git a/projects/GKCore/GKCore/AppHost.cs b/projects/GKCore/GKCore/AppHost.cs
index b6cbfc0b4..cd259be85 100644
--- a/projects/GKCore/GKCore/AppHost.cs
+++ b/projects/GKCore/GKCore/AppHost.cs
@@ -559,6 +559,36 @@ public void WidgetClose(IWidget widget)
 
         public abstract ExtRect GetActiveScreenWorkingArea();
 
+        public abstract void SetWindowBounds(IWindow window, ExtRect bounds);
+
+        public void SetWindowBounds(IWindow window, ChartWindowsShowMode mode)
+        {
+            var scrBounds = GetActiveScreenWorkingArea();
+
+            switch (mode) {
+                case ChartWindowsShowMode.Default:
+                    break;
+
+                case ChartWindowsShowMode.Maximize:
+                    SetWindowBounds(window, scrBounds);
+                    break;
+
+                case ChartWindowsShowMode.LeftHalf: {
+                        int half = scrBounds.Width / 2;
+                        var halfBounds = new ExtRect(scrBounds.Left, scrBounds.Top, half, scrBounds.Height);
+                        SetWindowBounds(window, halfBounds);
+                    }
+                    break;
+
+                case ChartWindowsShowMode.RightHalf: {
+                        int half = scrBounds.Width / 2;
+                        var halfBounds = new ExtRect(scrBounds.Left + half, scrBounds.Top, half, scrBounds.Height);
+                        SetWindowBounds(window, halfBounds);
+                    }
+                    break;
+            }
+        }
+
         public virtual void WidgetLocate(IWidgetForm view, WidgetLocation location)
         {
             // May have a desktop-only implementation
diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
index e5b159918..844bb4677 100644
--- a/projects/GKCore/GKCore/Charts/TreeChartModel.cs
+++ b/projects/GKCore/GKCore/Charts/TreeChartModel.cs
@@ -106,6 +106,7 @@ public class TreeChartModel : ChartModel
         private TreeChartPerson fRoot;
         private GDMIndividualRecord fRootRec;
         private float fScale;
+        private float fPicScale;
         private IImage[] fSignsPic;
         private IBrush fSolidBlack;
         private int fSpouseDistance;
@@ -864,6 +865,7 @@ private int InitInfoSize()
 
         private void Predef()
         {
+            fPicScale = (fScale < 1.0f) ? fScale : 1.0f;
             float fsz = (float)Math.Round(fOptions.DefFontSize * fScale, 2);
 #if NETCORE && OS_MSWIN
             // Eto.Forms [WPF] <= 2.7.4
@@ -1609,15 +1611,17 @@ private void DoneGraphics()
             if (fSolidBlack != null) fSolidBlack.Dispose();
         }
 
-        public static ExtRect GetExpanderRect(ExtRect personRect)
+        public ExtRect GetExpanderRect(ExtRect personRect)
         {
-            ExtRect expRt = ExtRect.Create(personRect.Left, personRect.Top - 18, personRect.Left + 16 - 1, personRect.Top - 2);
+            int psz = (int)(16 * fPicScale);
+            ExtRect expRt = ExtRect.Create(personRect.Left, personRect.Top - psz - 2, personRect.Left + psz - 1, personRect.Top - 2);
             return expRt;
         }
 
-        public static ExtRect GetInfoRect(ExtRect personRect)
+        public ExtRect GetInfoRect(ExtRect personRect)
         {
-            ExtRect expRt = ExtRect.Create(personRect.Right - 16, personRect.Top - 18, personRect.Right, personRect.Top - 2);
+            int psz = (int)(16 * fPicScale);
+            ExtRect expRt = ExtRect.Create(personRect.Right - psz, personRect.Top - psz - 2, personRect.Right, personRect.Top - 2);
             return expRt;
         }
 
@@ -1774,11 +1778,14 @@ private void DrawPerson(TreeChartPerson person, ChartDrawMode drawMode)
 
                 if (fOptions.SignsVisible && !person.Signs.IsEmpty()) {
                     int i = 0;
+                    int dy = (int)(21 * fPicScale);
                     for (var cps = SpecialUserRef.urRI_StGeorgeCross; cps <= SpecialUserRef.urLast; cps++) {
                         if (!person.Signs.Contains(cps)) continue;
 
                         IImage pic = fSignsPic[(int)cps];
-                        fRenderer.DrawImage(pic, brt.Right + 1, brt.Top - 21 + i * pic.Height, cps.ToString());
+                        int pW = (int)(pic.Width * fPicScale);
+                        int pH = (int)(pic.Height * fPicScale);
+                        fRenderer.DrawImage(pic, brt.Right + 1, brt.Top - dy + i * pH, pW, pH, cps.ToString());
                         i++;
                     }
                 }
@@ -1801,7 +1808,7 @@ private void DrawPerson(TreeChartPerson person, ChartDrawMode drawMode)
                 if (drawMode == ChartDrawMode.dmInteractive) {
                     if (person.HasFlag(PersonFlag.pfCanExpand)) {
                         ExtRect expRt = GetExpanderRect(brt);
-                        fRenderer.DrawImage(fExpPic, expRt.Left, expRt.Top, string.Empty);
+                        fRenderer.DrawImage(fExpPic, expRt.Left, expRt.Top, expRt.Width, expRt.Height, string.Empty);
                     }
 
                     if (person.IsCollapsed) {
@@ -1812,11 +1819,13 @@ private void DrawPerson(TreeChartPerson person, ChartDrawMode drawMode)
                     ExtRect infoRt = GetInfoRect(brt);
 
                     if (person.Selected) {
-                        fRenderer.DrawImage(fInfoPic, infoRt.Left, infoRt.Top, string.Empty);
+                        fRenderer.DrawImage(fInfoPic, infoRt.Left, infoRt.Top, infoRt.Width, infoRt.Height, string.Empty);
                     }
 
                     if (person.HasFlag(PersonFlag.pfBookmark)) {
-                        fRenderer.DrawImage(fBookmarkPic, infoRt.Left - 16, infoRt.Top, string.Empty);
+                        int pW = (int)(fBookmarkPic.Width * fPicScale);
+                        int pH = (int)(fBookmarkPic.Height * fPicScale);
+                        fRenderer.DrawImage(fBookmarkPic, brt.Right - pW * 2, brt.Top - pH - 2, pW, pH, string.Empty);
                     }
                 }
             } catch (Exception ex) {
diff --git a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
index 555d1a1cb..fb33737fc 100644
--- a/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/OptionsDlgController.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -437,8 +437,12 @@ public void UpdateSpecials()
             GetControl<ICheckBox>("chkUseExtendedNotes").Visible = !isMobile;
             GetControl<ICheckBox>("chkKeepRichNames").Checked = fOptions.KeepRichNames && !isMobile;
             GetControl<ICheckBox>("chkKeepRichNames").Visible = !isMobile;
-            GetControl<ICheckBox>("chkMaximizeChartWindows").Checked = fOptions.MaximizeChartWindows && !isMobile;
-            GetControl<ICheckBox>("chkMaximizeChartWindows").Visible = !isMobile;
+
+            var chartWinMode = !isMobile ? fOptions.ChartWindowsShowMode : ChartWindowsShowMode.Default;
+            GetControl<IComboBox>("cmbChartWindowsShowMode").SetSelectedTag(chartWinMode);
+            GetControl<IComboBox>("cmbChartWindowsShowMode").Visible = !isMobile;
+            GetControl<ILabel>("lblChartWindowsShowMode").Visible = !isMobile;
+
             GetControl<ICheckBox>("chkKeepInfoPansOverallSize").Checked = fOptions.KeepInfoPansOverallSize && !isMobile;
             GetControl<ICheckBox>("chkKeepInfoPansOverallSize").Visible = !isMobile;
 
@@ -458,7 +462,9 @@ public void AcceptSpecials()
 
             fOptions.UseExtendedNotes = GetControl<ICheckBox>("chkUseExtendedNotes").Checked;
             fOptions.KeepRichNames = GetControl<ICheckBox>("chkKeepRichNames").Checked;
-            fOptions.MaximizeChartWindows = GetControl<ICheckBox>("chkMaximizeChartWindows").Checked;
+
+            fOptions.ChartWindowsShowMode = GetControl<IComboBox>("cmbChartWindowsShowMode").GetSelectedTag<ChartWindowsShowMode>();
+
             fOptions.KeepInfoPansOverallSize = GetControl<ICheckBox>("chkKeepInfoPansOverallSize").Checked;
 
             fOptions.FilesOverwriteWarn = GetControl<ICheckBox>("chkFilesOverwriteWarn").Checked;
@@ -960,7 +966,14 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkUseInlineImagesInSvg").Text = LangMan.LS(LSID.UseInlineImagesInSvg);
             GetControl<ICheckBox>("chkUseExtendedNotes").Text = LangMan.LS(LSID.UseExtendedNotes);
             GetControl<ICheckBox>("chkKeepRichNames").Text = LangMan.LS(LSID.KeepRichNames);
-            GetControl<ICheckBox>("chkMaximizeChartWindows").Text = LangMan.LS(LSID.MaximizeChartWindows);
+
+            GetControl<ILabel>("lblChartWindowsShowMode").Text = LangMan.LS(LSID.ChartWindowsShowMode);
+            combo = GetControl<IComboBox>("cmbChartWindowsShowMode");
+            combo.Clear();
+            for (ChartWindowsShowMode cwsm = ChartWindowsShowMode.Default; cwsm <= ChartWindowsShowMode.RightHalf; cwsm++) {
+                combo.AddItem(LangMan.LS(GKData.ChartWindowsShowModes[(int)cwsm]), cwsm);
+            }
+
             GetControl<ICheckBox>("chkExtendedTree").Text = LangMan.LS(LSID.ExtendedTree);
             GetControl<ICheckBox>("chkSAFByAllNames").Text = LangMan.LS(LSID.SearchAndFilterByAllNames);
             GetControl<ICheckBox>("chkKeepInfoPansOverallSize").Text = LangMan.LS(LSID.KeepInfoPansOverallSize);
diff --git a/projects/GKCore/GKCore/Design/Controls/IComboBox.cs b/projects/GKCore/GKCore/Design/Controls/IComboBox.cs
index 673821987..c37dca1cb 100644
--- a/projects/GKCore/GKCore/Design/Controls/IComboBox.cs
+++ b/projects/GKCore/GKCore/Design/Controls/IComboBox.cs
@@ -33,6 +33,7 @@ public interface IComboBox : IBaseControl
         object SelectedItem { get; set; }
         bool Sorted { get; set; }
         string Text { get; set; }
+        bool Visible { get; set; }
 
         void Add(object item);
         void AddItem<T>(string text, T tag, IImage image = null);
diff --git a/projects/GKCore/GKCore/Design/Controls/ILabel.cs b/projects/GKCore/GKCore/Design/Controls/ILabel.cs
index 22a7c6556..74796243d 100644
--- a/projects/GKCore/GKCore/Design/Controls/ILabel.cs
+++ b/projects/GKCore/GKCore/Design/Controls/ILabel.cs
@@ -30,5 +30,7 @@ public interface ITextContainer : IBaseControl
     public interface ILabel : ITextContainer
     {
         IColor BackColor { get; set; }
+
+        bool Visible { get; set; }
     }
 }
diff --git a/projects/GKCore/GKCore/GKData.cs b/projects/GKCore/GKCore/GKData.cs
index 7fbe744f7..d51aafe1b 100644
--- a/projects/GKCore/GKCore/GKData.cs
+++ b/projects/GKCore/GKCore/GKData.cs
@@ -242,6 +242,7 @@ public FARPropertyStruct(LSID name, bool enabled)
         public static readonly string BloodGroups;
         public static readonly FARPropertyStruct[] FARPropertyTypes;
         public static readonly LSID URTreeNoteType;
+        public static readonly LSID[] ChartWindowsShowModes;
 
 
         /// <summary>
@@ -557,6 +558,13 @@ static GKData()
             };
 
             URTreeNoteType = LSID.URTreeNoteType;
+
+            ChartWindowsShowModes = new LSID[] {
+                LSID.CWSM_Default,
+                LSID.CWSM_Maximize,
+                LSID.CWSM_LeftHalf,
+                LSID.CWSM_RightHalf,
+            };
         }
     }
 }
diff --git a/projects/GKCore/GKCore/Interfaces/IChartWindow.cs b/projects/GKCore/GKCore/Interfaces/IChartWindow.cs
index 35c8e8634..72caa3d0d 100644
--- a/projects/GKCore/GKCore/Interfaces/IChartWindow.cs
+++ b/projects/GKCore/GKCore/Interfaces/IChartWindow.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -20,6 +20,15 @@
 
 namespace GKCore.Interfaces
 {
+    public enum ChartWindowsShowMode
+    {
+        Default,
+        Maximize,
+        LeftHalf,
+        RightHalf,
+    }
+
+
     /// <summary>
     /// Interface for windows of different charts with support
     /// for working functions and localization, and printing.
diff --git a/projects/GKCore/GKCore/LangMan.cs b/projects/GKCore/GKCore/LangMan.cs
index aaf9a9bac..e05a1cc18 100644
--- a/projects/GKCore/GKCore/LangMan.cs
+++ b/projects/GKCore/GKCore/LangMan.cs
@@ -929,7 +929,7 @@ public enum LSID
         /* 866 */ UseInlineImagesInSvg,
         /* 867 */ UseExtendedNotes,
         /* 868 */ KeepRichNames,
-        /* 869 */ MaximizeChartWindows,
+        /* 869 */ ChartWindowsShowMode,
         /* 870 */ ExtendedTree,
         /* 871 */ FanMode,
         /* 872 */ OpenInNewWindow,
@@ -1017,7 +1017,12 @@ public enum LSID
         /* 945 */ HelpIsNotAvailable,
         /* 946 */ AddressLine,
 
-        /* 000 */ Last = AddressLine
+        /* 947 */ CWSM_Default,
+        /* 948 */ CWSM_Maximize,
+        /* 949 */ CWSM_LeftHalf,
+        /* 950 */ CWSM_RightHalf,
+
+        /* 000 */ Last = CWSM_RightHalf
     }
 
 
@@ -1900,7 +1905,7 @@ public static class LangMan
             /* 866 */ "Use inline images in SVG",
             /* 867 */ "Use extended notes",
             /* 868 */ "Keep rich names",
-            /* 869 */ "Maximize chart windows",
+            /* 869 */ "Chart windows show mode",
             /* 870 */ "Extended tree",
             /* 871 */ "Fan chart (only ancestors)",
             /* 872 */ "Open in new window",
@@ -1987,6 +1992,11 @@ public static class LangMan
             /* 944 */ "Remove top level link?",
             /* 945 */ "Help is not available for this language. An English help will be shown.",
             /* 946 */ "Address (st. & h.n.)",
+
+            /* 947 */ "Default",
+            /* 948 */ "Maximize",
+            /* 949 */ "Left half",
+            /* 950 */ "Right half",
         };
 
         private static readonly LangManager fLangMan = new LangManager();
diff --git a/projects/GKCore/GKCore/Options/GlobalOptions.cs b/projects/GKCore/GKCore/Options/GlobalOptions.cs
index 5367a47a7..4cdb19e78 100644
--- a/projects/GKCore/GKCore/Options/GlobalOptions.cs
+++ b/projects/GKCore/GKCore/Options/GlobalOptions.cs
@@ -192,7 +192,7 @@ public ListOptionsCollection ListOptions
 
         public bool LoadRecentFiles { get; set; }
 
-        public bool MaximizeChartWindows { get; set; }
+        public ChartWindowsShowMode ChartWindowsShowMode { get; set; }
 
         public MediaStoreType MediaStoreDefault { get; set; }
 
@@ -406,7 +406,7 @@ public void ResetDefaults_Specials()
         {
             UseExtendedNotes = false;
             KeepRichNames = true;
-            MaximizeChartWindows = false;
+            ChartWindowsShowMode = ChartWindowsShowMode.Default;
             SearchAndFilterByAllNames = false;
             FilesOverwriteWarn = true;
 
@@ -804,7 +804,7 @@ public void LoadFromFile(IniFile ini)
             ReversePlaceEntitiesOrder = ini.ReadBool("Common", "ReversePlaceEntitiesOrder", false);
             CertaintyAlgorithm = (CertaintyAlgorithm)ini.ReadInteger("Common", "CertaintyAlgorithm", 0);
             LocalizedCalendarSignatures = ini.ReadBool("Common", "LocalizedCalendarSignatures", false);
-            MaximizeChartWindows = ini.ReadBool("Common", "MaximizeChartWindows", false);
+            ChartWindowsShowMode = (ChartWindowsShowMode)ini.ReadInteger("Common", "ChartWindowsShowMode", 0);
             HighlightInaccessibleFiles = ini.ReadBool("Common", "HighlightInaccessibleFiles", false);
 
             LoadStringList(ini, fFARPatterns, "FARPatterns");
@@ -952,7 +952,7 @@ public void SaveToFile(IniFile ini)
             ini.WriteBool("Common", "ReversePlaceEntitiesOrder", ReversePlaceEntitiesOrder);
             ini.WriteInteger("Common", "CertaintyAlgorithm", (int)CertaintyAlgorithm);
             ini.WriteBool("Common", "LocalizedCalendarSignatures", LocalizedCalendarSignatures);
-            ini.WriteBool("Common", "MaximizeChartWindows", MaximizeChartWindows);
+            ini.WriteInteger("Common", "ChartWindowsShowMode", (int)ChartWindowsShowMode);
             ini.WriteBool("Common", "HighlightInaccessibleFiles", HighlightInaccessibleFiles);
 
             SaveStringList(ini, fFARPatterns, "FARPatterns");
diff --git a/projects/GKTests/GKCore/TreeChartTests.cs b/projects/GKTests/GKCore/TreeChartTests.cs
index 74063c569..893beed60 100644
--- a/projects/GKTests/GKCore/TreeChartTests.cs
+++ b/projects/GKTests/GKCore/TreeChartTests.cs
@@ -223,7 +223,7 @@ public void Test_TreeChartModel()
 
                 Assert.IsNull(model.FindPersonByCoords(0, 0));
 
-                Assert.AreEqual(ExtRect.Create(0, -18, 15, -2), TreeChartModel.GetExpanderRect(ExtRect.Create(0, 0, 0, 0)));
+                Assert.AreEqual(ExtRect.Create(0, -18, 15, -2), model.GetExpanderRect(ExtRect.Create(0, 0, 0, 0)));
                 Assert.AreEqual(ExtRect.Create(-8, -18, 7, -2), TreeChartModel.GetPersonExpandRect(ExtRect.Create(0, 0, 0, 0)));
 
                 ExtRect rt = model.VisibleArea;
diff --git a/projects/GKTests/Stubs/AppHostStub.cs b/projects/GKTests/Stubs/AppHostStub.cs
index e4dbcf9ed..883210cbe 100644
--- a/projects/GKTests/Stubs/AppHostStub.cs
+++ b/projects/GKTests/Stubs/AppHostStub.cs
@@ -246,5 +246,9 @@ private static void UnhandledExceptionsHandler(object sender, UnhandledException
         public override void LayoutWindows(WinLayout layout)
         {
         }
+
+        public override void SetWindowBounds(IWindow window, ExtRect bounds)
+        {
+        }
     }
 }
diff --git a/projects/GKv2/GEDKeeper2.sln b/projects/GKv2/GEDKeeper2.sln
index f1375d9cf..687e0ba55 100644
--- a/projects/GKv2/GEDKeeper2.sln
+++ b/projects/GKv2/GEDKeeper2.sln
@@ -51,6 +51,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GKTray", "GKTray\GKTray.csp
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{4AF8EEE8-8592-420C-B5C5-E6DDBA389BA1}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\locales\Afrikaans.lng = ..\..\locales\Afrikaans.lng
 		..\..\locales\Belarusian.lng = ..\..\locales\Belarusian.lng
 		..\..\locales\Chinese Simplified.lng = ..\..\locales\Chinese Simplified.lng
 		..\..\locales\czech.lng = ..\..\locales\czech.lng
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Components/TreeChartBox.cs b/projects/GKv2/GEDKeeper2/GKUI/Components/TreeChartBox.cs
index db8b67c96..d7e4cfdcf 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Components/TreeChartBox.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Components/TreeChartBox.cs
@@ -608,7 +608,7 @@ private MouseAction GetMouseAction(MouseEventArgs e, MouseEvent mouseEvent, out
                     }
                 }
 
-                ExtRect expRt = TreeChartModel.GetExpanderRect(persRt);
+                ExtRect expRt = fModel.GetExpanderRect(persRt);
                 if ((e.Button == MouseButtons.Left && mouseEvent == MouseEvent.meUp) && expRt.Contains(aX, aY)) {
                     person = p;
                     result = MouseAction.Expand;
@@ -622,7 +622,7 @@ private MouseAction GetMouseAction(MouseEventArgs e, MouseEvent mouseEvent, out
                     break;
                 }
 
-                ExtRect infoRt = TreeChartModel.GetInfoRect(persRt);
+                ExtRect infoRt = fModel.GetInfoRect(persRt);
                 if ((e.Button == MouseButtons.Left && mouseEvent == MouseEvent.meUp) && infoRt.Contains(aX, aY)) {
                     person = p;
                     result = MouseAction.Info;
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/CircleChartWin.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/CircleChartWin.cs
index 7fa6227f9..484f0f8af 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/CircleChartWin.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/CircleChartWin.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -89,8 +89,7 @@ protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
 
-            if (GlobalOptions.Instance.MaximizeChartWindows)
-                this.WindowState = FormWindowState.Maximized;
+            AppHost.Instance.SetWindowBounds(this, GlobalOptions.Instance.ChartWindowsShowMode);
 
             fCircleChart.Select();
             UpdateControls();
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
index 0d36aa7cc..c99d6efaa 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/OptionsDlg.Designer.cs
@@ -165,7 +165,8 @@ partial class OptionsDlg
         private System.Windows.Forms.CheckBox chkUseInlineImagesInSvg;
         private System.Windows.Forms.CheckBox chkUseExtendedNotes;
         private System.Windows.Forms.CheckBox chkKeepRichNames;
-        private System.Windows.Forms.CheckBox chkMaximizeChartWindows;
+        private System.Windows.Forms.Label lblChartWindowsShowMode;
+        private System.Windows.Forms.ComboBox cmbChartWindowsShowMode;
         private System.Windows.Forms.CheckBox chkExtendedTree;
         private System.Windows.Forms.CheckBox chkHighlightInaccessibleFiles;
         private System.Windows.Forms.CheckBox chkTreeSurnameFirst;
@@ -349,7 +350,8 @@ private void InitializeComponent()
             this.chkUseInlineImagesInSvg = new System.Windows.Forms.CheckBox();
             this.chkUseExtendedNotes = new System.Windows.Forms.CheckBox();
             this.chkKeepRichNames = new System.Windows.Forms.CheckBox();
-            this.chkMaximizeChartWindows = new System.Windows.Forms.CheckBox();
+            this.lblChartWindowsShowMode = new System.Windows.Forms.Label();
+            this.cmbChartWindowsShowMode = new System.Windows.Forms.ComboBox();
             this.chkExtendedTree = new System.Windows.Forms.CheckBox();
             this.chkHighlightInaccessibleFiles = new System.Windows.Forms.CheckBox();
             this.chkTreeSurnameFirst = new System.Windows.Forms.CheckBox();
@@ -2270,7 +2272,8 @@ private void InitializeComponent()
             this.pageSpecials.Controls.Add(this.chkUseInlineImagesInSvg);
             this.pageSpecials.Controls.Add(this.chkUseExtendedNotes);
             this.pageSpecials.Controls.Add(this.chkKeepRichNames);
-            this.pageSpecials.Controls.Add(this.chkMaximizeChartWindows);
+            this.pageSpecials.Controls.Add(this.lblChartWindowsShowMode);
+            this.pageSpecials.Controls.Add(this.cmbChartWindowsShowMode);
             this.pageSpecials.Controls.Add(this.chkExtendedTree);
             this.pageSpecials.Controls.Add(this.chkUseExtraControls);
             this.pageSpecials.Controls.Add(this.chkSAFByAllNames);
@@ -2315,14 +2318,24 @@ private void InitializeComponent()
             this.chkKeepRichNames.TabIndex = 12;
             this.chkKeepRichNames.Text = "chkKeepRichNames";
             // 
-            // chkMaximizeChartWindows
+            // lblChartWindowsShowMode
             // 
-            this.chkMaximizeChartWindows.Location = new System.Drawing.Point(20, 143);
-            this.chkMaximizeChartWindows.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
-            this.chkMaximizeChartWindows.Name = "chkMaximizeChartWindows";
-            this.chkMaximizeChartWindows.Size = new System.Drawing.Size(600, 22);
-            this.chkMaximizeChartWindows.TabIndex = 12;
-            this.chkMaximizeChartWindows.Text = "chkMaximizeChartWindows";
+            this.lblChartWindowsShowMode.Location = new System.Drawing.Point(20, 143);
+            this.lblChartWindowsShowMode.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
+            this.lblChartWindowsShowMode.Name = "lblChartWindowsShowMode";
+            this.lblChartWindowsShowMode.Size = new System.Drawing.Size(300, 22);
+            this.lblChartWindowsShowMode.TabIndex = 12;
+            this.lblChartWindowsShowMode.Text = "lblChartWindowsShowMode";
+            // 
+            // cmbChartWindowsShowMode
+            //
+            this.cmbChartWindowsShowMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbChartWindowsShowMode.Location = new System.Drawing.Point(320, 143);
+            this.cmbChartWindowsShowMode.Margin = new System.Windows.Forms.Padding(10, 0, 0, 5);
+            this.cmbChartWindowsShowMode.Name = "cmbChartWindowsShowMode";
+            this.cmbChartWindowsShowMode.Size = new System.Drawing.Size(220, 22);
+            this.cmbChartWindowsShowMode.TabIndex = 12;
+            this.cmbChartWindowsShowMode.Text = "cmbChartWindowsShowMode";
             // 
             // chkExtendedTree
             // 
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.cs b/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.cs
index d0a02b43d..448fe1072 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Forms/TreeChartWin.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -133,8 +133,7 @@ protected override void OnLoad(EventArgs e)
         {
             base.OnLoad(e);
 
-            if (GlobalOptions.Instance.MaximizeChartWindows)
-                this.WindowState = FormWindowState.Maximized;
+            AppHost.Instance.SetWindowBounds(this, GlobalOptions.Instance.ChartWindowsShowMode);
 
             fTreeBox.Select();
             UpdateControls();
diff --git a/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs b/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
index 31c6c6b0a..17532a815 100644
--- a/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
+++ b/projects/GKv2/GEDKeeper2/GKUI/Platform/WFAppHost.cs
@@ -253,6 +253,14 @@ public override ExtRect GetActiveScreenWorkingArea()
             return UIHelper.Rt2Rt(screen.WorkingArea);
         }
 
+        public override void SetWindowBounds(IWindow window, ExtRect bounds)
+        {
+            var form = window as Form;
+            if (form == null) return;
+
+            form.Bounds = UIHelper.Rt2Rt(bounds);
+        }
+
         public override void WidgetLocate(IWidgetForm view, WidgetLocation location)
         {
             var form = view as Form;
diff --git a/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs b/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs
index efcce14f8..242818235 100644
--- a/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs
+++ b/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -68,6 +68,12 @@ public string Text
             set { Control.Text = value; }
         }
 
+        public bool Visible
+        {
+            get { return Control.Visible; }
+            set { Control.Visible = value; }
+        }
+
         public void Add(object item)
         {
             Control.Items.Add(item);
diff --git a/projects/GKv2/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs b/projects/GKv2/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs
index 2c441eac4..e527cf396 100644
--- a/projects/GKv2/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs
+++ b/projects/GKv2/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -41,5 +41,11 @@ public string Text
             get { return Control.Text; }
             set { Control.Text = value; }
         }
+
+        public bool Visible
+        {
+            get { return Control.Visible; }
+            set { Control.Visible = value; }
+        }
     }
 }
diff --git a/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ToolStripComboBoxHandler.cs b/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ToolStripComboBoxHandler.cs
index 1a4e8e0eb..4d9fd7b02 100644
--- a/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ToolStripComboBoxHandler.cs
+++ b/projects/GKv2/GKComponents/GKUI/Platform/Handlers/ToolStripComboBoxHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -75,6 +75,12 @@ public string Text
             set { Control.Text = value; }
         }
 
+        public bool Visible
+        {
+            get { return Control.Visible; }
+            set { Control.Visible = value; }
+        }
+
         public void Add(object item)
         {
             Control.Items.Add(item);
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Components/TreeChartBox.cs b/projects/GKv3/GEDKeeper3/GKUI/Components/TreeChartBox.cs
index 6fc5384f1..7c67d4c92 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Components/TreeChartBox.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Components/TreeChartBox.cs
@@ -613,7 +613,7 @@ private MouseAction GetMouseAction(MouseEventArgs e, MouseEvent mouseEvent, out
                     }
                 }
 
-                ExtRect expRt = TreeChartModel.GetExpanderRect(persRt);
+                ExtRect expRt = fModel.GetExpanderRect(persRt);
                 if ((e.Buttons == MouseButtons.Primary && mouseEvent == MouseEvent.meUp) && expRt.Contains(aX, aY)) {
                     person = p;
                     result = MouseAction.Expand;
@@ -627,7 +627,7 @@ private MouseAction GetMouseAction(MouseEventArgs e, MouseEvent mouseEvent, out
                     break;
                 }
 
-                ExtRect infoRt = TreeChartModel.GetInfoRect(persRt);
+                ExtRect infoRt = fModel.GetInfoRect(persRt);
                 if ((e.Buttons == MouseButtons.Primary && mouseEvent == MouseEvent.meUp) && infoRt.Contains(aX, aY)) {
                     person = p;
                     result = MouseAction.Info;
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/CircleChartWin.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/CircleChartWin.cs
index d699ac696..da01ad151 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/CircleChartWin.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/CircleChartWin.cs
@@ -88,8 +88,7 @@ public CircleChartWin(IBaseWindow baseWin, GDMIndividualRecord startPerson, Circ
             fController = new CircleChartWinController(this);
             fController.Init(baseWin);
 
-            if (GlobalOptions.Instance.MaximizeChartWindows)
-                this.WindowState = Eto.Forms.WindowState.Maximized;
+            AppHost.Instance.SetWindowBounds(this, GlobalOptions.Instance.ChartWindowsShowMode);
         }
 
         protected override void Dispose(bool disposing)
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
index 60e3c41e2..211844f93 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
index 0d8e47a4d..392753498 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/OptionsDlg.xeto
@@ -463,7 +463,12 @@
           <StackLayout Style="vertListStack">
             <CheckBox x:Name="chkUseExtendedNotes" />
             <CheckBox x:Name="chkKeepRichNames" />
-            <CheckBox x:Name="chkMaximizeChartWindows" />
+
+            <StackLayout Orientation="Horizontal" Spacing="4">
+              <Label x:Name="lblChartWindowsShowMode" />
+              <ComboBox x:Name="cmbChartWindowsShowMode" ReadOnly="True" />
+            </StackLayout>
+
             <CheckBox x:Name="chkSAFByAllNames" />
             <CheckBox x:Name="chkShortenDateRanges" />
             <CheckBox x:Name="chkKeepInfoPansOverallSize" />
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Forms/TreeChartWin.cs b/projects/GKv3/GEDKeeper3/GKUI/Forms/TreeChartWin.cs
index ecfdaaa50..cdcf75e69 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Forms/TreeChartWin.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Forms/TreeChartWin.cs
@@ -157,8 +157,7 @@ public TreeChartWin(IBaseWindow baseWin)
 
             SetupDepth();
 
-            if (GlobalOptions.Instance.MaximizeChartWindows)
-                this.WindowState = Eto.Forms.WindowState.Maximized;
+            AppHost.Instance.SetWindowBounds(this, GlobalOptions.Instance.ChartWindowsShowMode);
         }
 
         protected override void Dispose(bool disposing)
diff --git a/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs b/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
index 09507517c..bf42f52a6 100644
--- a/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
+++ b/projects/GKv3/GEDKeeper3/GKUI/Platform/EtoAppHost.cs
@@ -292,6 +292,14 @@ public override ExtRect GetActiveScreenWorkingArea()
             return UIHelper.Rt2Rt(new Rectangle(screen.WorkingArea));
         }
 
+        public override void SetWindowBounds(IWindow window, ExtRect bounds)
+        {
+            var form = window as Form;
+            if (form == null) return;
+
+            form.Bounds = UIHelper.Rt2Rt(bounds);
+        }
+
         public override void WidgetLocate(IWidgetForm view, WidgetLocation location)
         {
             var form = view as Form;
diff --git a/projects/GKv3/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs b/projects/GKv3/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs
index 8d5e27bc7..9c5454b62 100644
--- a/projects/GKv3/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs
+++ b/projects/GKv3/GKComponents/GKUI/Platform/Handlers/ComboBoxHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -90,6 +90,12 @@ public string Text
             }
         }
 
+        public bool Visible
+        {
+            get { return Control.Visible; }
+            set { Control.Visible = value; }
+        }
+
         public void Add(object item)
         {
             Control.Items.Add((string)item);
diff --git a/projects/GKv3/GKComponents/GKUI/Platform/Handlers/DropDownHandler.cs b/projects/GKv3/GKComponents/GKUI/Platform/Handlers/DropDownHandler.cs
index b2bad97f2..2aea9b23e 100644
--- a/projects/GKv3/GKComponents/GKUI/Platform/Handlers/DropDownHandler.cs
+++ b/projects/GKv3/GKComponents/GKUI/Platform/Handlers/DropDownHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -83,6 +83,12 @@ public string Text
             set { }
         }
 
+        public bool Visible
+        {
+            get { return Control.Visible; }
+            set { Control.Visible = value; }
+        }
+
         public void Add(object item)
         {
             Control.Items.Add((string)item);
diff --git a/projects/GKv3/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs b/projects/GKv3/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs
index e9fb506f3..ed2ba281e 100644
--- a/projects/GKv3/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs
+++ b/projects/GKv3/GKComponents/GKUI/Platform/Handlers/LabelHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -41,5 +41,11 @@ public string Text
             get { return Control.Text; }
             set { Control.Text = value; }
         }
+
+        public bool Visible
+        {
+            get { return Control.Visible; }
+            set { Control.Visible = value; }
+        }
     }
 }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs b/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs
index 9d85c14c4..4390ad3d2 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -598,7 +598,7 @@ private MouseAction GetMouseAction(MouseEventArgs e, MouseEvent mouseEvent, out
                     }
                 }
 
-                ExtRect expRt = TreeChartModel.GetExpanderRect(persRt);
+                ExtRect expRt = fModel.GetExpanderRect(persRt);
                 if (e.Buttons == SKMouseButton.Left && mouseEvent == MouseEvent.meUp && expRt.Contains(aX, aY)) {
                     person = p;
                     result = MouseAction.Expand;
@@ -612,7 +612,7 @@ private MouseAction GetMouseAction(MouseEventArgs e, MouseEvent mouseEvent, out
                     break;
                 }
 
-                ExtRect infoRt = TreeChartModel.GetInfoRect(persRt);
+                ExtRect infoRt = fModel.GetInfoRect(persRt);
                 if (e.Buttons == SKMouseButton.Left && mouseEvent == MouseEvent.meUp && infoRt.Contains(aX, aY)) {
                     person = p;
                     result = MouseAction.Info;
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
index bc4e05723..e539db5ee 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
@@ -383,7 +383,12 @@
                     <StackLayout Orientation="Vertical" Padding="4" Spacing="4">
                         <input:CheckBox x:Name="chkUseExtendedNotes" />
                         <input:CheckBox x:Name="chkKeepRichNames" />
-                        <input:CheckBox x:Name="chkMaximizeChartWindows" />
+
+                        <StackLayout Orientation="Horizontal" Spacing="4">
+                            <Label x:Name="lblChartWindowsShowMode" />
+                            <comcom:GKComboBox x:Name="cmbChartWindowsShowMode" WidthRequest="200" />
+                        </StackLayout>
+
                         <input:CheckBox x:Name="chkSAFByAllNames" />
                         <input:CheckBox x:Name="chkShortenDateRanges" />
                         <input:CheckBox x:Name="chkKeepInfoPansOverallSize" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/ComboBoxHandler.cs b/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/ComboBoxHandler.cs
index 78b2fa41b..13970ed13 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/ComboBoxHandler.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/ComboBoxHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -68,6 +68,12 @@ public string Text
             set { Control.Text = value; }
         }
 
+        public bool Visible
+        {
+            get { return Control.IsVisible; }
+            set { Control.IsVisible = value; }
+        }
+
         public PickerHandler(GKComboBox control) : base(control)
         {
         }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/LabelHandler.cs b/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/LabelHandler.cs
index 3c867a4db..132fe6e06 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/LabelHandler.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Platform/Handlers/LabelHandler.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -42,5 +42,11 @@ public string Text
             get { return Control.Text; }
             set { Control.Text = value; }
         }
+
+        public bool Visible
+        {
+            get { return Control.IsVisible; }
+            set { Control.IsVisible = value; }
+        }
     }
 }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs b/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs
index 5c096bd6e..3bd014c09 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Platform/XFAppHost.cs
@@ -1,6 +1,6 @@
 /*
  *  "GEDKeeper", the personal genealogical database editor.
- *  Copyright (C) 2009-2023 by Sergey V. Zhdanovskih.
+ *  Copyright (C) 2009-2024 by Sergey V. Zhdanovskih.
  *
  *  This file is part of "GEDKeeper".
  *
@@ -196,6 +196,11 @@ public override ExtRect GetActiveScreenWorkingArea()
             throw new NotImplementedException();
         }
 
+        public override void SetWindowBounds(IWindow window, ExtRect bounds)
+        {
+            // not for mobile
+        }
+
         public override string SelectFolder(string folderPath)
         {
             return string.Empty;