Index: /applications/editors/josm/plugins/wikipedia/build.xml
===================================================================
--- /applications/editors/josm/plugins/wikipedia/build.xml	(revision 32386)
+++ /applications/editors/josm/plugins/wikipedia/build.xml	(revision 32387)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="9649"/>
+    <property name="plugin.main.version" value="10369"/>
     <property name="plugin.canloadatruntime" value="true"/>
 
Index: /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java
===================================================================
--- /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 32386)
+++ /applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 32387)
@@ -119,5 +119,6 @@
 
         public WikipediaLoadCoordinatesAction() {
-            super(tr("Coordinates"), ImageProvider.get("dialogs", "refresh"));
+            super(tr("Coordinates"));
+            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Fetches all coordinates from Wikipedia in the current view"));
         }
@@ -176,5 +177,6 @@
 
         public WikipediaLoadCategoryAction() {
-            super(tr("Category"), ImageProvider.get("dialogs", "refresh"));
+            super(tr("Category"));
+            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Fetches a list of all Wikipedia articles of a category"));
         }
@@ -205,5 +207,6 @@
 
         public PasteWikipediaArticlesAction() {
-            super(tr("Clipboard"), ImageProvider.get("paste"));
+            super(tr("Clipboard"));
+            new ImageProvider("paste").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Pastes Wikipedia articles from the system clipboard"));
         }
@@ -226,5 +229,6 @@
 
         public OpenWikipediaArticleAction() {
-            super(tr("Open Article"), ImageProvider.getIfAvailable("browser"));
+            super(tr("Open Article"));
+            new ImageProvider("browser").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Opens the Wikipedia article of the selected item in a browser"));
         }
@@ -243,5 +247,6 @@
 
         public WikipediaSettingsAction() {
-            super(tr("Language"), ImageProvider.get("dialogs/settings"));
+            super(tr("Language"));
+            new ImageProvider("dialogs/settings").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Sets the default language for the Wikipedia articles"));
         }
@@ -264,5 +269,6 @@
 
         public AddWikipediaTagAction() {
-            super(tr("Add Tag"), ImageProvider.get("pastetags"));
+            super(tr("Add Tag"));
+            new ImageProvider("pastetags").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Adds a ''wikipedia'' tag corresponding to this article to the selected objects"));
         }
@@ -290,5 +296,6 @@
 
         ZoomToWikipediaArticleAction() {
-            super(tr("Zoom to selection"), ImageProvider.get("dialogs/autoscale", "selection"));
+            super(tr("Zoom to selection"));
+            new ImageProvider("dialogs/autoscale", "selection").getResource().attachImageIcon(this);
             putValue(SHORT_DESCRIPTION, tr("Zoom to selection"));
         }