diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
index 292847e180..5f418cbd1e 100644
--- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade
+++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
@@ -416,7 +416,7 @@ There are two reserved names which can't be used to save custom settings:
                             <property name="halign">start</property>
                             <property name="valign">start</property>
                             <property name="icon-name">dialog-information</property>
-                            <property name="icon_size">3</property>
+                            <property name="icon-size">3</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -864,7 +864,7 @@ For example
                 <property name="halign">start</property>
                 <property name="valign">start</property>
                 <property name="icon-name">dialog-information</property>
-                <property name="icon_size">3</property>
+                <property name="icon-size">3</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1145,9 +1145,6 @@ More information can be displayed by using the help button.</property>
       <object class="GtkBox">
         <property name="can-focus">False</property>
       </object>
-      <packing>
-        <property name="has-padding">False</property>
-      </packing>
     </child>
   </object>
 </interface>
diff --git a/gnucash/gtkbuilder/dialog-commodity.glade b/gnucash/gtkbuilder/dialog-commodity.glade
index 2926211da5..630db39457 100644
--- a/gnucash/gtkbuilder/dialog-commodity.glade
+++ b/gnucash/gtkbuilder/dialog-commodity.glade
@@ -537,7 +537,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="icon-name">dialog-warning</property>
-                        <property name="icon_size">2</property>
+                        <property name="icon-size">2</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -564,7 +564,7 @@
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="icon-name">dialog-warning</property>
-                        <property name="icon_size">2</property>
+                        <property name="icon-size">2</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/gnucash/gtkbuilder/dialog-date-close.glade b/gnucash/gtkbuilder/dialog-date-close.glade
index d3303245d8..40c02ec739 100644
--- a/gnucash/gtkbuilder/dialog-date-close.glade
+++ b/gnucash/gtkbuilder/dialog-date-close.glade
@@ -73,7 +73,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="icon-name">dialog-question</property>
-                    <property name="icon_size">3</property>
+                    <property name="icon-size">3</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -328,7 +328,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="icon-name">dialog-question</property>
-                    <property name="icon_size">3</property>
+                    <property name="icon-size">3</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/gnucash/gtkbuilder/dialog-invoice.glade b/gnucash/gtkbuilder/dialog-invoice.glade
index f3b4518274..dcb770fbfb 100644
--- a/gnucash/gtkbuilder/dialog-invoice.glade
+++ b/gnucash/gtkbuilder/dialog-invoice.glade
@@ -1365,7 +1365,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="icon-name">dialog-question</property>
-                    <property name="icon_size">3</property>
+                    <property name="icon-size">3</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/gnucash/gtkbuilder/dialog-new-user.glade b/gnucash/gtkbuilder/dialog-new-user.glade
index c3bda599cb..73d39d165c 100644
--- a/gnucash/gtkbuilder/dialog-new-user.glade
+++ b/gnucash/gtkbuilder/dialog-new-user.glade
@@ -73,7 +73,7 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="icon-name">go-home</property>
-                <property name="icon_size">6</property>
+                <property name="icon-size">6</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
@@ -196,7 +196,7 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="icon-name">go-home</property>
-                <property name="icon_size">6</property>
+                <property name="icon-size">6</property>
               </object>
               <packing>
                 <property name="left-attach">0</property>
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 82eb28cd88..6600457410 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -878,7 +878,7 @@ Press 'Close' to return to the preference window
                         <property name="can-focus">False</property>
                         <property name="halign">start</property>
                         <property name="icon-name">dialog-warning</property>
-                        <property name="icon_size">3</property>
+                        <property name="icon-size">3</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/gnucash/import-export/aqb/dialog-ab.glade b/gnucash/import-export/aqb/dialog-ab.glade
index 3766bfd527..16f1e9270b 100644
--- a/gnucash/import-export/aqb/dialog-ab.glade
+++ b/gnucash/import-export/aqb/dialog-ab.glade
@@ -735,7 +735,7 @@
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <property name="icon-name">image-missing</property>
-                    <property name="icon_size">6</property>
+                    <property name="icon-size">6</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -1661,12 +1661,12 @@
     <property name="title" translatable="yes">Select File Import Format and Template</property>
     <property name="type-hint">dialog</property>
     <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox3">
+      <object class="GtkBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area3">
+          <object class="GtkButtonBox" id="dialog-action_area4">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <property name="layout-style">end</property>
@@ -1727,7 +1727,7 @@
                     <property name="model">imexporter-list</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
-                    <property name='tooltip-text' translatable='yes'>This list contains the file formats that AQBanking knows how to import. The profile list contains specializations and is populated according to which format you select in this list.</property>
+                    <property name="tooltip-text" translatable="yes">This list contains the file formats that AQBanking knows how to import. The profile list contains specializations and is populated according to which format you select in this list.</property>
                     <child>
                       <object class="GtkTreeViewColumn" id="imexporter-name">
                         <property name="title" translatable="yes">File Format</property>
@@ -1776,7 +1776,7 @@
                     <property name="model">profile-list</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
-                    <property name='tooltip-text' translatable='yes'>This lists one or more specialization templates that adjust the import for different banks' uses of fields in the selected import format.</property>
+                    <property name="tooltip-text" translatable="yes">This lists one or more specialization templates that adjust the import for different banks' uses of fields in the selected import format.</property>
                     <!-- Request the maximum width for the profile
                          list so that it doesn't change the dialog
                          width when an imexporter with long
diff --git a/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui b/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui
index a26897335f..d506ef298b 100644
--- a/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui
+++ b/gnucash/import-export/aqb/gnc-plugin-aqbanking.ui
@@ -62,7 +62,7 @@
     <item>
       <attribute name="label" translatable="yes">_Online Banking Setup…</attribute>
       <attribute name="action">gnc-plugin-aqbanking-actions.ABSetupAction</attribute>
-      <attribute name="tt" translatable="yes">Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using AqBanking)</attribute>
+      <attribute name="tooltip" translatable="yes">Initial setup of Online Banking access (HBCI, or OFX DirectConnect, using AqBanking)</attribute>
     </item>
   </menu>
 
diff --git a/gnucash/ui/gnc-plugin-basic-commands.ui b/gnucash/ui/gnc-plugin-basic-commands.ui
index c941e32fc1..38eee6a8f1 100644
--- a/gnucash/ui/gnc-plugin-basic-commands.ui
+++ b/gnucash/ui/gnc-plugin-basic-commands.ui
@@ -18,21 +18,21 @@
 
   <menu id="FilePlaceholder2">
     <item>
-       <attribute name="label" translatable="yes">_Save</attribute>
-       <attribute name="action">gnc-plugin-basic-commands-actions.FileSaveAction</attribute>
-       <attribute name="accel">&lt;Primary&gt;s</attribute>
-       <attribute name="tooltip" translatable="yes">Save the current file</attribute>
+      <attribute name="label" translatable="yes">_Save</attribute>
+      <attribute name="action">gnc-plugin-basic-commands-actions.FileSaveAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;s</attribute>
+      <attribute name="tooltip" translatable="yes">Save the current file</attribute>
     </item>
     <item>
-       <attribute name="label" translatable="yes">Save _As…</attribute>
-       <attribute name="action">gnc-plugin-basic-commands-actions.FileSaveAsAction</attribute>
-       <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
-       <attribute name="tooltip" translatable="yes">Save this file with a different name</attribute>
+      <attribute name="label" translatable="yes">Save _As…</attribute>
+      <attribute name="action">gnc-plugin-basic-commands-actions.FileSaveAsAction</attribute>
+      <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
+      <attribute name="tooltip" translatable="yes">Save this file with a different name</attribute>
     </item>
     <item>
-       <attribute name="label" translatable="yes">Re_vert</attribute>
-       <attribute name="action">gnc-plugin-basic-commands-actions.FileRevertAction</attribute>
-       <attribute name="tooltip" translatable="yes">Reload the current database, reverting all unsaved changes</attribute>
+      <attribute name="label" translatable="yes">Re_vert</attribute>
+      <attribute name="action">gnc-plugin-basic-commands-actions.FileRevertAction</attribute>
+      <attribute name="tooltip" translatable="yes">Reload the current database, reverting all unsaved changes</attribute>
     </item>
   </menu>
 
@@ -62,7 +62,7 @@
       <attribute name="tooltip" translatable="yes">Find transactions with a search</attribute>
       <attribute name="temp" translatable="no">yes</attribute>
     </item>
-   </menu>
+  </menu>
 
   <menu id="EditPlaceholder5">
     <item>
@@ -95,7 +95,7 @@
           <attribute name="action">gnc-plugin-basic-commands-actions.ActionsMortgageLoanAction</attribute>
           <attribute name="tooltip" translatable="yes">Setup scheduled transactions for repayment of a loan</attribute>
         </item>
-     </section>
+      </section>
     </submenu>
   </menu>
 
diff --git a/gnucash/ui/gnc-plugin-page-account-tree.ui b/gnucash/ui/gnc-plugin-page-account-tree.ui
index a18edc4195..f388a3afb6 100644
--- a/gnucash/ui/gnc-plugin-page-account-tree.ui
+++ b/gnucash/ui/gnc-plugin-page-account-tree.ui
@@ -79,7 +79,7 @@
       <attribute name="action">GncPluginPageAccountTreeActions.EditTaxOptionsAction</attribute>
 <!-- Translators: currently implemented are, US: income tax and DE: VAT, So adjust this string -->
       <attribute name="tooltip" translatable="yes">Setup relevant accounts for tax reports, e.g. US income tax</attribute>
-        <attribute name="temp" translatable="no">yes</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
     </item>
   </menu>
 
diff --git a/gnucash/ui/gnc-plugin-page-budget.ui b/gnucash/ui/gnc-plugin-page-budget.ui
index 9af4eb7b5f..4541e0f9cd 100644
--- a/gnucash/ui/gnc-plugin-page-budget.ui
+++ b/gnucash/ui/gnc-plugin-page-budget.ui
@@ -61,7 +61,7 @@
       <attribute name="action">GncPluginPageBudgetActions.EditTaxOptionsAction</attribute>
 <!-- Translators: currently implemented are, US: income tax and DE: VAT, So adjust this string -->
       <attribute name="tooltip" translatable="yes">Setup relevant accounts for tax reports, e.g. US income tax</attribute>
-        <attribute name="temp" translatable="no">yes</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
     </item>
   </menu>
 
diff --git a/gnucash/ui/gnc-plugin-page-invoice.ui b/gnucash/ui/gnc-plugin-page-invoice.ui
index 938cca6e4f..4ad70299ae 100644
--- a/gnucash/ui/gnc-plugin-page-invoice.ui
+++ b/gnucash/ui/gnc-plugin-page-invoice.ui
@@ -35,7 +35,7 @@
       <attribute name="action">GncPluginPageInvoiceActions.EditUnpostInvoiceAction</attribute>
       <attribute name="tooltip" translatable="yes">Unpost this invoice and make it editable</attribute>
       <attribute name="temp" translatable="no">yes</attribute>
-     </item>
+    </item>
   </menu>
 
   <menu id="EditPlaceholder3">
@@ -55,7 +55,7 @@
       <attribute name="action">GncPluginPageAccountTreeActions.EditTaxOptionsAction</attribute>
 <!-- Translators: currently implemented are, US: income tax and DE: VAT, So adjust this string -->
       <attribute name="tooltip" translatable="yes">Setup relevant accounts for tax reports, e.g. US income tax</attribute>
-        <attribute name="temp" translatable="no">yes</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
     </item>
   </menu>
 
diff --git a/gnucash/ui/gnc-plugin-page-owner-tree.ui b/gnucash/ui/gnc-plugin-page-owner-tree.ui
index 635355323c..f38fd05125 100644
--- a/gnucash/ui/gnc-plugin-page-owner-tree.ui
+++ b/gnucash/ui/gnc-plugin-page-owner-tree.ui
@@ -77,7 +77,7 @@
       <attribute name="action">GncPluginPageOwnerTreeActions.EditTaxOptionsAction</attribute>
 <!-- Translators: currently implemented are, US: income tax and DE: VAT, So adjust this string -->
       <attribute name="tooltip" translatable="yes">Setup relevant accounts for tax reports, e.g. US income tax</attribute>
-        <attribute name="temp" translatable="no">yes</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
     </item>
   </menu>
 
diff --git a/gnucash/ui/gnc-plugin-page-register.ui b/gnucash/ui/gnc-plugin-page-register.ui
index c3c9d1e8b1..b0a4646e73 100644
--- a/gnucash/ui/gnc-plugin-page-register.ui
+++ b/gnucash/ui/gnc-plugin-page-register.ui
@@ -52,7 +52,7 @@
       <attribute name="tooltip" translatable="yes">Find transactions with a search</attribute>
       <attribute name="temp" translatable="no">yes</attribute>
     </item>
-   </menu>
+  </menu>
 
   <menu id="EditPlaceholder5">
     <item>
@@ -80,7 +80,7 @@
       <attribute name="action">GncPluginPageRegisterActions.ViewStyleRadioAction</attribute>
       <attribute name="target" type="i">1</attribute>
       <attribute name="tooltip" translatable="yes">Show transactions on one or two lines and expand the current transaction</attribute>
-       <attribute name="temp" translatable="no">yes</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
     </item>
     <item>
 <!--  Translators: This is a menu item in the View menu -->
@@ -94,10 +94,10 @@
 
   <menu id="ViewPlaceholder2">
     <item>
-       <attribute name="label" translatable="yes">_Double Line</attribute>
-       <attribute name="action">GncPluginPageRegisterActions.ViewStyleDoubleLineAction</attribute>
-       <attribute name="tooltip" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction.</attribute>
-       <attribute name="temp" translatable="no">yes</attribute>
+      <attribute name="label" translatable="yes">_Double Line</attribute>
+      <attribute name="action">GncPluginPageRegisterActions.ViewStyleDoubleLineAction</attribute>
+      <attribute name="tooltip" translatable="yes">Show a second line with Action, Notes, and Linked Document fields for each transaction.</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
     </item>
 
   </menu>
@@ -113,7 +113,7 @@
       <attribute name="action">GncPluginPageRegisterActions.ViewFilterByAction</attribute>
       <attribute name="temp" translatable="no">yes</attribute>
     </item>
-   </menu>
+  </menu>
 
   <menu id="ViewPlaceholder4">
     <item>
@@ -177,7 +177,7 @@
       <attribute name="tooltip" translatable="yes">Cancel the current transaction</attribute>
       <attribute name="temp" translatable="no">yes</attribute>
     </item>
-  </menu>  
+  </menu>
 
   <menu id="TransPlaceholder2">
     <item>
@@ -201,18 +201,18 @@
   </menu>
 
   <menu id="TransPlaceholder3">
-      <item>
-        <attribute name="label" translatable="yes">_Manage Document Link…</attribute>
-        <attribute name="action">GncPluginPageRegisterActions.LinkTransactionAction</attribute>
-        <attribute name="tooltip" translatable="yes">Add, change, or unlink the document linked with the current transaction</attribute>
-        <attribute name="temp" translatable="no">yes</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Open Linked Document</attribute>
-        <attribute name="action">GncPluginPageRegisterActions.LinkedTransactionOpenAction</attribute>
-        <attribute name="tooltip" translatable="yes">Open the linked document for the current transaction</attribute>
-        <attribute name="temp" translatable="no">yes</attribute>
-      </item>
+    <item>
+      <attribute name="label" translatable="yes">_Manage Document Link…</attribute>
+      <attribute name="action">GncPluginPageRegisterActions.LinkTransactionAction</attribute>
+      <attribute name="tooltip" translatable="yes">Add, change, or unlink the document linked with the current transaction</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">_Open Linked Document</attribute>
+      <attribute name="action">GncPluginPageRegisterActions.LinkedTransactionOpenAction</attribute>
+      <attribute name="tooltip" translatable="yes">Open the linked document for the current transaction</attribute>
+      <attribute name="temp" translatable="no">yes</attribute>
+    </item>
   </menu>
 
   <menu id="TransPlaceholder4">
@@ -262,7 +262,7 @@
       <attribute name="tooltip" translatable="yes">Bring up the lot viewer/editor window</attribute>
       <attribute name="temp" translatable="no">yes</attribute>
     </item>
-   </menu>
+  </menu>
 
   <menu id="ActionsPlaceholder5">
     <item>
@@ -440,18 +440,18 @@
       </item>
     </section>
     <section>
-        <item>
-          <attribute name="label" translatable="yes">Assign as payment…</attribute>
-          <attribute name="action">gnc-plugin-business-actions.RegisterAssignPayment</attribute>
-          <attribute name="tooltip" translatable="yes">Assign the selected transaction as payment</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Edit payment…</attribute>
-          <attribute name="action">gnc-plugin-business-actions.RegisterEditPayment</attribute>
-          <attribute name="tooltip" translatable="yes">Edit the payment this transaction is a part of</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
+      <item>
+        <attribute name="label" translatable="yes">Assign as payment…</attribute>
+        <attribute name="action">gnc-plugin-business-actions.RegisterAssignPayment</attribute>
+        <attribute name="tooltip" translatable="yes">Assign the selected transaction as payment</attribute>
+        <attribute name="hidden-when">action-disabled</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit payment…</attribute>
+        <attribute name="action">gnc-plugin-business-actions.RegisterEditPayment</attribute>
+        <attribute name="tooltip" translatable="yes">Edit the payment this transaction is a part of</attribute>
+        <attribute name="hidden-when">action-disabled</attribute>
+      </item>
     </section>
   </menu>
 
@@ -552,18 +552,18 @@
       </item>
     </section>
     <section>
-        <item>
-          <attribute name="label" translatable="yes">Assign as payment…</attribute>
-          <attribute name="action">gnc-plugin-business-actions.RegisterAssignPayment</attribute>
-          <attribute name="tooltip" translatable="yes">Assign the selected transaction as payment</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Edit payment…</attribute>
-          <attribute name="action">gnc-plugin-business-actions.RegisterEditPayment</attribute>
-          <attribute name="tooltip" translatable="yes">Edit the payment this transaction is a part of</attribute>
-          <attribute name="hidden-when">action-disabled</attribute>
-        </item>
+      <item>
+        <attribute name="label" translatable="yes">Assign as payment…</attribute>
+        <attribute name="action">gnc-plugin-business-actions.RegisterAssignPayment</attribute>
+        <attribute name="tooltip" translatable="yes">Assign the selected transaction as payment</attribute>
+        <attribute name="hidden-when">action-disabled</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit payment…</attribute>
+        <attribute name="action">gnc-plugin-business-actions.RegisterEditPayment</attribute>
+        <attribute name="tooltip" translatable="yes">Edit the payment this transaction is a part of</attribute>
+        <attribute name="hidden-when">action-disabled</attribute>
+      </item>
     </section>
   </menu>
 
diff --git a/gnucash/ui/gnc-reconcile-window.ui b/gnucash/ui/gnc-reconcile-window.ui
index 1b1b8152b9..5e6df80920 100644
--- a/gnucash/ui/gnc-reconcile-window.ui
+++ b/gnucash/ui/gnc-reconcile-window.ui
@@ -251,7 +251,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="homogeneous">True</property>
-     </packing>
+      </packing>
     </child>
 
     <child>
diff --git a/libgnucash/gnc-module/example/ui/gnc-plugin-example-ui.xml b/libgnucash/gnc-module/example/ui/gnc-plugin-example-ui.xml
index 0c96ec50ec..f0d97d0ea0 100644
--- a/libgnucash/gnc-module/example/ui/gnc-plugin-example-ui.xml
+++ b/libgnucash/gnc-module/example/ui/gnc-plugin-example-ui.xml
@@ -1,9 +1,9 @@
-<ui>
-  <menubar>
-    <menu name="Tools" action="ToolsAction">
-      <placeholder name="ToolsPlaceholder">
-        <menuitem name="example" action="exampleAction"/>
-     </placeholder>
-    </menu>
-  </menubar>
-</ui>
+<interface>
+  <menu id="ToolsPlaceholder0">
+    <item>
+      <attribute name="label" translatable="yes">_Example</attribute>
+      <attribute name="action">gnc-plugin-example-actions.exampleAction</attribute>
+      <attribute name="tooltip" translatable="yes">Example tooltip</attribute>
+    </item>
+  </menu>
+</interface>