Index: src/org/openstreetmap/josm/gui/preferences/ColorPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/ColorPreference.java	(revision 1010)
+++ src/org/openstreetmap/josm/gui/preferences/ColorPreference.java	(working copy)
@@ -7,6 +7,7 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -21,11 +22,14 @@
 import javax.swing.JColorChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
@@ -134,9 +138,15 @@
 		});
 		colors.setToolTipText(tr("Colors used by different objects in JOSM."));
 		colors.setPreferredScrollableViewportSize(new Dimension(100,112));
-		gui.display.add(new JLabel(tr("Colors")), GBC.eol());
-		gui.display.add(new JScrollPane(colors), GBC.eol().fill(GBC.BOTH));
-		gui.display.add(colorEdit, GBC.eol().anchor(GBC.EAST));
+
+		JPanel panel = new JPanel(new GridBagLayout());
+		panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+//		panel.add(new JLabel(tr("Colors")), GBC.eol());
+		JScrollPane scrollpane = new JScrollPane(colors);
+		scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
+		panel.add(scrollpane, GBC.eol().fill(GBC.BOTH));
+		panel.add(colorEdit, GBC.eol().anchor(GBC.EAST));
+		gui.displaycontent.addTab(tr("Colors"), panel);
     }
 
 	/**