Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 24691)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 24692)
@@ -152,5 +152,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(55, 0, 90, 32));
+			pillarButton.setBounds(new Rectangle(105, 0, 90, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -162,5 +162,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(55, 32, 90, 32));
+			sparButton.setBounds(new Rectangle(105, 32, 90, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -172,5 +172,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(55, 64, 90, 32));
+			floatButton.setBounds(new Rectangle(105, 64, 90, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -182,5 +182,5 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(55, 96, 90, 32));
+			beaconButton.setBounds(new Rectangle(105, 96, 90, 32));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -192,5 +192,5 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(55, 128, 90, 32));
+			towerButton.setBounds(new Rectangle(105, 128, 90, 32));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java	(revision 24691)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java	(revision 24692)
@@ -105,5 +105,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -115,5 +115,5 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+			regionBButton.setBounds(new Rectangle(10, 82, 35, 30));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -125,5 +125,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(50, 0, 35, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -135,5 +135,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(50, 32, 35, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -145,5 +145,5 @@
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CanButton.png")));
-			canButton.setBounds(new Rectangle(0, 128, 35, 32));
+			canButton.setBounds(new Rectangle(50, 64, 35, 32));
 			canButton.setToolTipText(Messages.getString("CanTip"));
 		}
@@ -155,5 +155,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(50, 96, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -165,5 +165,5 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(50, 128, 35, 32));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -175,5 +175,5 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(85, 0, 35, 32));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
@@ -185,5 +185,5 @@
 			perchButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PerchPButton.png")));
-			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
+			perchButton.setBounds(new Rectangle(85, 32, 35, 32));
 			perchButton.setToolTipText(Messages.getString("PerchTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java	(revision 24691)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java	(revision 24692)
@@ -100,5 +100,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -110,5 +110,5 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+			regionBButton.setBounds(new Rectangle(10, 82, 35, 30));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -120,5 +120,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(50, 0, 35, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -130,5 +130,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(50, 32, 35, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -140,5 +140,5 @@
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CanButton.png")));
-			canButton.setBounds(new Rectangle(0, 128, 35, 32));
+			canButton.setBounds(new Rectangle(50, 64, 35, 32));
 			canButton.setToolTipText(Messages.getString("CanTip"));
 		}
@@ -150,5 +150,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(50, 96, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -160,5 +160,5 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(50, 128, 35, 32));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -170,5 +170,5 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(85, 0, 35, 32));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java	(revision 24691)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java	(revision 24692)
@@ -100,5 +100,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -110,5 +110,5 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+			regionBButton.setBounds(new Rectangle(10, 82, 35, 30));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -120,5 +120,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(50, 0, 35, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -130,5 +130,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(50, 32, 35, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -140,5 +140,5 @@
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/ConeButton.png")));
-			coneButton.setBounds(new Rectangle(0, 128, 35, 32));
+			coneButton.setBounds(new Rectangle(50, 64, 35, 32));
 			coneButton.setToolTipText(Messages.getString("ConeTip"));
 		}
@@ -150,5 +150,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(50, 96, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -160,5 +160,5 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(50, 128, 35, 32));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -170,5 +170,5 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(85, 0, 35, 32));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java	(revision 24691)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java	(revision 24692)
@@ -70,5 +70,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(50, 0, 35, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -80,5 +80,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(50, 32, 35, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -90,5 +90,5 @@
 			sphereButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SphereButton.png")));
-			sphereButton.setBounds(new Rectangle(0, 64, 35, 32));
+			sphereButton.setBounds(new Rectangle(50, 64, 35, 32));
 			sphereButton.setToolTipText(Messages.getString("SphereTip"));
 		}
@@ -100,5 +100,5 @@
 			barrelButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BarrelButton.png")));
-			barrelButton.setBounds(new Rectangle(0, 96, 35, 32));
+			barrelButton.setBounds(new Rectangle(50, 96, 35, 32));
 			barrelButton.setToolTipText(Messages.getString("BarrelTip"));
 		}
@@ -110,5 +110,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(0, 128, 35, 32));
+			floatButton.setBounds(new Rectangle(50, 128, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java	(revision 24691)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java	(revision 24692)
@@ -105,5 +105,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
+			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -115,5 +115,5 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
+			regionBButton.setBounds(new Rectangle(10, 82, 35, 30));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -125,5 +125,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(50, 0, 35, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -135,5 +135,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(50, 32, 35, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -145,5 +145,5 @@
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/ConeButton.png")));
-			coneButton.setBounds(new Rectangle(0, 128, 35, 32));
+			coneButton.setBounds(new Rectangle(50, 64, 35, 32));
 			coneButton.setToolTipText(Messages.getString("ConeTip"));
 		}
@@ -155,5 +155,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(50, 96, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -165,5 +165,5 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(50, 128, 35, 32));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -175,5 +175,5 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(85, 0, 35, 32));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
@@ -185,5 +185,5 @@
 			perchButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PerchSButton.png")));
-			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
+			perchButton.setBounds(new Rectangle(85, 32, 35, 32));
 			perchButton.setToolTipText(Messages.getString("PerchTip"));
 		}