diff --git a/data/key-mapper.glade b/data/key-mapper.glade
index 63f4731a..85c4a5af 100644
--- a/data/key-mapper.glade
+++ b/data/key-mapper.glade
@@ -250,6 +250,16 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-redo</property>
   </object>
+  <object class="GtkImage" id="new-icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-new</property>
+  </object>
+  <object class="GtkImage" id="save-icon">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">document-save</property>
+  </object>
   <object class="GtkWindow" id="window">
     <property name="width_request">450</property>
     <property name="can_focus">False</property>
@@ -346,12 +356,12 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="save_preset">
-                        <property name="label">gtk-save</property>
+                        <property name="label">Save</property>
                         <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">save-icon</property>
                         <signal name="clicked" handler="on_save_preset_clicked" swapped="no"/>
                       </object>
                       <packing>
@@ -362,12 +372,12 @@
                     </child>
                     <child>
                       <object class="GtkButton" id="create_preset">
-                        <property name="label">gtk-new</property>
+                        <property name="label">New</property>
                         <property name="width_request">80</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">new-icon</property>
                         <signal name="clicked" handler="on_create_preset_clicked" swapped="no"/>
                       </object>
                       <packing>