Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java	(revision 31424)
@@ -34,4 +34,6 @@
   /** Plugin's directory */
   public static String directory;
+  /** OS route separator */
+  public static final String SEPARATOR = System.getProperty("file.separator");
   /** 24x24 icon. */
   public static ImageIcon ICON24;
@@ -86,13 +88,14 @@
     super(info);
 
-    directory = new File("").getAbsolutePath() + "/";
-    ICON24 = new ImageProvider(directory + "images/icon24.png").get();
-    ICON16 = new ImageProvider(directory + "images/icon16.png").get();
-    MAP_ICON = new ImageProvider(directory + "images/mapicon.png").get();
+
+    directory = new File("").getAbsolutePath() + SEPARATOR;
+    ICON24 = new ImageProvider(directory + "images" + SEPARATOR + "icon24.png").get();
+    ICON16 = new ImageProvider(directory + "images" + SEPARATOR + "icon16.png").get();
+    MAP_ICON = new ImageProvider(directory + "images" + SEPARATOR + "mapicon.png").get();
     MAP_ICON_SELECTED = new ImageProvider(directory
-        + "images/mapiconselected.png").get();
+        + "images" + SEPARATOR + "mapiconselected.png").get();
     MAP_ICON_IMPORTED = new ImageProvider(directory
         + "images/mapiconimported.png").get();
-    MAP_SIGN = new ImageProvider(directory + "images/sign.png").get();
+    MAP_SIGN = new ImageProvider(directory + "images" + SEPARATOR + "sign.png").get();
 
     downloadAction = new MapillaryDownloadAction();
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java	(revision 31424)
@@ -31,5 +31,6 @@
    */
   public MapillaryDownloadAction() {
-    super(tr("Mapillary"), new ImageProvider(MapillaryPlugin.directory + "images/icon24.png"),
+    super(tr("Mapillary"), new ImageProvider(MapillaryPlugin.directory
+        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
         tr("Create Mapillary layer"), Shortcut.registerShortcut("Mapillary",
             tr("Start Mapillary layer"), KeyEvent.VK_COMMA, Shortcut.SHIFT),
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java	(revision 31424)
@@ -27,5 +27,5 @@
   public MapillaryDownloadViewAction() {
     super(tr("Download Mapillary images in current view"), new ImageProvider(
-        MapillaryPlugin.directory + "images/icon24.png"), tr("Download Mapillary images in current view"),
+        MapillaryPlugin.directory + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"), tr("Download Mapillary images in current view"),
         Shortcut.registerShortcut("Mapillary area",
             tr("Download Mapillary images in current view"),
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java	(revision 31424)
@@ -43,5 +43,6 @@
    */
   public MapillaryExportAction() {
-    super(tr("Export pictures"), new ImageProvider(MapillaryPlugin.directory + "images/icon24.png"),
+    super(tr("Export pictures"), new ImageProvider(MapillaryPlugin.directory
+        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
         tr("Export pictures"), Shortcut.registerShortcut("Export Mapillary",
             tr("Export Mapillary pictures"), KeyEvent.CHAR_UNDEFINED,
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java	(revision 31424)
@@ -51,7 +51,7 @@
   public MapillaryImportAction() {
     super(tr("Import pictures"), new ImageProvider(MapillaryPlugin.directory
-        + "images/icon24.png"), tr("Import local pictures"), Shortcut
-        .registerShortcut("Import Mapillary",
-            tr("Import pictures into Mapillary layer"),
+        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
+        tr("Import local pictures"), Shortcut.registerShortcut(
+            "Import Mapillary", tr("Import pictures into Mapillary layer"),
             KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryImport",
         false);
@@ -267,5 +267,5 @@
     }
 
-    result = 360*((result+180)/360 - Math.floor((result+180)/360)) - 180;
+    result = 360 * ((result + 180) / 360 - Math.floor((result + 180) / 360)) - 180;
     return result;
   }
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportIntoSequenceAction.java	(revision 31424)
@@ -51,5 +51,7 @@
    */
   public MapillaryImportIntoSequenceAction() {
-    super(tr("Import pictures into sequence"), new ImageProvider(MapillaryPlugin.directory + "images/icon24.png"),
+    super(tr("Import pictures into sequence"), new ImageProvider(
+        MapillaryPlugin.directory
+            + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
         tr("Import local pictures"), Shortcut.registerShortcut(
             "Import Mapillary Sequence",
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 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryJoinAction.java	(revision 31424)
@@ -28,5 +28,6 @@
    */
   public MapillaryJoinAction() {
-    super(tr("Join mode"), new ImageProvider(MapillaryPlugin.directory + "images/icon24.png"),
+    super(tr("Join mode"), new ImageProvider(MapillaryPlugin.directory
+        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
         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/actions/MapillaryWalkAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryWalkAction.java	(revision 31424)
@@ -40,7 +40,8 @@
   public MapillaryWalkAction() {
     super(tr("Walk mode"), new ImageProvider(MapillaryPlugin.directory
-        + "images/icon24.png"), tr("Walk mode"), Shortcut.registerShortcut(
-        "Mapillary walk", tr("Start walk mode"), KeyEvent.CHAR_UNDEFINED,
-        Shortcut.NONE), false, "mapillaryWalk", false);
+        + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"), tr("Walk mode"),
+        Shortcut.registerShortcut("Mapillary walk", tr("Start walk mode"),
+            KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), false, "mapillaryWalk",
+        false);
     this.setEnabled(false);
   }
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java	(revision 31424)
@@ -30,5 +30,7 @@
    */
   public MapillaryZoomAction() {
-    super(tr("Zoom to selected image"), new ImageProvider(MapillaryPlugin.directory + "images/icon24.png"),
+    super(tr("Zoom to selected image"), new ImageProvider(
+        MapillaryPlugin.directory
+            + "images" + MapillaryPlugin.SEPARATOR + "icon24.png"),
         tr("Zoom to selected image"), Shortcut.registerShortcut(
             "Zoom Mapillary",
Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java	(revision 31423)
+++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java	(revision 31424)
@@ -11,5 +11,4 @@
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryImportAction;