Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 17058)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 17060)
@@ -60,4 +60,5 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.I18n;
 
@@ -264,5 +265,5 @@
         setColors(Preferences.main().getAllNamedColors());
 
-        colorEdit = new JButton(tr("Choose"));
+        colorEdit = new JButton(tr("Choose"), ImageProvider.get("colorchooser", ImageProvider.ImageSizes.SMALLICON));
         colorEdit.addActionListener(e -> {
             int sel = colors.getSelectedRow();
@@ -278,5 +279,5 @@
             }
         });
-        defaultSet = new JButton(tr("Reset to default"));
+        defaultSet = new JButton(tr("Reset to default"), ImageProvider.get("undo", ImageProvider.ImageSizes.SMALLICON));
         defaultSet.addActionListener(e -> {
             int sel = colors.getSelectedRow();
@@ -287,5 +288,5 @@
             }
         });
-        JButton defaultAll = new JButton(tr("Set all to default"));
+        JButton defaultAll = new JButton(tr("Set all to default"), ImageProvider.get("undo", ImageProvider.ImageSizes.SMALLICON));
         defaultAll.addActionListener(e -> {
             List<ColorEntry> data = tableModel.getData();
@@ -298,5 +299,5 @@
             tableModel.fireTableDataChanged();
         });
-        remove = new JButton(tr("Remove"));
+        remove = new JButton(tr("Remove"), ImageProvider.get("dialogs/delete", ImageProvider.ImageSizes.SMALLICON));
         remove.addActionListener(e -> {
             int sel = colors.getSelectedRow();
Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 17058)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java	(revision 17060)
@@ -43,4 +43,5 @@
 import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -213,9 +214,9 @@
             JPanel buttonPanel = new JPanel(new FlowLayout());
 
-            JButton add = new JButton(tr("Add"));
+            JButton add = new JButton(tr("Add"), ImageProvider.get("dialogs/add", ImageProvider.ImageSizes.SMALLICON));
             buttonPanel.add(add, GBC.std().insets(0, 5, 0, 0));
             add.addActionListener(e -> model.addRow(new OffsetBookmark(ProjectionRegistry.getProjection().toCode(), "", "", "", 0, 0)));
 
-            JButton delete = new JButton(tr("Delete"));
+            JButton delete = new JButton(tr("Delete"), ImageProvider.get("dialogs/delete", ImageProvider.ImageSizes.SMALLICON));
             buttonPanel.add(delete, GBC.std().insets(0, 5, 0, 0));
             delete.addActionListener(e -> {