Index: applications/editors/josm/plugins/imagery/build.xml
===================================================================
--- applications/editors/josm/plugins/imagery/build.xml	(revision 24501)
+++ applications/editors/josm/plugins/imagery/build.xml	(revision 24502)
@@ -105,5 +105,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Experimental union of SlippyMap plugin and WMSPlugin"/>
-                <attribute name="Plugin-Icon" value="images/wms.png"/>
+                <attribute name="Plugin-Icon" value="images/imagery.png"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMSPlugin" />
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
Index: applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/AddImageryLayerAction.java
===================================================================
--- applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/AddImageryLayerAction.java	(revision 24501)
+++ applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/AddImageryLayerAction.java	(revision 24502)
@@ -13,5 +13,5 @@
 
     public AddImageryLayerAction(ImageryInfo info) {
-        super(info.getMenuName(), "wmsmenu", tr("Add imagery layer {0}",info.getName()), null, false);
+        super(info.getMenuName(), "imagery_menu", tr("Add imagery layer {0}",info.getName()), null, false);
         putValue("toolbar", "imagery_" + info.getToolbarName());
         this.info = info;
Index: applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java
===================================================================
--- applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java	(revision 24501)
+++ applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryAdjustAction.java	(revision 24502)
@@ -37,5 +37,5 @@
 
     public ImageryAdjustAction(MapFrame mapFrame) {
-        super(tr("Adjust imagery"), "adjustwms",
+        super(tr("Adjust imagery"), "adjustimg",
                 tr("Adjust the position of the selected imagery layer"), mapFrame,
                 ImageProvider.getCursor("normal", "move"));
Index: applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java
===================================================================
--- applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java	(revision 24501)
+++ applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java	(revision 24502)
@@ -14,5 +14,6 @@
 
 public abstract class ImageryLayer extends Layer {
-
+    protected static final Icon icon =
+        new ImageIcon(Toolkit.getDefaultToolkit().createImage(ImageryPlugin.class.getResource("/images/imagery_small.png")));
     protected MapView mv;
 
@@ -43,7 +44,4 @@
     }
 
-    protected static final Icon icon =
-        new ImageIcon(Toolkit.getDefaultToolkit().createImage(ImageryPlugin.class.getResource("/images/wms_small.png")));
-
     @Override
     public Icon getIcon() {
Index: applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java
===================================================================
--- applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java	(revision 24501)
+++ applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java	(revision 24502)
@@ -52,5 +52,5 @@
     @Override
     public void addGui(final PreferenceTabbedPane gui) {
-        JPanel p = gui.createPreferenceTab("wms", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"));
+        JPanel p = gui.createPreferenceTab("imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"));
 
         model = new ImageryLayerTableModel();