Index: trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java	(revision 8056)
@@ -32,5 +32,5 @@
      */
     public AddNoteAction(MapFrame mapFrame, NoteData data) {
-        super(tr("Add a new Note"), "addnote.png",
+        super(tr("Add a new Note"), "addnote",
             tr("Add note mode"),
             mapFrame, ImageProvider.getCursor("crosshair", "create_note"));
Index: trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SizeButton.java	(revision 8056)
@@ -29,6 +29,6 @@
         super();
         this.slippyMapBBoxChooser = slippyMapBBoxChooser;
-        enlargeImage = ImageProvider.get("view-fullscreen.png");
-        shrinkImage = ImageProvider.get("view-fullscreen-revert.png");
+        enlargeImage = ImageProvider.get("view-fullscreen");
+        shrinkImage = ImageProvider.get("view-fullscreen-revert");
         setPreferredSize(new Dimension(enlargeImage.getIconWidth(), enlargeImage.getIconHeight()));
         addMouseListener(mouseListener);
Index: trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java	(revision 8056)
@@ -48,6 +48,6 @@
         this.slippyMapBBoxChooser = slippyMapBBoxChooser;
         setSources(sources);
-        enlargeImage = ImageProvider.get("layer-switcher-maximize.png");
-        shrinkImage = ImageProvider.get("layer-switcher-minimize.png");
+        enlargeImage = ImageProvider.get("layer-switcher-maximize");
+        shrinkImage = ImageProvider.get("layer-switcher-minimize");
 
         hiddenDimension= new Dimension(enlargeImage.getIconWidth(), enlargeImage.getIconHeight());
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 8056)
@@ -623,5 +623,5 @@
 
         public CopyAllLeft() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft");
             putValue(Action.SMALL_ICON, icon);
             putValue(Action.SHORT_DESCRIPTION, tr("Copy all my elements to the target"));
@@ -652,5 +652,5 @@
 
         public CopyAllRight() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright");
             putValue(Action.SMALL_ICON, icon);
             putValue(Action.SHORT_DESCRIPTION, tr("Copy all their elements to the target"));
@@ -681,5 +681,5 @@
 
         public MoveUpMergedAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup");
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
@@ -715,5 +715,5 @@
 
         public MoveDownMergedAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown");
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
@@ -749,5 +749,5 @@
 
         public RemoveMergedAction() {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove.png");
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove");
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 8056)
@@ -674,5 +674,5 @@
             JMenu setMenu = new JMenu(tr("Style settings"));
             setMenu.setIcon(ImageProvider.overlay(ImageProvider.get("preference"),
-                ImageProvider.get("dialogs/mappaint/pencil.png"),
+                ImageProvider.get("dialogs/mappaint", "pencil"),
                 ImageProvider.OverlayPosition.SOUTHEAST));
             setMenu.setToolTipText(tr("Customize the style"));
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 8056)
@@ -28,5 +28,5 @@
 
     public AudioMarker(LatLon ll, TemplateEngineDataProvider dataProvider, URL audioUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, dataProvider, "speech.png", parentLayer, time, offset);
+        super(ll, dataProvider, "speech", parentLayer, time, offset);
         this.audioUrl = audioUrl;
         this.syncOffset = 0.0;
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ImageMarker.java	(revision 8056)
@@ -39,5 +39,5 @@
 
     public ImageMarker(LatLon ll, URL imageUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, "photo.png", parentLayer, time, offset);
+        super(ll, "photo", parentLayer, time, offset);
         this.imageUrl = imageUrl;
     }
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java	(revision 8056)
@@ -31,5 +31,5 @@
 
     public WebMarker(LatLon ll, URL webUrl, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, "web.png", parentLayer, time, offset);
+        super(ll, "web", parentLayer, time, offset);
         CheckParameterUtil.ensureParameterNotNull(webUrl, "webUrl");
         this.webUrl = webUrl;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 8047)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java	(revision 8056)
@@ -102,5 +102,5 @@
                     } catch (ProjectionConfigurationException ex) {
                         error = ex.getMessage();
-                        valStatus.setIcon(ImageProvider.get("data", "error.png"));
+                        valStatus.setIcon(ImageProvider.get("data", "error"));
                         valStatus.setVisible(true);
                         errorsPanel.setText(error);
@@ -109,5 +109,5 @@
                     }
                     errorsPanel.setVisible(false);
-                    valStatus.setIcon(ImageProvider.get("misc", "green_check.png"));
+                    valStatus.setIcon(ImageProvider.get("misc", "green_check"));
                     valStatus.setVisible(true);
                     return true;