Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1315)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 1316)
@@ -94,6 +94,8 @@
         ImageIcon inIcon = ImageProvider.get("dialogs", iconName);
         ImageIcon smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
-        JLabel labelSmallIcon = new JLabel(smallIcon);
-        titleBar.add(labelSmallIcon);
+        JLabel firstPart = new JLabel(name, smallIcon, JLabel.TRAILING);
+        firstPart.setIconTextGap(8);
+        titleBar.add(firstPart, GBC.std());
+        titleBar.add(Box.createHorizontalGlue(),GBC.std().fill(GBC.HORIZONTAL));
 
         final ActionListener hideActionListener = new ActionListener(){
@@ -144,13 +146,4 @@
         };
         titleBar.addMouseListener(titleMouseListener);
-
-        // add some padding space (there must be a better way to do this!)
-        JLabel padding = new JLabel(" ");
-        titleBar.add(padding);
-
-        // show the title label
-        label.setText(name);
-        titleBar.add(label, GBC.std());
-        titleBar.add(Box.createHorizontalGlue(),GBC.std().fill(GBC.HORIZONTAL));
 
         // show the sticky button