Index: trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java	(revision 17230)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/TabPreferenceSetting.java	(revision 17231)
@@ -28,5 +28,9 @@
     default ImageIcon getIcon(ImageProvider.ImageSizes size) {
         String iconName = getIconName();
-        return iconName == null || iconName.isEmpty() ? null : ImageProvider.get("preferences", iconName, size);
+        return iconName == null || iconName.isEmpty()
+                ? null
+                : iconName.contains("/")
+                ? ImageProvider.get(iconName, size)
+                : ImageProvider.get("preferences", iconName, size);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 17230)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java	(revision 17231)
@@ -81,5 +81,5 @@
 
     ColorPreference() {
-        super(null, tr("Colors"), tr("Change colors used in program dialogs and in map paint styles."));
+        super("/colorchooser", tr("Colors"), tr("Change colors used in program dialogs and in map paint styles."));
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 17230)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java	(revision 17231)
@@ -69,5 +69,5 @@
 
     DrawingPreference() {
-        super(null, tr("OSM Data"), tr("Settings that control the drawing of OSM data."));
+        super(/* ICON(preferences/) */ "display", tr("OSM Data"), tr("Settings that control the drawing of OSM data."));
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXPreference.java	(revision 17230)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXPreference.java	(revision 17231)
@@ -25,5 +25,5 @@
 
     GPXPreference() {
-        super(null, tr("GPS Points"), tr("Settings that control the drawing of GPS tracks."));
+        super("layer/gpx_small.svg", tr("GPS Points"), tr("Settings that control the drawing of GPS tracks."));
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java	(revision 17230)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java	(revision 17231)
@@ -48,5 +48,5 @@
 
     LanguagePreference() {
-        super(null, tr("Language"), tr("Change the language of JOSM."));
+        super(/* ICON(preferences/) */ "language", tr("Language"), tr("Change the language of JOSM."));
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java	(revision 17230)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java	(revision 17231)
@@ -40,5 +40,5 @@
 
     MapPaintPreference() {
-        super(null, tr("Map Paint Styles"), tr("Map Paint Styles"));
+        super("dialogs/mapstyle", tr("Map Paint Styles"), tr("Map Paint Styles"));
     }