diff --git a/gnucash/gtkbuilder/dialog-account.glade b/gnucash/gtkbuilder/dialog-account.glade
index e350914375..79118499ba 100644
--- a/gnucash/gtkbuilder/dialog-account.glade
+++ b/gnucash/gtkbuilder/dialog-account.glade
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="account_cascade_dialog">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Cascade Account Values</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -400,7 +400,7 @@
     <property name="default_width">500</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -835,7 +835,7 @@
     <property name="title" translatable="yes">Filter By...</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gppat_filter_response_cb" swapped="no"/>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -1018,24 +1018,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="show_zero">
-                    <property name="label" translatable="yes">Show _zero total accounts</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Show accounts which have a zero total value.</property>
-                    <property name="halign">start</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="gppat_filter_show_zero_toggled_cb" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkCheckButton" id="show_unused">
                     <property name="label" translatable="yes">Show _unused accounts</property>
@@ -1054,6 +1036,24 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkCheckButton" id="show_zero">
+                    <property name="label" translatable="yes">Show _zero total accounts</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Show accounts which have a zero total value.</property>
+                    <property name="halign">start</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="gppat_filter_show_zero_toggled_cb" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="position">1</property>
@@ -1097,34 +1097,34 @@
         <col id="0" translatable="yes">Use Commodity Value</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1</col>
+        <col id="0">1</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/10</col>
+        <col id="0">1/10</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/100</col>
+        <col id="0">1/100</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/1000</col>
+        <col id="0">1/1000</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/10000</col>
+        <col id="0">1/10000</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/100000</col>
+        <col id="0">1/100000</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/1000000</col>
+        <col id="0">1/1000000</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/10000000</col>
+        <col id="0">1/10000000</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/100000000</col>
+        <col id="0">1/100000000</col>
       </row>
       <row>
-        <col id="0" translatable="yes">1/1000000000</col>
+        <col id="0">1/1000000000</col>
       </row>
     </data>
   </object>
@@ -1135,7 +1135,7 @@
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="gnc_account_window_destroy_cb" swapped="no"/>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -1926,7 +1926,7 @@
     <property name="default_width">400</property>
     <property name="type_hint">dialog</property>
     <signal name="response" handler="gnc_account_renumber_response_cb" swapped="no"/>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 5ea5363c83..c3f6adca78 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="atm_fee_adj">
@@ -1027,7 +1027,7 @@ many months before the current month</property>
                     <property name="tooltip_text" translatable="yes">Enter number of months.</property>
                     <property name="halign">start</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">6</property>
+                    <property name="text">6</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">date_backmonth_adj</property>
@@ -1207,7 +1207,7 @@ many months before the current month</property>
                         <property name="tooltip_markup">How many days to keep old log/backup files.</property>
                         <property name="tooltip_text" translatable="yes">How many days to keep old log/backup files.</property>
                         <property name="invisible_char">●</property>
-                        <property name="text" translatable="yes">30</property>
+                        <property name="text">30</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <property name="adjustment">retain_days_adj</property>
@@ -1440,7 +1440,7 @@ many months before the current month</property>
                     <property name="tooltip_markup">Default to &amp;apos;new search&amp;apos; if fewer than this number of items is returned.</property>
                     <property name="tooltip_text" translatable="yes">Default to 'new search' if fewer than this number of items is returned.</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">1</property>
+                    <property name="text">1</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">new_search_limit_adj</property>
@@ -1497,7 +1497,7 @@ many months before the current month</property>
                         <property name="tooltip_markup">The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically.</property>
                         <property name="tooltip_text" translatable="yes">The number of minutes until saving of the data file to harddisk will be started automatically. If zero, no saving will be started automatically.</property>
                         <property name="invisible_char">●</property>
-                        <property name="text" translatable="yes">3</property>
+                        <property name="text">3</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <property name="adjustment">autosave_interval_minutes_adj</property>
@@ -1653,7 +1653,7 @@ many months before the current month</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip_text" translatable="yes">The number of seconds to wait before the question window will be closed and the changes saved automatically.</property>
                         <property name="invisible_char">●</property>
-                        <property name="text" translatable="yes">20</property>
+                        <property name="text">20</property>
                         <property name="primary_icon_activatable">False</property>
                         <property name="secondary_icon_activatable">False</property>
                         <property name="adjustment">save_on_close_adj</property>
@@ -1982,7 +1982,7 @@ many months before the current month</property>
                     <property name="tooltip_markup">A transaction whose best match&amp;apos;s score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
                     <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">6</property>
+                    <property name="text">6</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">auto_clear_adj</property>
@@ -2004,7 +2004,7 @@ many months before the current month</property>
                     <property name="tooltip_markup">A transaction whose best match&amp;apos;s score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
                     <property name="tooltip_text" translatable="yes">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">1</property>
+                    <property name="text">1</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">auto_add_adj</property>
@@ -2026,7 +2026,7 @@ many months before the current month</property>
                     <property name="tooltip_markup">The minimum score a potential match must have to be displayed in the match list.</property>
                     <property name="tooltip_text" translatable="yes">The minimum score a potential match must have to be displayed in the match list.</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">1</property>
+                    <property name="text">1</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">match_adj</property>
@@ -2706,7 +2706,7 @@ many months before the current month</property>
                     <property name="tooltip_markup">Show this many transactions in a register. A value of zero means show all transactions.</property>
                     <property name="tooltip_text" translatable="yes">Show this many transactions in a register. A value of zero means show all transactions.</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">0</property>
+                    <property name="text">0</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">max_transactions_adj</property>
@@ -2796,7 +2796,7 @@ many months before the current month</property>
                     <property name="tooltip_markup">This sets the number of characters before auto complete starts for description, notes and memo fields.</property>
                     <property name="tooltip_text" translatable="yes" comments="Register2 feature">This sets the number of characters before auto complete starts for description, notes and memo fields.</property>
                     <property name="invisible_char">●</property>
-                    <property name="text" translatable="yes">2</property>
+                    <property name="text">2</property>
                     <property name="primary_icon_activatable">False</property>
                     <property name="secondary_icon_activatable">False</property>
                     <property name="adjustment">key_length_adj</property>
@@ -3085,7 +3085,7 @@ many months before the current month</property>
                     <property name="can_focus">True</property>
                     <property name="tooltip_text" translatable="yes">On high resolution screens reports tend to be hard to read. This option allows you to scale reports up by the set factor. For example setting this to 2.0 will display reports at twice their typical size.</property>
                     <property name="halign">start</property>
-                    <property name="text" translatable="yes">1</property>
+                    <property name="text">1</property>
                     <property name="adjustment">default_zoom_adj</property>
                     <property name="digits">1</property>
                     <property name="value">1</property>
diff --git a/gnucash/gtkbuilder/dialog-sx.glade b/gnucash/gtkbuilder/dialog-sx.glade
index b4a48eb707..ffe2640de2 100644
--- a/gnucash/gtkbuilder/dialog-sx.glade
+++ b/gnucash/gtkbuilder/dialog-sx.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkDialog" id="account_deletion_dialog">
@@ -10,7 +10,7 @@
     <property name="default_width">320</property>
     <property name="default_height">240</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -146,7 +146,7 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Make Scheduled Transaction</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -385,7 +385,7 @@
                                     <property name="can_focus">True</property>
                                     <property name="max_length">4</property>
                                     <property name="invisible_char">●</property>
-                                    <property name="text" translatable="yes">1</property>
+                                    <property name="text">1</property>
                                     <property name="primary_icon_activatable">False</property>
                                     <property name="secondary_icon_activatable">False</property>
                                   </object>
@@ -497,7 +497,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Preferences</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child>
@@ -747,7 +747,7 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Edit Scheduled Transaction</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -1434,7 +1434,7 @@
     <property name="default_height">480</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
diff --git a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
index 3ff3acb605..a81c8b2377 100644
--- a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
+++ b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <object class="GtkAdjustment" id="DigitsToRound_Adj">
@@ -15,7 +15,7 @@
     <property name="title" translatable="yes">Edit budget for all periods</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -179,7 +179,6 @@
                 <property name="can_focus">True</property>
                 <property name="tooltip_text" translatable="yes">The number of leading digits to keep when rounding</property>
                 <property name="hexpand">True</property>
-                <property name="text" translatable="yes">1</property>
                 <property name="primary_icon_activatable">False</property>
                 <property name="secondary_icon_activatable">False</property>
                 <property name="adjustment">DigitsToRound_Adj</property>
@@ -241,7 +240,7 @@
     <property name="title" translatable="yes">Estimate Budget Values</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -423,7 +422,7 @@
     <property name="title" translatable="yes">Budget Options</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -723,7 +722,7 @@
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Budget List</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">
@@ -871,7 +870,7 @@
     <property name="title" translatable="yes">Budget Notes</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
-    <child>
+    <child type="titlebar">
       <placeholder/>
     </child>
     <child internal-child="vbox">