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 32579)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryChangesetDialog.java	(revision 32580)
@@ -20,5 +20,4 @@
 import javax.swing.SwingUtilities;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
@@ -70,8 +69,11 @@
   private MapillaryChangesetDialog() {
     super(
-      tr("Current Mapillary changeset"), "mapillaryhistory.png", tr("Open Mapillary changeset dialog"),
+      tr("Current Mapillary changeset"),
+      "mapillaryhistory.png",
+      tr("Open Mapillary changeset dialog"),
       Shortcut.registerShortcut(
         tr("Mapillary changeset"), tr("Open Mapillary changeset dialog"), KeyEvent.VK_9, Shortcut.NONE
-      ), 200
+      ),
+      200
     );
 
@@ -82,5 +84,5 @@
     this.changesetTree.setShowsRootHandles(true);
     this.changesetTree.setRootVisible(false);
-    this.changesetTree.setCellRenderer(new MapillaryCellRenderer());
+    this.changesetTree.setCellRenderer(new MapillaryImageTreeCellRenderer());
     this.changesetTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
 
@@ -105,6 +107,7 @@
    */
   public static synchronized MapillaryChangesetDialog getInstance() {
-    if (instance == null)
+    if (instance == null) {
       instance = new MapillaryChangesetDialog();
+    }
     return instance;
   }
@@ -148,5 +151,4 @@
       buildTree();
     }
-
   }
 
@@ -166,18 +168,3 @@
     }
   }
-
-  private static class MapillaryCellRenderer extends DefaultTreeCellRenderer {
-
-    private static final long serialVersionUID = -3129520241562296901L;
-
-    @Override
-    public Component getTreeCellRendererComponent(
-      JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus
-    ) {
-      super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-      setIcon(ImageProvider.get("data/node.png"));
-      return this;
-    }
-  }
-
 }
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 32579)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java	(revision 32580)
@@ -26,5 +26,4 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
@@ -88,5 +87,5 @@
     this.undoTree.setShowsRootHandles(true);
     this.undoTree.setRootVisible(false);
-    this.undoTree.setCellRenderer(new MapillaryCellRenderer());
+    this.undoTree.setCellRenderer(new MapillaryImageTreeCellRenderer());
     this.undoTree.getSelectionModel().setSelectionMode(
         TreeSelectionModel.SINGLE_TREE_SELECTION);
@@ -97,5 +96,5 @@
 
     this.redoTree.expandRow(0);
-    this.redoTree.setCellRenderer(new MapillaryCellRenderer());
+    this.redoTree.setCellRenderer(new MapillaryImageTreeCellRenderer());
     this.redoTree.setShowsRootHandles(true);
     this.redoTree.setRootVisible(false);
@@ -227,18 +226,4 @@
   }
 
-  private static class MapillaryCellRenderer extends DefaultTreeCellRenderer {
-
-    private static final long serialVersionUID = -3129520241562296901L;
-
-    @Override
-    public Component getTreeCellRendererComponent(
-        JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus
-    ) {
-      super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-      setIcon(ImageProvider.get("data/node.png"));
-      return this;
-    }
-  }
-
   /**
    * Destroys the unique instance of the class.
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageTreeCellRenderer.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageTreeCellRenderer.java	(revision 32580)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageTreeCellRenderer.java	(revision 32580)
@@ -0,0 +1,26 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.mapillary.gui;
+
+import java.awt.Component;
+
+import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeCellRenderer;
+
+import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * Renders an item in a {@link JTree} that represents a {@link MapillaryAbstractImage}.
+ */
+public class MapillaryImageTreeCellRenderer extends DefaultTreeCellRenderer {
+  private static final long serialVersionUID = 5359276673450659572L;
+
+  @Override
+  public Component getTreeCellRendererComponent(
+    JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus
+  ) {
+    super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
+    setIcon(ImageProvider.get("mapicon.png"));
+    return this;
+  }
+}