Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 7771)
@@ -43,5 +43,5 @@
      */
     public AboutAction() {
-        super(tr("About"), "about", tr("Display the about screen."),
+        super(tr("About"), "logo", tr("Display the about screen."),
             Shortcut.registerShortcut("system:about", tr("About"),
             KeyEvent.VK_F1, Shortcut.SHIFT), true);
Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 7771)
@@ -10,5 +10,4 @@
 import java.util.Iterator;
 import java.util.List;
-import java.util.regex.Pattern;
 
 import javax.swing.JOptionPane;
@@ -19,5 +18,4 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 7771)
@@ -25,5 +25,5 @@
      */
     public HistoryInfoAction() {
-        super(tr("History"), "about",
+        super(tr("History"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations."),
                 Shortcut.registerShortcut("core:historyinfo",
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java	(revision 7771)
@@ -15,5 +15,5 @@
 
     public HistoryInfoWebAction() {
-        super(tr("History (web)"), "about",
+        super(tr("History (web)"), "dialogs/history",
                 tr("Display history information about OSM ways, nodes, or relations in web browser."),
                 Shortcut.registerShortcut("core:historyinfoweb",
Index: trunk/src/org/openstreetmap/josm/actions/InfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/InfoAction.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/actions/InfoAction.java	(revision 7771)
@@ -21,5 +21,5 @@
      */
     public InfoAction() {
-        super(tr("Advanced info"), "about",
+        super(tr("Advanced info"), "info",
             tr("Display advanced object information about OSM nodes, ways, or relations."),
             Shortcut.registerShortcut("core:info",
Index: trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java	(revision 7771)
@@ -15,5 +15,5 @@
 
     public InfoWebAction() {
-        super(tr("Advanced info (web)"), "about",
+        super(tr("Advanced info (web)"), "info",
                 tr("Display object information about OSM nodes, ways, or relations in web browser."),
                 Shortcut.registerShortcut("core:infoweb",
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java	(revision 7771)
@@ -423,5 +423,5 @@
             putValue(NAME, tr("Show info"));
             putValue(SHORT_DESCRIPTION, tr("Open a web page for each selected changeset"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("help/internet"));
             updateEnabledState();
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 7771)
@@ -193,5 +193,5 @@
             putValue(NAME, tr("Show info"));
             putValue(SHORT_DESCRIPTION, tr("Launches a browser with information about the user"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("help/internet"));
             updateEnabledState();
         }
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 7771)
@@ -150,5 +150,5 @@
             putValue(NAME, tr("Changeset info"));
             putValue(SHORT_DESCRIPTION, tr("Launch browser with information about the changeset"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("data/changeset"));
         }
 
@@ -180,5 +180,5 @@
             putValue(NAME, tr("User info"));
             putValue(SHORT_DESCRIPTION, tr("Launch browser with information about the user"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("data/user"));
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 7770)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 7771)
@@ -387,5 +387,5 @@
         public TestAccessTokenAction() {
             putValue(NAME, tr("Test Access Token"));
-            putValue(SMALL_ICON, ImageProvider.get("about"));
+            putValue(SMALL_ICON, ImageProvider.get("logo"));
         }