Index: /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java	(revision 17297)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java	(revision 17298)
@@ -16,4 +16,5 @@
 import javax.swing.JLabel;
 import javax.swing.JList;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JSpinner;
@@ -30,8 +31,10 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
+
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.FileChooserManager;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -46,5 +49,5 @@
  * Look-and-feel preferences.
  */
-public class LafPreference extends DefaultTabPreferenceSetting {
+public class LafPreference implements SubPreferenceSetting {
 
     /**
@@ -72,8 +75,4 @@
             return new LafPreference();
         }
-    }
-
-    LafPreference() {
-        super(/* ICON(preferences/) */ "display", tr("Look and Feel"), tr("Change the Look and Feel of the program"));
     }
 
@@ -218,7 +217,7 @@
         panel.add(spinZoomRatio, GBC.eol());
 
-        panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
-
-        createPreferenceTabWithScrollPane(gui, panel);
+        JScrollPane scrollpane = panel.getVerticalScrollPane();
+        scrollpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        gui.getDisplayPreference().addSubTab(this, tr("Look and Feel"), scrollpane);
     }
 
@@ -248,3 +247,8 @@
     }
 
+    @Override
+    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
+        return gui.getDisplayPreference();
+    }
+
 }