Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java	(revision 30805)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java	(revision 30806)
@@ -5,4 +5,5 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
 import org.openstreetmap.josm.Main;
@@ -11,13 +12,12 @@
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.gui.OdPreferenceSetting;
-import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 
 public class OpenPreferencesActions extends JosmAction {
     
     public OpenPreferencesActions() {
-        super(false);
-        putValue(NAME, tr("OpenData preferences"));
-        putValue(SMALL_ICON, ImageProvider.get("dialogs", OdConstants.ICON_CORE_24));
-        putValue("toolbar", "opendata_open_preferences");
+        super(tr("OpenData preferences"), OdConstants.ICON_CORE_24, null, 
+                Shortcut.registerShortcut("opendata_open_preferences", tr("OpenData preferences"),
+                KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), true, false);
     }
     
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java	(revision 30805)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java	(revision 30806)
@@ -4,4 +4,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Dimension;
 import java.awt.Image;
 import java.io.File;
@@ -28,4 +29,5 @@
 import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.LanguageInfo;
 
@@ -328,7 +330,7 @@
 
     public ImageIcon getScaledIcon() {
-        if (icon == null)
-            return OdUtils.getImageIcon(OdConstants.ICON_EMPTY_24);
-        return new ImageIcon(icon.getImage().getScaledInstance(24, 24, Image.SCALE_SMOOTH));
+        Dimension dim = ImageProvider.getImageSizes(ImageSizes.MENU);
+        ImageIcon iconToScale = icon != null ? icon : OdUtils.getImageIcon(OdConstants.ICON_EMPTY_24);
+        return new ImageIcon(iconToScale.getImage().getScaledInstance(dim.width, dim.height, Image.SCALE_SMOOTH));
     }
 }