Index: /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java
===================================================================
--- /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java	(revision 27905)
+++ /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandAction.java	(revision 27906)
@@ -37,5 +37,5 @@
 	private Command parentCommand;
 	public CommandAction(Command parentCommand, CommandLine parentPlugin) {
-		super(tr(parentCommand.name), "blankmenu", tr(parentCommand.name), null, false, false);
+		super(tr(parentCommand.name), "blankmenu", tr(parentCommand.name), null, true, parentCommand.name, true);
 		if (!parentCommand.icon.equals("")) {
 			try {
@@ -48,7 +48,4 @@
 			}
 		}
-		putValue("toolbar", parentCommand.name);
-		Main.toolbar.register(this);
-		installAdapters();
 
 		this.parentCommand = parentCommand;
Index: /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java
===================================================================
--- /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java	(revision 27905)
+++ /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java	(revision 27906)
@@ -41,5 +41,5 @@
 	public CommandLineAction(CommandLine parentPlugin) {
 		super(tr("Command line"), "blankmenu", tr("Set input focus to the command line."),
-		Shortcut.registerShortcut("edit:simplifyArea", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.DIRECT), true);
+		Shortcut.registerShortcut("tool:commandline", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.DIRECT), true, "commandline", true);
 		this.parentPlugin = parentPlugin;
 	}
Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java
===================================================================
--- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 27905)
+++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java	(revision 27906)
@@ -29,5 +29,5 @@
      */
     public LoadImageAction() {
-        super(tr("Import image"), null, tr("Import georeferenced image"), null, false);
+        super(tr("Import image"), null, tr("Import georeferenced image"), null, false, "importimage/loadimage", true);
     }
 
Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java	(revision 27905)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java	(revision 27906)
@@ -26,5 +26,5 @@
         super(tr(name), "cadastre_small", tr("Download Image from French Cadastre WMS"),
                 Shortcut.registerShortcut("cadastre:grab", tr("Cadastre: {0}", tr("Download Image from French Cadastre WMS")),
-                KeyEvent.VK_F10, Shortcut.DIRECT), false);
+                KeyEvent.VK_F10, Shortcut.DIRECT), false, "cadastrefr/grab", true);
     }
 
Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java	(revision 27905)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java	(revision 27906)
@@ -54,5 +54,5 @@
 
     public MenuActionGrabPlanImage() {
-        super(tr(name), "cadastre_small", tr("Grab non-georeferenced image"), null, false);
+        super(tr(name), "cadastre_small", tr("Grab non-georeferenced image"), null, false, "cadastrefr/grabplanimage", true);
     }
 
Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java	(revision 27905)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java	(revision 27906)
@@ -23,5 +23,5 @@
 
     public MenuActionLoadFromCache() {
-        super(tr(name), "cadastre_small", tr("Load location from cache (only if cache is enabled)"), null, false);
+        super(tr(name), "cadastre_small", tr("Load location from cache (only if cache is enabled)"), null, false, "cadastrefr/loadfromcache", true);
     }
 
Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java	(revision 27905)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java	(revision 27906)
@@ -52,5 +52,5 @@
 
     public MenuActionNewLocation() {
-        super(tr("Change location"), "cadastre_small", tr("Set a new location for the next request"), null, false);
+        super(tr("Change location"), "cadastre_small", tr("Set a new location for the next request"), null, false, "cadastrefr/newlocation", true);
     }
 
Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java	(revision 27905)
+++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java	(revision 27906)
@@ -29,5 +29,6 @@
     public DownloadAction2() {
         super(tr("Download from OSM mirror..."), null, tr("Download map data from the OSM server."),
-                Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut.ALT_SHIFT), true);
+            Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut.ALT_SHIFT),
+            true, "mirroreddownload/download", true);
         putValue("help", ht("/Action/MirroredDownload"));
     }
Index: /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java
===================================================================
--- /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 27905)
+++ /applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 27906)
@@ -25,5 +25,6 @@
     public UrlSelectionAction() {
         super(tr("Select URL..."), null, tr("Select URL to download from."),
-                Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut.CTRL_SHIFT), true);
+                Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut.CTRL_SHIFT),
+                true, "mirroreddownload/urlselection", true);
         putValue("help", ht("/Action/SelectUrl"));
     }
Index: /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java
===================================================================
--- /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 27905)
+++ /applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java	(revision 27906)
@@ -37,5 +37,5 @@
      */
     public NameManagerAction() {
-        super(tr(NAME_MANAGER), NAME_MANAGER_MENU, tr(ATTRIBUTE_DISTRICTS), null, true);
+        super(tr(NAME_MANAGER), NAME_MANAGER_MENU, tr(ATTRIBUTE_DISTRICTS), null, true, "namemanager", true);
         DataSet.addSelectionListener(this);
         setEnabled(false);