Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 5453)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java	(revision 5454)
@@ -7,4 +7,5 @@
 import java.awt.Font;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
@@ -357,4 +358,8 @@
                     String iconName = tps.getIconName();
                     ImageIcon icon = iconName != null && iconName.length() > 0 ? ImageProvider.get("preferences", iconName) : null;
+                    // See #6985 - Force icons to be 48x48 pixels
+                    if (icon != null && (icon.getIconHeight() != 48 || icon.getIconWidth() != 48)) {
+                        icon = new ImageIcon(icon.getImage().getScaledInstance(48, 48, Image.SCALE_DEFAULT));
+                    }
                     if (settingsInitialized.contains(tps)) {
                         // If it has been initialized, add corresponding tab(s)