Index: /applications/editors/josm/plugins/CommandLine/build.xml
===================================================================
--- /applications/editors/josm/plugins/CommandLine/build.xml	(revision 30809)
+++ /applications/editors/josm/plugins/CommandLine/build.xml	(revision 30810)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="JOSM/CommandLine: fix exception after JOSM update"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7299"/>
+    <property name="plugin.main.version" value="7687"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java
===================================================================
--- /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java	(revision 30809)
+++ /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java	(revision 30810)
@@ -5,5 +5,4 @@
  *
  */
-
 package CommandLine;
 
@@ -24,14 +23,7 @@
         if (!parentCommand.icon.equals("")) {
             try {
-                putValue(Action.SMALL_ICON, ImageProvider.get(CommandLine.pluginDir, parentCommand.icon));
-                putValue(Action.LARGE_ICON_KEY, ImageProvider.get(CommandLine.pluginDir, parentCommand.icon));
-            }
-            catch (NullPointerException e) {
-                putValue(Action.SMALL_ICON, ImageProvider.get("blankmenu"));
-                putValue(Action.LARGE_ICON_KEY, ImageProvider.get("blankmenu"));
-            }
-            catch (RuntimeException e) {
-                putValue(Action.SMALL_ICON, ImageProvider.get("blankmenu"));
-                putValue(Action.LARGE_ICON_KEY, ImageProvider.get("blankmenu"));
+                putIcons(CommandLine.pluginDir, parentCommand.icon);
+            } catch (RuntimeException e) {
+                putIcons(null, "blankmenu");
             }
         }
@@ -39,4 +31,9 @@
         this.parentCommand = parentCommand;
         this.parentPlugin = parentPlugin;
+    }
+
+    private void putIcons(String subdir, String name) {
+        putValue(Action.SMALL_ICON, new ImageProvider(subdir, name).setSize(ImageProvider.ImageSizes.SMALLICON).get());
+        putValue(Action.LARGE_ICON_KEY, new ImageProvider(subdir, name).setSize(ImageProvider.ImageSizes.LARGEICON).get());
     }