diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 16621b70e..06b94a4e3 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -7,7 +7,6 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.GridBagLayout;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -25,7 +24,6 @@
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
@@ -35,9 +33,11 @@
 import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
+import javax.swing.SwingConstants;
 import javax.swing.border.Border;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
+import javax.swing.plaf.basic.BasicArrowButton;
 import javax.swing.plaf.basic.BasicSplitPaneDivider;
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 
@@ -137,8 +137,8 @@
 
     private final ListAllButtonsAction listAllDialogsAction = new ListAllButtonsAction(allDialogButtons);
     private final ListAllButtonsAction listAllMapModesAction = new ListAllButtonsAction(allMapModeButtons);
-    private final JButton listAllToggleDialogsButton = new JButton(listAllDialogsAction);
-    private final JButton listAllMapModesButton = new JButton(listAllMapModesAction);
+    private final JButton listAllToggleDialogsButton = new BasicArrowButton(SwingConstants.EAST);
+    private final JButton listAllMapModesButton = new BasicArrowButton(SwingConstants.EAST);
 
     {
         listAllDialogsAction.setButton(listAllToggleDialogsButton);
@@ -500,10 +500,6 @@ public void fillPanel(Container panel) {
             toolBarActions.setBorder(null);
             toolBarActions.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarActions);
-            listAllMapModesButton.setAlignmentX(0.5f);
-            listAllMapModesButton.setBorder(null);
-            listAllMapModesButton.setFont(listAllMapModesButton.getFont().deriveFont(Font.PLAIN));
-            listAllMapModesButton.setInheritsPopupMenu(true);
             sideToolBar.add(listAllMapModesButton);
         }
 
@@ -516,10 +512,6 @@ public void fillPanel(Container panel) {
             toolBarToggle.setBorder(null);
             toolBarToggle.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarToggle);
-            listAllToggleDialogsButton.setAlignmentX(0.5f);
-            listAllToggleDialogsButton.setBorder(null);
-            listAllToggleDialogsButton.setFont(listAllToggleDialogsButton.getFont().deriveFont(Font.PLAIN));
-            listAllToggleDialogsButton.setInheritsPopupMenu(true);
             sideToolBar.add(listAllToggleDialogsButton);
         }
 
@@ -642,9 +634,11 @@ public void actionPerformed(ActionEvent e) {
 
         public void setButton(JButton button) {
             this.button = button;
-            final ImageIcon icon = ImageProvider.get("audio-fwd");
-            putValue(SMALL_ICON, icon);
-            button.setPreferredSize(new Dimension(icon.getIconWidth(), icon.getIconHeight() + 64));
+            button.setPreferredSize(ImageProvider.ImageSizes.LARGEICON.getImageDimension());
+            button.setMaximumSize(ImageProvider.ImageSizes.LARGEICON.getImageDimension());
+            button.setAction(this);
+            button.setAlignmentX(0.5f);
+            button.setInheritsPopupMenu(true);
         }
 
         @Override