Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 4355)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 4356)
@@ -4,5 +4,4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -18,4 +17,5 @@
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -31,7 +31,5 @@
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
-import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
-import javax.swing.JScrollPane;
 import javax.swing.JSlider;
 import javax.swing.JTable;
@@ -114,56 +112,4 @@
 
     ActivateLayerAction activateLayerAction;
-
-    protected JPanel createButtonPanel() {
-        JPanel buttonPanel = getButtonPanel(5);
-
-        // -- move up action
-        MoveUpAction moveUpAction = new MoveUpAction();
-        adaptTo(moveUpAction, model);
-        adaptTo(moveUpAction,selectionModel);
-        buttonPanel.add(new SideButton(moveUpAction));
-
-        // -- move down action
-        MoveDownAction moveDownAction = new MoveDownAction();
-        adaptTo(moveDownAction, model);
-        adaptTo(moveDownAction,selectionModel);
-        buttonPanel.add(new SideButton(moveDownAction));
-
-        // -- activate action
-        activateLayerAction = new ActivateLayerAction();
-        adaptTo(activateLayerAction, selectionModel);
-        buttonPanel.add(new SideButton(activateLayerAction));
-
-        // -- show hide action
-        ShowHideLayerAction showHideLayerAction = new ShowHideLayerAction();
-        adaptTo(showHideLayerAction, selectionModel);
-        buttonPanel.add(new SideButton(showHideLayerAction));
-
-        //-- layer opacity action
-        LayerOpacityAction layerOpacityAction = new LayerOpacityAction();
-        adaptTo(layerOpacityAction, selectionModel);
-        opacityButton = new SideButton(layerOpacityAction);
-        buttonPanel.add(opacityButton);
-
-        // -- merge layer action
-        MergeAction mergeLayerAction = new MergeAction();
-        adaptTo(mergeLayerAction, model);
-        adaptTo(mergeLayerAction,selectionModel);
-        buttonPanel.add(new SideButton(mergeLayerAction));
-
-        // -- duplicate layer action
-        DuplicateAction duplicateLayerAction = new DuplicateAction();
-        adaptTo(duplicateLayerAction, model);
-        adaptTo(duplicateLayerAction, selectionModel);
-        buttonPanel.add(new SideButton(duplicateLayerAction));
-
-        //-- delete layer action
-        DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
-        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
-        adaptTo(deleteLayerAction, selectionModel);
-        buttonPanel.add(new SideButton(deleteLayerAction, false));
-
-        return buttonPanel;
-    }
 
     /** stores which layer index to toggle and executes the ShowHide action if the layer is present */
@@ -254,6 +200,4 @@
         }
 
-        add(new JScrollPane(layerList), BorderLayout.CENTER);
-
         // init the model
         //
@@ -275,5 +219,53 @@
                 );
 
-        add(createButtonPanel(), BorderLayout.SOUTH);
+        // -- move up action
+        MoveUpAction moveUpAction = new MoveUpAction();
+        adaptTo(moveUpAction, model);
+        adaptTo(moveUpAction,selectionModel);
+
+        // -- move down action
+        MoveDownAction moveDownAction = new MoveDownAction();
+        adaptTo(moveDownAction, model);
+        adaptTo(moveDownAction,selectionModel);
+
+        // -- activate action
+        activateLayerAction = new ActivateLayerAction();
+        adaptTo(activateLayerAction, selectionModel);
+
+        // -- show hide action
+        ShowHideLayerAction showHideLayerAction = new ShowHideLayerAction();
+        adaptTo(showHideLayerAction, selectionModel);
+
+        //-- layer opacity action
+        LayerOpacityAction layerOpacityAction = new LayerOpacityAction();
+        adaptTo(layerOpacityAction, selectionModel);
+        opacityButton = new SideButton(layerOpacityAction);
+
+        // -- merge layer action
+        MergeAction mergeLayerAction = new MergeAction();
+        adaptTo(mergeLayerAction, model);
+        adaptTo(mergeLayerAction,selectionModel);
+
+        // -- duplicate layer action
+        DuplicateAction duplicateLayerAction = new DuplicateAction();
+        adaptTo(duplicateLayerAction, model);
+        adaptTo(duplicateLayerAction, selectionModel);
+
+        //-- delete layer action
+        DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
+        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
+        adaptTo(deleteLayerAction, selectionModel);
+
+        createLayout(layerList, true, Arrays.asList(new SideButton[] {
+            new SideButton(moveUpAction),
+            new SideButton(moveDownAction),
+            new SideButton(activateLayerAction),
+            new SideButton(showHideLayerAction),
+            opacityButton,
+            new SideButton(mergeLayerAction),
+            new SideButton(duplicateLayerAction),
+            new SideButton(deleteLayerAction, false)
+        }));
+
         createVisibilityToggleShortcuts();
     }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 4355)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java	(revision 4356)
@@ -764,15 +764,11 @@
         JScrollPane scrollPane = new JScrollPane(bothTables);
         scrollPane.addMouseListener(dblClickWatch);
-        add(scrollPane, BorderLayout.CENTER);
 
         selectSth.setPreferredSize(scrollPane.getSize());
         presets.setSize(scrollPane.getSize());
-
-        JPanel buttonPanel = getButtonPanel(3);
 
         // -- add action and shortcut
         this.btnAdd = new SideButton(addAction);
         btnAdd.setFocusable(true);
-        buttonPanel.add(this.btnAdd);
         btnAdd.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "onEnter");
         btnAdd.getActionMap().put("onEnter", addAction);
@@ -784,5 +780,4 @@
         membershipTable.getSelectionModel().addListSelectionListener(editAction);
         this.btnEdit = new SideButton(editAction);
-        buttonPanel.add(this.btnEdit);
 
         // -- delete action
@@ -796,6 +791,8 @@
         );
         getActionMap().put("delete", deleteAction);
-        buttonPanel.add(this.btnDel);
-        add(buttonPanel, BorderLayout.SOUTH);
+
+        createLayout(scrollPane, false, Arrays.asList(new SideButton[] {
+            this.btnAdd, this.btnEdit, this.btnDel
+        }));
 
         // -- help action