diff --git a/gramps/gui/editors/displaytabs/addrembedlist.py b/gramps/gui/editors/displaytabs/addrembedlist.py
index 54a92bff9f..211afdc58e 100644
--- a/gramps/gui/editors/displaytabs/addrembedlist.py
+++ b/gramps/gui/editors/displaytabs/addrembedlist.py
@@ -97,7 +97,7 @@ def __init__(self, dbstate, uistate, track, data, config_key):
 
     def get_icon_name(self):
         """
-        Return the stock-id icon name associated with the display tab
+        Return the icon name associated with the display tab
         """
         return "gramps-address"
 
diff --git a/gramps/gui/editors/displaytabs/citationembedlist.py b/gramps/gui/editors/displaytabs/citationembedlist.py
index ec39eb158e..3aae9739d5 100644
--- a/gramps/gui/editors/displaytabs/citationembedlist.py
+++ b/gramps/gui/editors/displaytabs/citationembedlist.py
@@ -124,7 +124,7 @@ def _connect_db_signals(self):
 
     def get_icon_name(self):
         """
-        Return the stock-id icon name associated with the display tab
+        Return the icon name associated with the display tab
         """
         return "gramps-source"
 
diff --git a/gramps/gui/editors/displaytabs/notetab.py b/gramps/gui/editors/displaytabs/notetab.py
index 6d5efc76ef..6c2217dbe4 100644
--- a/gramps/gui/editors/displaytabs/notetab.py
+++ b/gramps/gui/editors/displaytabs/notetab.py
@@ -213,7 +213,7 @@ def share_button_clicked(self, obj):
 
     def get_icon_name(self):
         """
-        Return the stock-id icon name associated with the display tab
+        Return the icon name associated with the display tab
         """
         return "gramps-notes"
 
diff --git a/gramps/gui/glade/styleeditor.glade b/gramps/gui/glade/styleeditor.glade
index 49bd495d3a..ebcea8d4a9 100644
--- a/gramps/gui/glade/styleeditor.glade
+++ b/gramps/gui/glade/styleeditor.glade
@@ -118,11 +118,11 @@
             </child>
             <child>
               <object class="GtkButton" id="help_btn">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_btn_style_clicked" swapped="no"/>
               </object>
               <packing>
@@ -1819,11 +1819,11 @@
             </child>
             <child>
               <object class="GtkButton" id="help_btn_styles">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_btn_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/docgen/gtkprint.glade b/gramps/plugins/docgen/gtkprint.glade
index 4b4928abc5..6d843e8adc 100644
--- a/gramps/plugins/docgen/gtkprint.glade
+++ b/gramps/plugins/docgen/gtkprint.glade
@@ -22,11 +22,11 @@
             <property name="toolbar-style">icons</property>
             <child>
               <object class="GtkToolButton" id="quit">
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Quit</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Closes print preview window</property>
-                <property name="stock-id">gtk-quit</property>
                 <signal name="clicked" handler="on_quit_clicked" swapped="no"/>
               </object>
               <packing>
@@ -36,11 +36,11 @@
             </child>
             <child>
               <object class="GtkToolButton" id="print">
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Print</property>
+                <property name="use-underline">1</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Prints the current file</property>
-                <property name="stock-id">gtk-print</property>
                 <signal name="clicked" handler="on_print_clicked" swapped="no"/>
               </object>
               <packing>
@@ -60,13 +60,12 @@
             </child>
             <child>
               <object class="GtkToolButton" id="first">
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_First</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Shows the first page</property>
-                <property name="is-important">True</property>
-                <property name="stock-id">gtk-goto-first</property>
                 <signal name="clicked" handler="on_first_clicked" swapped="no"/>
               </object>
               <packing>
@@ -76,13 +75,12 @@
             </child>
             <child>
               <object class="GtkToolButton" id="prev">
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Back</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Shows previous page</property>
-                <property name="is-important">True</property>
-                <property name="stock-id">gtk-go-back</property>
                 <signal name="clicked" handler="on_prev_clicked" swapped="no"/>
               </object>
               <packing>
@@ -92,13 +90,12 @@
             </child>
             <child>
               <object class="GtkToolButton" id="next">
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Forward</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Shows the next page</property>
-                <property name="is-important">True</property>
-                <property name="stock-id">gtk-go-forward</property>
                 <signal name="clicked" handler="on_next_clicked" swapped="no"/>
               </object>
               <packing>
@@ -108,13 +105,12 @@
             </child>
             <child>
               <object class="GtkToolButton" id="last">
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Last</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Shows the last page</property>
-                <property name="is-important">True</property>
-                <property name="stock-id">gtk-goto-last</property>
                 <signal name="clicked" handler="on_last_clicked" swapped="no"/>
               </object>
               <packing>
@@ -189,7 +185,7 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="zoom_fit_width">
-                <property name="use-action-appearance">False</property>
+                <property name="icon-name">gramps-zoom-fit-width</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Zooms to fit the page width</property>
@@ -203,11 +199,10 @@
             </child>
             <child>
               <object class="GtkToggleToolButton" id="zoom_best_fit">
-                <property name="use-action-appearance">False</property>
+                <property name="icon-name">gramps-zoom-best-fit</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Zooms to fit the whole page</property>
-                <property name="stock-id">gtk-zoom-fit</property>
                 <signal name="toggled" handler="on_zoom_best_fit_toggled" swapped="no"/>
               </object>
               <packing>
@@ -217,11 +212,10 @@
             </child>
             <child>
               <object class="GtkToolButton" id="zoom_in">
-                <property name="use-action-appearance">False</property>
+                <property name="icon-name">gramps-zoom-in</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Zooms the page in</property>
-                <property name="stock-id">gtk-zoom-in</property>
                 <signal name="clicked" handler="on_zoom_in_clicked" swapped="no"/>
               </object>
               <packing>
@@ -231,11 +225,10 @@
             </child>
             <child>
               <object class="GtkToolButton" id="zoom_out">
-                <property name="use-action-appearance">False</property>
+                <property name="icon-name">gramps-zoom-out</property>
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Zooms the page out</property>
-                <property name="stock-id">gtk-zoom-out</property>
                 <signal name="clicked" handler="on_zoom_out_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/docgen/gtkprint.py b/gramps/plugins/docgen/gtkprint.py
index abafa40962..a5d0fa9ce7 100644
--- a/gramps/plugins/docgen/gtkprint.py
+++ b/gramps/plugins/docgen/gtkprint.py
@@ -211,13 +211,9 @@ def __build_window(self):
         self._pages_entry = glade_xml.get_object("entry")
         self._pages_label = glade_xml.get_object("label")
         self._zoom_fit_width_button = glade_xml.get_object("zoom_fit_width")
-        self._zoom_fit_width_button.set_stock_id("gramps-zoom-fit-width")
         self._zoom_best_fit_button = glade_xml.get_object("zoom_best_fit")
-        self._zoom_best_fit_button.set_stock_id("gramps-zoom-best-fit")
         self._zoom_in_button = glade_xml.get_object("zoom_in")
-        self._zoom_in_button.set_stock_id("gramps-zoom-in")
         self._zoom_out_button = glade_xml.get_object("zoom_out")
-        self._zoom_out_button.set_stock_id("gramps-zoom-out")
 
         # connect the signals
         glade_xml.connect_signals(self)
diff --git a/gramps/plugins/importer/importgedcom.glade b/gramps/plugins/importer/importgedcom.glade
index f90a904b00..7efb46af62 100644
--- a/gramps/plugins/importer/importgedcom.glade
+++ b/gramps/plugins/importer/importgedcom.glade
@@ -43,13 +43,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="okbutton1">
-                <property name="label">gtk-ok</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/gramps/plugins/tool/changenames.glade b/gramps/plugins/tool/changenames.glade
index 6ccec69410..6f1403adcf 100644
--- a/gramps/plugins/tool/changenames.glade
+++ b/gramps/plugins/tool/changenames.glade
@@ -69,13 +69,12 @@ Select the names you wish Gramps to convert. </property>
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
@@ -86,13 +85,12 @@ Select the names you wish Gramps to convert. </property>
             </child>
             <child>
               <object class="GtkButton" id="button6">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="changenames" swapped="yes"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/changetypes.glade b/gramps/plugins/tool/changetypes.glade
index a9f4d32feb..642cd5a195 100644
--- a/gramps/plugins/tool/changetypes.glade
+++ b/gramps/plugins/tool/changetypes.glade
@@ -19,13 +19,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button5">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_close_clicked" object="changetypes" swapped="yes"/>
               </object>
               <packing>
@@ -36,13 +35,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button3">
-                <property name="label">gtk-ok</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_apply_clicked" object="changetypes" swapped="yes"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/check.glade b/gramps/plugins/tool/check.glade
index b2b22ef447..d9745985c1 100644
--- a/gramps/plugins/tool/check.glade
+++ b/gramps/plugins/tool/check.glade
@@ -18,13 +18,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="close">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="check" swapped="yes"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/eventcmp.glade b/gramps/plugins/tool/eventcmp.glade
index fc499626fc..124147cad7 100644
--- a/gramps/plugins/tool/eventcmp.glade
+++ b/gramps/plugins/tool/eventcmp.glade
@@ -18,13 +18,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button21">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="eventcmp" swapped="yes"/>
               </object>
               <packing>
@@ -35,13 +34,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button19">
-                <property name="label">gtk-save-as</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">Save _As</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_write_table" object="eventcmp" swapped="yes"/>
               </object>
               <packing>
@@ -52,13 +50,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button30">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
@@ -173,13 +170,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button27">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="filters" swapped="yes"/>
               </object>
               <packing>
@@ -190,13 +186,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button26">
-                <property name="label">gtk-apply</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Apply</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_apply_clicked" object="filters" swapped="yes"/>
               </object>
               <packing>
@@ -207,13 +202,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button29">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/finddupes.glade b/gramps/plugins/tool/finddupes.glade
index 40264c5150..da0f248883 100644
--- a/gramps/plugins/tool/finddupes.glade
+++ b/gramps/plugins/tool/finddupes.glade
@@ -25,13 +25,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button12">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="finddupes" swapped="yes"/>
               </object>
               <packing>
@@ -42,13 +41,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button10">
-                <property name="label">gtk-ok</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_merge_ok_clicked" object="finddupes" swapped="yes"/>
               </object>
               <packing>
@@ -59,13 +57,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button14">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
@@ -243,13 +240,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button9">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="mergelist" swapped="yes"/>
               </object>
               <packing>
@@ -277,13 +273,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button13">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_show_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/findloop.glade b/gramps/plugins/tool/findloop.glade
index 3e121f4a2a..f058b9a2d6 100644
--- a/gramps/plugins/tool/findloop.glade
+++ b/gramps/plugins/tool/findloop.glade
@@ -20,13 +20,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="close">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" swapped="yes"/>
               </object>
               <packing>
@@ -37,13 +36,12 @@
             </child>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/mergecitations.glade b/gramps/plugins/tool/mergecitations.glade
index 65bdab2d57..dd2d88cf12 100644
--- a/gramps/plugins/tool/mergecitations.glade
+++ b/gramps/plugins/tool/mergecitations.glade
@@ -25,13 +25,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button12">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="mergecitations" swapped="yes"/>
               </object>
               <packing>
@@ -42,13 +41,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button10">
-                <property name="label">gtk-ok</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_merge_ok_clicked" object="mergecitations" swapped="yes"/>
               </object>
               <packing>
@@ -59,13 +57,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button14">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/notrelated.glade b/gramps/plugins/tool/notrelated.glade
index 3973d476a3..4db25e7f45 100644
--- a/gramps/plugins/tool/notrelated.glade
+++ b/gramps/plugins/tool/notrelated.glade
@@ -18,13 +18,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="close">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="notrelated" swapped="yes"/>
               </object>
               <packing>
@@ -35,13 +34,12 @@
             </child>
             <child>
               <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
@@ -140,12 +138,11 @@
                 </child>
                 <child>
                   <object class="GtkButton" id="tagapply">
-                    <property name="label">gtk-apply</property>
-                    <property name="use-action-appearance">False</property>
+                    <property name="label" translatable="1">_Apply</property>
+                    <property name="use-underline">1</property>
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
                     <property name="receives-default">False</property>
-                    <property name="use-stock">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
diff --git a/gramps/plugins/tool/ownereditor.glade b/gramps/plugins/tool/ownereditor.glade
index a77cb6a981..d40fbb7abc 100644
--- a/gramps/plugins/tool/ownereditor.glade
+++ b/gramps/plugins/tool/ownereditor.glade
@@ -18,13 +18,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="cancel_button">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
               </object>
               <packing>
@@ -35,13 +34,12 @@
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
-                <property name="label">gtk-ok</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/>
               </object>
               <packing>
@@ -52,13 +50,12 @@
             </child>
             <child>
               <object class="GtkButton" id="help_button">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_button_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/patchnames.glade b/gramps/plugins/tool/patchnames.glade
index 47b9716144..de402b265c 100644
--- a/gramps/plugins/tool/patchnames.glade
+++ b/gramps/plugins/tool/patchnames.glade
@@ -18,13 +18,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
@@ -35,13 +34,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button6">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="patchnames" swapped="yes"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/relcalc.glade b/gramps/plugins/tool/relcalc.glade
index be16d35651..46b1e40f4d 100644
--- a/gramps/plugins/tool/relcalc.glade
+++ b/gramps/plugins/tool/relcalc.glade
@@ -19,13 +19,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="button5">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -35,11 +34,11 @@
             </child>
             <child>
               <object class="GtkButton" id="help_btn">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/gramps/plugins/tool/removespaces.glade b/gramps/plugins/tool/removespaces.glade
index ef67368203..8c9fb4630c 100644
--- a/gramps/plugins/tool/removespaces.glade
+++ b/gramps/plugins/tool/removespaces.glade
@@ -20,14 +20,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="close">
-                <property name="label">gtk-close</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
-                <property name="image-position">right</property>
-                <property name="always-show-image">True</property>
                 <signal name="clicked" handler="destroy_passed_object" swapped="yes"/>
               </object>
               <packing>
@@ -39,13 +37,12 @@
             </child>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
-                <property name="always-show-image">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
diff --git a/gramps/plugins/tool/removeunused.glade b/gramps/plugins/tool/removeunused.glade
index 53957e07e7..c937bde00a 100644
--- a/gramps/plugins/tool/removeunused.glade
+++ b/gramps/plugins/tool/removeunused.glade
@@ -17,13 +17,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="remove_button">
-                <property name="label">gtk-delete</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Delete</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_remove_button_clicked" swapped="no"/>
               </object>
               <packing>
@@ -34,13 +33,12 @@
             </child>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" swapped="no"/>
               </object>
               <packing>
@@ -218,13 +216,12 @@
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <child>
                       <object class="GtkButton" id="find_button">
-                        <property name="label">gtk-find</property>
-                        <property name="use-action-appearance">False</property>
+                        <property name="label" translatable="1">_Find</property>
+                        <property name="use-underline">1</property>
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="use-stock">True</property>
                         <signal name="clicked" handler="on_find_button_clicked" swapped="no"/>
                       </object>
                       <packing>
diff --git a/gramps/plugins/tool/reorderids.glade b/gramps/plugins/tool/reorderids.glade
index d6096708ff..2944be1e18 100644
--- a/gramps/plugins/tool/reorderids.glade
+++ b/gramps/plugins/tool/reorderids.glade
@@ -178,14 +178,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="reorder_cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Cancel</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="is-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-underline">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
               </object>
               <packing>
@@ -196,14 +194,12 @@
             </child>
             <child>
               <object class="GtkButton" id="reorder_ok">
-                <property name="label">gtk-ok</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_OK</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-underline">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/>
               </object>
               <packing>
@@ -214,14 +210,12 @@
             </child>
             <child>
               <object class="GtkButton" id="reorder_help">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-underline">True</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_button_clicked" swapped="no"/>
               </object>
               <packing>
@@ -876,7 +870,6 @@
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
-                <property name="resize-mode">queue</property>
                 <property name="halign">start</property>
                 <property name="active">True</property>
                 <property name="draw-indicator">True</property>
@@ -1456,7 +1449,6 @@
                 <property name="focus-on-click">False</property>
                 <property name="receives-default">True</property>
                 <property name="tooltip-text" translatable="yes">Enable ID reordering with Start / Step sequence.</property>
-                <property name="resize-mode">immediate</property>
                 <property name="relief">none</property>
                 <signal name="clicked" handler="on_change_button_clicked" swapped="no"/>
               </object>
diff --git a/gramps/plugins/tool/verify.glade b/gramps/plugins/tool/verify.glade
index ad1ba61195..6fb4be7794 100644
--- a/gramps/plugins/tool/verify.glade
+++ b/gramps/plugins/tool/verify.glade
@@ -107,13 +107,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="helpbutton1">
-                <property name="label">gtk-help</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">Help</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="on_help_clicked" swapped="no"/>
               </object>
               <packing>
@@ -124,13 +123,12 @@
             </child>
             <child>
               <object class="GtkButton" id="button5">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
                 <signal name="clicked" handler="destroy_passed_object" object="verify" swapped="yes"/>
               </object>
               <packing>
@@ -852,13 +850,12 @@
             <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="closebutton1">
-                <property name="label">gtk-close</property>
-                <property name="use-action-appearance">False</property>
+                <property name="label" translatable="1">_Close</property>
+                <property name="use-underline">1</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>
                 <property name="receives-default">False</property>
-                <property name="use-stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>