Index: /applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
===================================================================
--- /applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 35498)
+++ /applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 35499)
@@ -111,5 +111,5 @@
         initTitleAndDescriptionFromGpxData(gpxData);    // this is changing some dialog elements, so it (probably) must be before the following
         setContent(content);
-        setButtonIcons(new String[] { "uploadtrace.png", "cancel.png" });
+        setButtonIcons(new String[] { "uploadtrace", "cancel" });
         setupDialog();
 
Index: /applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java
===================================================================
--- /applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java	(revision 35499)
@@ -107,5 +107,5 @@
 
         setContent(all, false);
-        setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setButtonIcons(new String[] {"ok", "cancel"});
         setToolTipTexts(new String[] {
                 tr("Save settings"),
Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java
===================================================================
--- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java	(revision 35499)
@@ -48,5 +48,5 @@
                 true);
         contentInsets = new Insets(15, 15, 5, 15);
-        setButtonIcons("ok.png", "cancel.png");
+        setButtonIcons("ok", "cancel");
 
         this.tool = tool;
Index: /applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java
===================================================================
--- /applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportDialog.java	(revision 35499)
@@ -26,6 +26,5 @@
                 true);
         contentInsets = new Insets(15, 15, 5, 15);
-        setButtonIcons(new String[] { "ok.png", "cancel.png" });
-        
+        setButtonIcons(new String[] { "ok", "cancel" });
 
         final JPanel panel = new JPanel(new GridBagLayout());
@@ -37,10 +36,10 @@
         pscale.add(new JLabel(tr("m")),GBC.std().insets(10, 0, 0, 0));
         panel.add(pscale,GBC.eop().fill(GBC.HORIZONTAL));
-        
+
         final JLabel label = new JLabel("Curve steps:");
         panel.add(label, GBC.std());
         label.setLabelFor(tsteps);
         panel.add(tsteps, GBC.eol().fill(GBC.HORIZONTAL));
-        
+
         tsnum.setValue(Settings.getScaleNumerator());
         tsdiv.setValue(Settings.getScaleDivisor());
@@ -51,5 +50,5 @@
         setVisible(true);
     }
-    
+
     public double getScaleNumerator() {
         try {
@@ -59,5 +58,5 @@
         }
     }
-    
+
     public double getScaleDivisor() {
         try {
@@ -82,5 +81,5 @@
     }
 
-    
+
     public void saveSettings() {
         Settings.setScaleNumerator(getScaleNumerator());
Index: /applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java	(revision 35498)
+++ /applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java	(revision 35499)
@@ -135,5 +135,5 @@
                 tr("Photo Geotagging Plugin"),
                 new String[] {tr("OK"), tr("Cancel")})
-            .setButtonIcons(new String[] {"ok.png", "cancel.png"})
+            .setButtonIcons(new String[] {"ok", "cancel"})
             .setContent(cont)
             .setCancelButton(2)
@@ -361,5 +361,5 @@
                             tr("Override old backup files?"),
                             new String[] {tr("Cancel"), tr("Keep old backups and continue"), tr("Override")})
-                        .setButtonIcons(new String[] {"cancel.png", "ok.png", "dialogs/delete.png"})
+                        .setButtonIcons(new String[] {"cancel", "ok", "dialogs/delete"})
                         .setContent(l)
                         .setCancelButton(1)
Index: /applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java
===================================================================
--- /applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java	(revision 35498)
+++ /applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java	(revision 35499)
@@ -104,5 +104,5 @@
     public void setupDialog() {
         setContent(panel, false);
-        setButtonIcons("ok.png", "cancel.svg");
+        setButtonIcons("ok", "cancel");
         setDefaultButton(1);
 
Index: /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java
===================================================================
--- /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java	(revision 35499)
@@ -117,5 +117,5 @@
         this.signs = RoadSignsPlugin.signs;
         sel = new SignSelection();
-        setButtonIcons("ok.png", "cancel.png");
+        setButtonIcons("ok", "cancel");
         final JTabbedPane tabs = new JTabbedPane();
         tabs.add(tr("signs"), buildSignsPanel());
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java	(revision 35498)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java	(revision 35499)
@@ -67,5 +67,5 @@
                 );
                 dialog.setContent(tr("File exists. Overwrite?"));
-                dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
+                dialog.setButtonIcons(new String[] {"save_as", "cancel"});
                 dialog.showDialog();
                 if (dialog.getValue() != 1)
@@ -126,5 +126,5 @@
             );
             dialog.setContent(tr("File exists. Overwrite?"));
-            dialog.setButtonIcons(new String[] {"save_as.png", "cancel.png"});
+            dialog.setButtonIcons(new String[] {"save_as", "cancel"});
             dialog.showDialog();
             return (dialog.getValue() == 1);
Index: /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/HouseNumberInputDialog.java	(revision 35499)
@@ -108,5 +108,5 @@
         JPanel content = getInputPanel();
         setContent(content);
-        setButtonIcons(new String[] {"ok.png", "cancel.png" });
+        setButtonIcons(new String[] {"ok", "cancel" });
         getJContentPane();
         initialize();
Index: /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java
===================================================================
--- /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/tracer2/src/org/openstreetmap/josm/plugins/tracer2/preferences/ServerParamDialog.java	(revision 35499)
@@ -121,5 +121,5 @@
 
         contentInsets = new Insets(15, 15, 5, 15);
-        setButtonIcons(new String[] {"ok.png", "cancel.png"});
+        setButtonIcons(new String[] {"ok", "cancel"});
 
         m_oTileSize = new JComboBox<>(m_astrTileSize);
Index: /applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteDialog.java
===================================================================
--- /applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteDialog.java	(revision 35498)
+++ /applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/UndeleteDialog.java	(revision 35499)
@@ -56,5 +56,5 @@
         all.add(layer, gc);
         setContent(all, false);
-        setButtonIcons("undelete.png", "cancel.png");
+        setButtonIcons("undelete", "cancel");
         setToolTipTexts(tr("Start undeleting"), tr("Close dialog and cancel"));
         setDefaultButton(1);