Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 13839)
+++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 13840)
@@ -16,5 +16,4 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JButton;
@@ -24,4 +23,5 @@
 import javax.swing.event.ChangeListener;
 
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -180,18 +180,23 @@
      * @return the help button
      */
-    private static JButton createHelpButton(final String helpTopic) {
-        JButton b = new JButton(tr("Help"));
-        b.setIcon(ImageProvider.get("help"));
-        b.setToolTipText(tr("Show help information"));
+    private static JButton createHelpButton(String helpTopic) {
+        JButton b = new JButton(new HelpAction(helpTopic));
         HelpUtil.setHelpContext(b, helpTopic);
-        Action a = new AbstractAction() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                HelpBrowser.setUrlForHelpTopic(helpTopic);
-            }
-        };
-        b.addActionListener(a);
         InputMapUtils.enableEnter(b);
         return b;
+    }
+
+    private static class HelpAction extends JosmAction {
+        private final String helpTopic;
+
+        HelpAction(String helpTopic) {
+            super(tr("Help"), "help", tr("Show help information"), null, false, false);
+            this.helpTopic = helpTopic;
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            HelpBrowser.setUrlForHelpTopic(helpTopic);
+        }
     }