Index: trunk/CONTRIBUTION
===================================================================
--- trunk/CONTRIBUTION	(revision 17230)
+++ trunk/CONTRIBUTION	(revision 17231)
@@ -127,5 +127,5 @@
 https://wiki.openstreetmap.org/wiki/File:Logo_simple.svg
 
-Social logos come from https://github.com/FortAwesome/Font-Awesome (CC BY 4.0)
+Social logos and the language icon come from https://github.com/FortAwesome/Font-Awesome (CC BY 4.0)
 
 See also the commit message of each icon for its source
Index: trunk/resources/images/preferences/language.svg
===================================================================
--- trunk/resources/images/preferences/language.svg	(revision 17231)
+++ trunk/resources/images/preferences/language.svg	(revision 17231)
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 640 512"><!-- Font Awesome Free 5.15.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) -->
+    <path d="M152.1 236.2c-3.5-12.1-7.8-33.2-7.8-33.2h-.5s-4.3 21.1-7.8 33.2l-11.1 37.5H163zM616 96H336v320h280c13.3 0 24-10.7 24-24V120c0-13.3-10.7-24-24-24zm-24 120c0 6.6-5.4 12-12 12h-11.4c-6.9 23.6-21.7 47.4-42.7 69.9 8.4 6.4 17.1 12.5 26.1 18 5.5 3.4 7.3 10.5 4.1 16.2l-7.9 13.9c-3.4 5.9-10.9 7.8-16.7 4.3-12.6-7.8-24.5-16.1-35.4-24.9-10.9 8.7-22.7 17.1-35.4 24.9-5.8 3.5-13.3 1.6-16.7-4.3l-7.9-13.9c-3.2-5.6-1.4-12.8 4.2-16.2 9.3-5.7 18-11.7 26.1-18-7.9-8.4-14.9-17-21-25.7-4-5.7-2.2-13.6 3.7-17.1l6.5-3.9 7.3-4.3c5.4-3.2 12.4-1.7 16 3.4 5 7 10.8 14 17.4 20.9 13.5-14.2 23.8-28.9 30-43.2H412c-6.6 0-12-5.4-12-12v-16c0-6.6 5.4-12 12-12h64v-16c0-6.6 5.4-12 12-12h16c6.6 0 12 5.4 12 12v16h64c6.6 0 12 5.4 12 12zM0 120v272c0 13.3 10.7 24 24 24h280V96H24c-13.3 0-24 10.7-24 24zm58.9 216.1L116.4 167c1.7-4.9 6.2-8.1 11.4-8.1h32.5c5.1 0 9.7 3.3 11.4 8.1l57.5 169.1c2.6 7.8-3.1 15.9-11.4 15.9h-22.9a12 12 0 0 1-11.5-8.6l-9.4-31.9h-60.2l-9.1 31.8c-1.5 5.1-6.2 8.7-11.5 8.7H70.3c-8.2 0-14-8.1-11.4-15.9z"/>
+</svg>
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"));
     }