Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java	(revision 34674)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java	(revision 34675)
@@ -58,9 +58,4 @@
 
 public class ModulePreference implements SubPreferenceSetting {
-    /*public static class Factory implements PreferenceSettingFactory {
-        public PreferenceSetting createPreferenceSetting() {
-            return new ModulePreference();
-        }
-    }*/
 
     public static String buildDownloadSummary(ModuleDownloadTask task) {
@@ -179,5 +174,5 @@
                 new ButtonSpec(
                         tr("OK"),
-                        ImageProvider.get("ok"),
+                        new ImageProvider("ok"),
                         tr("Accept the new module sites and close the dialog"),
                         null /* no special help topic */
@@ -185,5 +180,5 @@
                 new ButtonSpec(
                         tr("Cancel"),
-                        ImageProvider.get("cancel"),
+                        new ImageProvider("cancel"),
                         tr("Close the dialog"),
                         null /* no special help topic */
@@ -258,5 +253,5 @@
             putValue(NAME, tr("Download list"));
             putValue(SHORT_DESCRIPTION, tr("Download the list of available modules"));
-            putValue(SMALL_ICON, ImageProvider.get("download"));
+            new ImageProvider("download").getResource().attachImageIcon(this);
         }
 
@@ -284,5 +279,5 @@
             putValue(NAME, tr("Update modules"));
             putValue(SHORT_DESCRIPTION, tr("Update the selected modules"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh"));
+            new ImageProvider("dialogs", "refresh").getResource().attachImageIcon(this);
         }
 
@@ -297,5 +292,5 @@
             }
             sb.append("</html>");
-            HelpAwareOptionPane.showOptionDialog(
+            GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog(
                     pnlModulePreferences,
                     sb.toString(),
@@ -303,5 +298,5 @@
                     !failed.isEmpty() ? JOptionPane.WARNING_MESSAGE : JOptionPane.INFORMATION_MESSAGE,
                             HelpUtil.ht("/Preferences/Modules")
-                    );
+                    ));
         }
 
@@ -337,10 +332,5 @@
                 model.refreshLocalModuleVersion(moduleDownloadTask.getDownloadedModules());
                 model.clearPendingModules(moduleDownloadTask.getDownloadedModules());
-                GuiHelper.runInEDT(new Runnable() {
-                    @Override
-                    public void run() {
-                        pnlModulePreferences.refreshView();
-                    }
-                });
+                GuiHelper.runInEDT(() -> pnlModulePreferences.refreshView());
             };
 
@@ -382,5 +372,5 @@
             putValue(NAME, tr("Configure sites..."));
             putValue(SHORT_DESCRIPTION, tr("Configure the list of sites where modules are downloaded from"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "settings"));
+            new ImageProvider("dialogs", "settings").getResource().attachImageIcon(this);
         }