Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java	(revision 12395)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java	(revision 12396)
@@ -21,4 +21,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
@@ -29,4 +30,5 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JSlider;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 
@@ -95,5 +97,5 @@
 
     private void addContentEntry(LayerVisibilityMenuEntry slider) {
-        content.add(slider.getPanel(), GBC.eop());
+        content.add(slider.getPanel(), GBC.eop().fill(GBC.HORIZONTAL));
         sliders.add(slider);
     }
@@ -181,4 +183,9 @@
         VisibilityCheckbox() {
             super(tr("Show layer"));
+
+            // Align all texts
+            Icon icon = UIManager.getIcon("CheckBox.icon");
+            int iconWidth = icon == null ? 20 : icon.getIconWidth();
+            setBorder(BorderFactory.createEmptyBorder(0, Math.max(24 + 5 - iconWidth, 0), 0, 0));
             addChangeListener(e -> setVisibleFlag(isSelected()));
         }
@@ -223,5 +230,5 @@
 
             add(new JLabel(getIcon()), GBC.std().span(1, 2).insets(0, 0, 5, 0));
-            add(new JLabel(getLabel()), GBC.eol());
+            add(new JLabel(getLabel()), GBC.eol().insets(5, 0, 5, 0));
             add(slider, GBC.eol());
             addMouseWheelListener(this::mouseWheelMoved);
@@ -539,4 +546,5 @@
         public ColorSelector() {
             super(new GridBagLayout());
+            add(new JLabel(tr("Color")), GBC.eol().insets(24 + 10, 0, 0, 0));
             for (Color color : COLORS) {
                 addPanelForColor(color);