Index: /applications/editors/josm/plugins/roadsigns/build.xml
===================================================================
--- /applications/editors/josm/plugins/roadsigns/build.xml	(revision 27674)
+++ /applications/editors/josm/plugins/roadsigns/build.xml	(revision 27675)
@@ -30,5 +30,5 @@
     <property name="commit.message" value="preset maintenance (Fahrradstraße)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4721"/>
 
     <!--
Index: /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java
===================================================================
--- /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java	(revision 27674)
+++ /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java	(revision 27675)
@@ -82,5 +82,5 @@
     public ImageIcon getIcon() {
         if (icon == null) {
-            icon = ImageProvider.getIfAvailable(RoadSignsPlugin.iconDirs, "plugin.sign."+id, null, iconURL, null);
+            icon = new ImageProvider(iconURL).setDirs(RoadSignsPlugin.iconDirs).setId("plugin.sign."+id).setOptional(true).get();
         }
         return icon;
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 27674)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 27675)
@@ -28,5 +28,5 @@
                 Shortcut.registerShortcut("edit:launchtageditor", tr("Launches the tag editor dialog"),
                         KeyEvent.VK_T,Shortcut.GROUP_EDIT)
-		,true);
+                , true, "tageditor/launch", true);
 
         DataSet.addSelectionListener(this);
Index: /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AbstractNameIconProvider.java
===================================================================
--- /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AbstractNameIconProvider.java	(revision 27674)
+++ /applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/AbstractNameIconProvider.java	(revision 27675)
@@ -35,10 +35,8 @@
     
     public Icon getIcon() {
-        if (icon == null) {
+        if (icon == null && getIconName() != null) {
             Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-            icon = ImageProvider.getIfAvailable(s, "presets", null, getIconName(), zipIconArchive);
-            if (icon == null) return null;
-            Image i = icon.getImage().getScaledInstance(16, 16, Image.SCALE_DEFAULT);
-            icon = new ImageIcon(i);
+            icon = new ImageProvider(getIconName()).setDirs(s).setId("presets").setArchive(zipIconArchive).setOptional(true)
+            .setMaxWidth(16).setMaxHeight(16).get();
         }
         return icon;