Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java	(revision 32593)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java	(revision 32631)
@@ -28,5 +28,5 @@
    */
   public MapillaryJoinAction() {
-    super(tr("Join mode"), MapillaryPlugin.getProvider("icon24.png"),
+    super(tr("Join mode"), MapillaryPlugin.getProvider("mapmode/mapillary-join.svg"),
         tr("Join/unjoin pictures"), Shortcut.registerShortcut("Mapillary join",
             tr("Join Mapillary pictures"), KeyEvent.CHAR_UNDEFINED,
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryChangesetDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryChangesetDialog.java	(revision 32593)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryChangesetDialog.java	(revision 32631)
@@ -70,5 +70,5 @@
     super(
       tr("Current Mapillary changeset"),
-      "mapillaryhistory.png",
+      "mapillary-upload.svg",
       tr("Open Mapillary changeset dialog"),
       Shortcut.registerShortcut(
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java	(revision 32593)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryFilterDialog.java	(revision 32631)
@@ -90,5 +90,5 @@
 
   private MapillaryFilterDialog() {
-    super(tr("Mapillary filter"), "mapillaryfilter.png",
+    super(tr("Mapillary filter"), "mapillary-filter.svg",
             tr("Open Mapillary filter dialog"), Shortcut.registerShortcut(
                     tr("Mapillary filter"), tr("Open Mapillary filter dialog"),
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 32593)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 32631)
@@ -75,5 +75,5 @@
 
   private MapillaryHistoryDialog() {
-    super(tr("Mapillary history"), "mapillaryhistory.png",
+    super(tr("Mapillary history"), "mapillary-history.svg",
         tr("Open Mapillary history dialog"), Shortcut.registerShortcut(
             tr("Mapillary history"), tr("Open Mapillary history dialog"),
Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java
===================================================================
--- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 32593)
+++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 32631)
@@ -96,5 +96,5 @@
 
   private MapillaryMainDialog() {
-    super(tr(BASE_TITLE), "mapillary.png", tr("Open Mapillary window"),
+    super(tr(BASE_TITLE), "mapillary-main.svg", tr("Open Mapillary window"),
             Shortcut.registerShortcut(tr("Mapillary dialog"),
                     tr("Open Mapillary main dialog"), KeyEvent.VK_M, Shortcut.NONE),