Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1786)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1787)
@@ -20,5 +20,4 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -46,4 +45,5 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -101,8 +101,8 @@
         add(new JScrollPane(lstConflicts), BorderLayout.CENTER);
 
-        JButton btnResolve = new JButton(actResolve = new ResolveAction());
+        SideButton btnResolve = new SideButton(actResolve = new ResolveAction());
         lstConflicts.getSelectionModel().addListSelectionListener(actResolve);
 
-        JButton btnSelect = new JButton(actSelect = new SelectAction());
+        SideButton btnSelect = new SideButton(actSelect = new SelectAction());
         lstConflicts.getSelectionModel().addListSelectionListener(actSelect);
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java	(revision 1786)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java	(revision 1787)
@@ -21,5 +21,4 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -46,4 +45,5 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialog;
 import org.openstreetmap.josm.io.OsmApi;
@@ -125,9 +125,9 @@
         JPanel buttons = new JPanel(new GridLayout(1,2));
 
-        JButton btn = new JButton(reloadAction = new ReloadAction());
+        SideButton btn = new SideButton(reloadAction = new ReloadAction());
         btn.setName("btn.reload");
         buttons.add(btn);
 
-        btn = new JButton(showHistoryAction = new ShowHistoryAction());
+        btn = new SideButton(showHistoryAction = new ShowHistoryAction());
         btn.setName("btn.showhistory");
         buttons.add(btn);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 1786)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 1787)
@@ -15,5 +15,4 @@
 import javax.swing.AbstractAction;
 import javax.swing.DefaultListModel;
-import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JPanel;
@@ -86,5 +85,5 @@
         // create the panel with buttons
         //
-        JPanel buttonPanel = new JPanel(new GridLayout(1,4));
+        JPanel buttonPanel = new JPanel(new GridLayout(1,3));
         buttonPanel.add(new SideButton(marktr("New"), "addrelation", "Selection", tr("Create a new relation"), new ActionListener() {
             public void actionPerformed(ActionEvent e) {
@@ -105,5 +104,5 @@
             }
         });
-        buttonPanel.add(new JButton(editAction), GBC.std());
+        buttonPanel.add(new SideButton(editAction), GBC.std());
 
         // the delete action
@@ -111,5 +110,5 @@
         deleteAction = new DeleteAction();
         displaylist.addListSelectionListener(deleteAction);
-        buttonPanel.add(new JButton(deleteAction), GBC.eol());
+        buttonPanel.add(new SideButton(deleteAction), GBC.eol());
         add(buttonPanel, BorderLayout.SOUTH);