Index: /trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 7482)
+++ /trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 7483)
@@ -26,4 +26,5 @@
 import javax.swing.AbstractButton;
 import javax.swing.Action;
+import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
@@ -403,5 +404,5 @@
      * locations.
      *
-     * @param panel The container to fill. Must have an BorderLayout.
+     * @param panel The container to fill. Must have a BorderLayout.
      */
     public void fillPanel(Container panel) {
@@ -411,6 +412,7 @@
          * sideToolBar: add map modes icons
          */
-        if(Main.pref.getBoolean("sidetoolbar.mapmodes.visible", true)) {
-        toolBarActions.setAlignmentX(0.5f);
+        if (Main.pref.getBoolean("sidetoolbar.mapmodes.visible", true)) {
+            toolBarActions.setAlignmentX(0.5f);
+            toolBarActions.setBorder(null);
             toolBarActions.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarActions);
@@ -425,7 +427,8 @@
          * sideToolBar: add toggle dialogs icons
          */
-        if(Main.pref.getBoolean("sidetoolbar.toggledialogs.visible", true)) {
+        if (Main.pref.getBoolean("sidetoolbar.toggledialogs.visible", true)) {
             ((JToolBar)sideToolBar).addSeparator(new Dimension(0,18));
             toolBarToggle.setAlignmentX(0.5f);
+            toolBarToggle.setBorder(null);
             toolBarToggle.setInheritsPopupMenu(true);
             sideToolBar.add(toolBarToggle);
@@ -490,4 +493,5 @@
         });
         ((JToolBar)sideToolBar).setFloatable(false);
+        sideToolBar.setBorder(BorderFactory.createEmptyBorder(0,1,0,1));
 
         /**
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 7482)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 7483)
@@ -51,7 +51,7 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -299,6 +299,5 @@
                                 // produces several events as well, which would make this
                                 // variable true. Of course we only want the popup to show
-                                // if the middle mouse button has been pressed in the first
-                                // place
+                                // if the middle mouse button has been pressed in the first place
                                 boolean mouseNotMoved = oldMousePos != null
                                         && oldMousePos.equals(ms.mousePos);
@@ -722,7 +721,7 @@
 
         private final JMenuItem jumpButton = add(Main.main.menu.jumpToAct);
-        
+
         private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<>();
-        
+
         private final JSeparator separator = new JSeparator();
 
@@ -782,5 +781,5 @@
         this.mv = mapFrame.mapView;
         this.collector = new Collector(mapFrame);
-        
+
         // Context menu of status bar
         setComponentPopupMenu(new MapStatusPopupMenu());
@@ -817,5 +816,5 @@
 
         setLayout(new GridBagLayout());
-        setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        setBorder(BorderFactory.createEmptyBorder(1,2,1,2));
 
         latText.setInheritsPopupMenu(true);
@@ -834,5 +833,5 @@
             distText.addMouseListener(new MouseAdapter() {
                 private final List<String> soms = new ArrayList<>(new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet()));
-    
+
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -882,5 +881,5 @@
         thread.start();
     }
-    
+
     /**
      * Updates the system of measurement and displays a notification.