Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 16799) +++ trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 16800) @@ -245,5 +245,5 @@ @Override public Icon getDescriptionIcon() { - return ImageProvider.get("data", "key"); + return ImageProvider.get("dialogs", "propertiesdialog", ImageProvider.ImageSizes.SMALLICON); } Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java (revision 16799) +++ trunk/src/org/openstreetmap/josm/command/ChangePropertyKeyCommand.java (revision 16800) @@ -141,5 +141,5 @@ @Override public Icon getDescriptionIcon() { - return ImageProvider.get("data", "key"); + return ImageProvider.get("dialogs", "propertiesdialog", ImageProvider.ImageSizes.SMALLICON); } Index: trunk/src/org/openstreetmap/josm/command/PurgeCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 16799) +++ trunk/src/org/openstreetmap/josm/command/PurgeCommand.java (revision 16800) @@ -259,5 +259,5 @@ @Override public Icon getDescriptionIcon() { - return ImageProvider.get("data", "purge"); + return ImageProvider.get("purge"); } Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 16799) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 16800) @@ -1336,5 +1336,5 @@ mainFrame, title, tr("Change proxy settings"), tr("Cancel")); - ed.setButtonIcons("dialogs/settings", "cancel").setCancelButton(2); + ed.setButtonIcons("preference", "cancel").setCancelButton(2); ed.setMinimumSize(new Dimension(460, 260)); ed.setIcon(JOptionPane.WARNING_MESSAGE); Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 16799) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 16800) @@ -321,5 +321,5 @@ tr("Delete image file from disk"), tr("Cancel"), tr("Delete")) - .setButtonIcons("cancel", "dialogs/delete") + .setButtonIcons("cancel", "dialogs/geoimage/deletefromdisk") .setContent(new JLabel("

" + trn("Delete the file from disk?",