Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 16929)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 16931)
@@ -657,6 +657,6 @@
 
             JMenu setMenu = new JMenu(tr("Style settings"));
-            setMenu.setIcon(new ImageProvider("preference").setMaxSize(ImageSizes.POPUPMENU).addOverlay(
-                new ImageOverlay(new ImageProvider("dialogs/mappaint", "pencil"), 0.5, 0.5, 1.0, 1.0)).get());
+            setMenu.setIcon(new ImageProvider("dialogs/mapstyle").setMaxSize(ImageSizes.MENU).addOverlay(
+                new ImageOverlay(new ImageProvider("preference"), 0.3, 0.3, 1.0, 1.0)).get());
             setMenu.setToolTipText(tr("Customize the style"));
             add(setMenu);
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 16929)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java	(revision 16931)
@@ -204,5 +204,5 @@
     private static synchronized ImageProvider getDefaultIconProvider() {
         if (defaultIconProvider == null) {
-            defaultIconProvider = new ImageProvider("dialogs/mappaint", "pencil");
+            defaultIconProvider = new ImageProvider("dialogs", "mapstyle");
         }
         return defaultIconProvider;