Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/AmberButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/AmberButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/AmberButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="12.112134"
+     inkscape:cx="-4.239711"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffbf00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path8131"
-       sodipodi:cx="14.628272"
-       sodipodi:cy="14.576233"
-       sodipodi:rx="14.539884"
-       sodipodi:ry="14.539884"
-       d="m 29.168156,14.576233 a 14.539884,14.539884 0 1 1 -29.07976756,0 14.539884,14.539884 0 1 1 29.07976756,0 z"
-       transform="matrix(0.99734814,0,0,0.99734814,0.41052003,1022.8246)" />
+    <rect
+       style="fill:#ffbf00;fill-opacity:1;stroke:#000000;stroke-width:0.96017593000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect5912"
+       width="49.039825"
+       height="15.039824"
+       x="0.48008797"
+       y="1036.8422"
+       rx="4.9039822"
+       ry="4.699945" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="4.8613586"
-       y="1041.2253"
+       x="14.495688"
+       y="1048.5615"
        id="text8133"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan8135"
-         x="4.8613586"
-         y="1041.2253">Am</tspan></text>
+         x="14.495688"
+         y="1048.5615">Am</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlackButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlackButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlackButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-21.391126"
+     inkscape:cx="25.896642"
      inkscape:cy="15.827314"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path9522"
-       sodipodi:cx="14.584078"
-       sodipodi:cy="14.664621"
-       sodipodi:rx="14.672466"
-       sodipodi:ry="14.628272"
-       d="m 29.256544,14.664621 a 14.672466,14.628272 0 1 1 -29.34493244,0 14.672466,14.628272 0 1 1 29.34493244,0 z"
-       transform="matrix(0.98858377,0,0,0.99157043,0.58241737,1022.8211)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.93155312999999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect6844"
+       width="49.068447"
+       height="15.068447"
+       x="0.46577656"
+       y="1036.8279"
+       rx="4.8357673"
+       ry="4.4863157" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="10.69499"
-       y="1041.9324"
+       x="20.417709"
+       y="1048.7383"
        id="text9524"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan9526"
-         x="10.69499"
-         y="1041.9324">B</tspan></text>
+         x="20.417709"
+         y="1048.7383">B</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlueButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlueButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/BlueButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2895,6 +2895,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="-9.8990353"
+     inkscape:zoom="14.49"
+     inkscape:cx="25"
      inkscape:cy="16.53442"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path10913"
-       sodipodi:cx="14.584078"
-       sodipodi:cy="14.664621"
-       sodipodi:rx="14.672466"
-       sodipodi:ry="14.71666"
-       d="m 29.256544,14.664621 a 14.672466,14.71666 0 1 1 -29.34493244,0 14.672466,14.71666 0 1 1 29.34493244,0 z"
-       transform="matrix(0.98868191,0,0,0.98571295,0.5809862,1022.9071)" />
+    <rect
+       style="fill:#0000ff;fill-opacity:1;stroke:#000000;stroke-width:0.93325316999999997;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect7776"
+       width="49.06675"
+       height="15.066747"
+       x="0.46662658"
+       y="1036.8289"
+       rx="4.7773395"
+       ry="4.557775" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="6.0987964"
-       y="1041.4021"
+       x="16.036686"
+       y="1048.5793"
        id="text10915"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan10917"
-         x="6.0987964"
-         y="1041.4021">Bu</tspan></text>
+         x="16.036686"
+         y="1048.5793">Bu</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/GreenButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/GreenButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/GreenButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-21.391126"
+     inkscape:cx="29.432176"
      inkscape:cy="14.943429"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path12304"
-       sodipodi:cx="14.672466"
-       sodipodi:cy="14.75301"
-       sodipodi:rx="14.584078"
-       sodipodi:ry="14.628272"
-       d="m 29.256544,14.75301 a 14.584078,14.628272 0 1 1 -29.16815556,0 14.584078,14.628272 0 1 1 29.16815556,0 z"
-       transform="matrix(0.99447589,0,0,0.99147142,0.40858608,1022.735)" />
+    <rect
+       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:0.96934467999999996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect8708"
+       width="49.030655"
+       height="15.030655"
+       x="0.48467234"
+       y="1036.8468"
+       rx="4.9177175"
+       ry="4.7767539" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="10.16466"
-       y="1041.5789"
+       x="20.152544"
+       y="1048.6499"
        id="text12306"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan12308"
-         x="10.16466"
-         y="1041.5789">G</tspan></text>
+         x="20.152544"
+         y="1048.6499">G</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-12.091135"
+     inkscape:cx="21.054497"
      inkscape:cy="18.655741"
      inkscape:document-units="px"
@@ -2924,5 +2924,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff7f00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path13695"
-       sodipodi:cx="14.628272"
-       sodipodi:cy="14.75301"
-       sodipodi:rx="14.71666"
-       sodipodi:ry="14.71666"
-       d="m 29.344932,14.75301 a 14.71666,14.71666 0 1 1 -29.43331949,0 14.71666,14.71666 0 1 1 29.43331949,0 z"
-       transform="matrix(0.98576169,0,0,0.98576169,0.58000984,1022.8192)" />
+    <rect
+       style="fill:#ff7f00;fill-opacity:1;stroke:#000000;stroke-width:0.96498293;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect9640"
+       width="49.035019"
+       height="15.035017"
+       x="0.48249146"
+       y="1036.8447"
+       rx="4.9268904"
+       ry="4.72505" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="6.717515"
-       y="1041.5789"
+       x="16.705399"
+       y="1048.7383"
        id="text13697"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan13699"
-         x="6.717515"
-         y="1041.5789">Or</tspan></text>
+         x="16.705399"
+         y="1048.7383">Or</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RedButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RedButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/RedButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-21.391126"
+     inkscape:cx="15.29004"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path6740"
-       sodipodi:cx="14.495689"
-       sodipodi:cy="14.487844"
-       sodipodi:rx="14.495689"
-       sodipodi:ry="14.539884"
-       d="m 28.991379,14.487844 a 14.495689,14.539884 0 1 1 -28.991379,0 14.495689,14.539884 0 1 1 28.991379,0 z"
-       transform="matrix(1.0003382,0,0,0.99729764,0.49940838,1022.9136)" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:0.96017593000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4980"
+       width="49.039825"
+       height="15.039824"
+       x="0.48008797"
+       y="1036.8422"
+       rx="4.9039822"
+       ry="4.699945" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="10.606602"
-       y="1041.5789"
+       x="19.887379"
+       y="1048.6499"
        id="text6742"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan6744"
-         x="10.606602"
-         y="1041.5789">R</tspan></text>
+         x="19.887379"
+         y="1048.6499">R</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/VioletButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/VioletButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/VioletButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-21.391126"
+     inkscape:cx="25.896642"
      inkscape:cy="21.484168"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#8f00ff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path16762"
-       sodipodi:cx="14.672466"
-       sodipodi:cy="14.75301"
-       sodipodi:rx="14.760855"
-       sodipodi:ry="14.71666"
-       d="m 29.433321,14.75301 a 14.760855,14.71666 0 1 1 -29.52170944,0 14.760855,14.71666 0 1 1 29.52170944,0 z"
-       transform="matrix(0.98285863,0,0,0.98581022,0.57904001,1022.8185)" />
+    <rect
+       style="fill:#8f00ff;fill-opacity:1;stroke:#000000;stroke-width:0.97017038;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect10572"
+       width="49.029831"
+       height="15.02983"
+       x="0.48508519"
+       y="1036.8473"
+       rx="4.9263692"
+       ry="4.7764921" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="8.8388357"
-       y="1041.844"
+       x="18.826719"
+       y="1048.8267"
        id="text16764"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan16766"
-         x="8.8388357"
-         y="1041.844">Vi</tspan></text>
+         x="18.826719"
+         y="1048.8267">Vi</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/WhiteButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/WhiteButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/WhiteButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="-11.336247"
+     inkscape:cx="18.273851"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.3622)"
+     transform="translate(0,-1036.3622)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path5349"
-       sodipodi:cx="15.02602"
-       sodipodi:cy="15.194951"
-       sodipodi:rx="14.849243"
-       sodipodi:ry="15.158603"
-       d="m 29.875263,15.194951 a 14.849243,15.158603 0 1 1 -29.69848611,0 14.849243,15.158603 0 1 1 29.69848611,0 z"
-       transform="matrix(0.9775735,0,0,0.957623,0.31096102,1022.8112)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.99868327;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3276"
+       width="49.001316"
+       height="15.001317"
+       x="0.49934164"
+       y="1036.8616"
+       rx="4.9322648"
+       ry="4.7407961" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="8.485281"
-       y="1041.7556"
+       x="18.473166"
+       y="1048.7383"
        id="text5351"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan5353"
-         x="8.485281"
-         y="1041.7556">W</tspan></text>
+         x="18.473166"
+         y="1048.7383">W</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/YellowButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/YellowButton.svg	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/YellowButton.svg	(revision 24695)
@@ -11,6 +11,6 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
-   height="30"
+   width="50"
+   height="16"
    id="svg2"
    version="1.1"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="21.035283"
+     inkscape:cx="4.683438"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -2932,27 +2932,26 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1022.362)"
+     transform="translate(0,-1036.362)"
      style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path18573"
-       sodipodi:cx="14.760855"
-       sodipodi:cy="14.75301"
-       sodipodi:rx="14.672466"
-       sodipodi:ry="14.71666"
-       d="m 29.433321,14.75301 a 14.672466,14.71666 0 1 1 -29.34493256,0 14.672466,14.71666 0 1 1 29.34493256,0 z"
-       transform="matrix(0.98868191,0,0,0.98571295,0.4062101,1022.8197)" />
+    <rect
+       style="fill:#ffff00;fill-opacity:1;stroke:#000000;stroke-width:0.97099811;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect11504"
+       width="49.029003"
+       height="15.029002"
+       x="0.48549905"
+       y="1036.8475"
+       rx="4.8623772"
+       ry="4.5627236" />
     <text
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="10.783379"
-       y="1041.7554"
+       x="20.682875"
+       y="1048.6497"
        id="text18575"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan18577"
-         x="10.783379"
-         y="1041.7554">Y</tspan></text>
+         x="20.682875"
+         y="1048.6497">Y</tspan></text>
   </g>
 </svg>
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 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 24695)
@@ -152,5 +152,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(105, 0, 90, 32));
+			pillarButton.setBounds(new Rectangle(55, 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(105, 32, 90, 32));
+			sparButton.setBounds(new Rectangle(55, 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(105, 64, 90, 32));
+			floatButton.setBounds(new Rectangle(55, 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(105, 96, 90, 32));
+			beaconButton.setBounds(new Rectangle(55, 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(105, 128, 90, 32));
+			towerButton.setBounds(new Rectangle(55, 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 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java	(revision 24695)
@@ -105,5 +105,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 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(10, 82, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 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(50, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 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(50, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 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(50, 64, 35, 32));
+			canButton.setBounds(new Rectangle(0, 128, 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(50, 96, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 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(50, 128, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 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(85, 0, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 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(85, 32, 35, 32));
+			perchButton.setBounds(new Rectangle(35, 96, 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 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java	(revision 24695)
@@ -100,5 +100,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 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(10, 82, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 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(50, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 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(50, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 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(50, 64, 35, 32));
+			canButton.setBounds(new Rectangle(0, 128, 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(50, 96, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 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(50, 128, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 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(85, 0, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 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 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java	(revision 24695)
@@ -100,5 +100,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 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(10, 82, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 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(50, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 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(50, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 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(50, 64, 35, 32));
+			coneButton.setBounds(new Rectangle(0, 128, 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(50, 96, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 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(50, 128, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 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(85, 0, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 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 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java	(revision 24695)
@@ -70,5 +70,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(50, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 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(50, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 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(50, 64, 35, 32));
+			sphereButton.setBounds(new Rectangle(0, 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(50, 96, 35, 32));
+			barrelButton.setBounds(new Rectangle(0, 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(50, 128, 35, 32));
+			floatButton.setBounds(new Rectangle(0, 128, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java	(revision 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java	(revision 24695)
@@ -104,5 +104,5 @@
 
 		colourLabel = new JLabel();
-		colourLabel.setBounds(new Rectangle(30, 5, 60, 20));
+		colourLabel.setBounds(new Rectangle(2, -2, 60, 20));
 		colourLabel.setText(tr("Colour:"));
 		this.add(colourLabel, null);
@@ -154,5 +154,5 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(105, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(55, 0, 35, 32));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -164,5 +164,5 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(105, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(55, 32, 35, 32));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -174,5 +174,5 @@
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CanButton.png")));
-			canButton.setBounds(new Rectangle(105, 64, 35, 32));
+			canButton.setBounds(new Rectangle(55, 64, 35, 32));
 			canButton.setToolTipText(Messages.getString("CanTip"));
 		}
@@ -184,5 +184,5 @@
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/ConeButton.png")));
-			coneButton.setBounds(new Rectangle(105, 96, 35, 32));
+			coneButton.setBounds(new Rectangle(55, 96, 35, 32));
 			coneButton.setToolTipText(Messages.getString("ConeTip"));
 		}
@@ -194,5 +194,5 @@
 			sphereButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SphereButton.png")));
-			sphereButton.setBounds(new Rectangle(105, 128, 35, 32));
+			sphereButton.setBounds(new Rectangle(55, 128, 35, 32));
 			sphereButton.setToolTipText(Messages.getString("SphereTip"));
 		}
@@ -204,5 +204,5 @@
 			barrelButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BarrelButton.png")));
-			barrelButton.setBounds(new Rectangle(140, 0, 35, 32));
+			barrelButton.setBounds(new Rectangle(90, 0, 35, 32));
 			barrelButton.setToolTipText(Messages.getString("BarrelTip"));
 		}
@@ -214,5 +214,5 @@
 			superButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SuperButton.png")));
-			superButton.setBounds(new Rectangle(140, 32, 35, 32));
+			superButton.setBounds(new Rectangle(90, 32, 35, 32));
 			superButton.setToolTipText(Messages.getString("SuperTip"));
 		}
@@ -224,5 +224,5 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(140, 64, 35, 32));
+			floatButton.setBounds(new Rectangle(90, 64, 35, 32));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -234,5 +234,5 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(140, 96, 35, 32));
+			beaconButton.setBounds(new Rectangle(90, 96, 35, 32));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -244,5 +244,5 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(140, 128, 35, 32));
+			towerButton.setBounds(new Rectangle(90, 128, 35, 32));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
@@ -254,5 +254,5 @@
 			whiteButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/WhiteButton.png")));
-			whiteButton.setBounds(new Rectangle(0, 32, 34, 32));
+			whiteButton.setBounds(new Rectangle(0, 16, 54, 16));
 			whiteButton.setToolTipText(tr("White"));
 		}
@@ -264,5 +264,5 @@
 			redButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/RedButton.png")));
-			redButton.setBounds(new Rectangle(34, 32, 34, 32));
+			redButton.setBounds(new Rectangle(0, 32, 54, 16));
 			redButton.setToolTipText(tr("Red"));
 		}
@@ -274,5 +274,5 @@
 			orangeButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/OrangeButton.png")));
-			orangeButton.setBounds(new Rectangle(68, 32, 34, 32));
+			orangeButton.setBounds(new Rectangle(0, 48, 54, 16));
 			orangeButton.setToolTipText(tr("Orange"));
 		}
@@ -284,5 +284,5 @@
 			amberButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/AmberButton.png")));
-			amberButton.setBounds(new Rectangle(0, 64, 34, 32));
+			amberButton.setBounds(new Rectangle(0, 64, 54, 16));
 			amberButton.setToolTipText(tr("Amber"));
 		}
@@ -294,5 +294,5 @@
 			yellowButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/YellowButton.png")));
-			yellowButton.setBounds(new Rectangle(34, 64, 34, 32));
+			yellowButton.setBounds(new Rectangle(0, 80, 54, 16));
 			yellowButton.setToolTipText(tr("Yellow"));
 		}
@@ -304,5 +304,5 @@
 			greenButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/GreenButton.png")));
-			greenButton.setBounds(new Rectangle(68, 64, 34, 32));
+			greenButton.setBounds(new Rectangle(0, 96, 54, 16));
 			greenButton.setToolTipText(tr("Green"));
 		}
@@ -314,5 +314,5 @@
 			blueButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/BlueButton.png")));
-			blueButton.setBounds(new Rectangle(0, 96, 34, 32));
+			blueButton.setBounds(new Rectangle(0, 112, 54, 16));
 			blueButton.setToolTipText(tr("Blue"));
 		}
@@ -324,5 +324,5 @@
 			violetButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/VioletButton.png")));
-			violetButton.setBounds(new Rectangle(34, 96, 34, 32));
+			violetButton.setBounds(new Rectangle(0, 128, 54, 16));
 			violetButton.setToolTipText(tr("Violet"));
 		}
@@ -334,5 +334,5 @@
 			blackButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BlackButton.png")));
-			blackButton.setBounds(new Rectangle(68, 96, 34, 32));
+			blackButton.setBounds(new Rectangle(0, 144, 54, 16));
 			blackButton.setToolTipText(tr("Black"));
 		}
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 24694)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java	(revision 24695)
@@ -105,5 +105,5 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 45, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 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(10, 82, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 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(50, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 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(50, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 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(50, 64, 35, 32));
+			coneButton.setBounds(new Rectangle(0, 128, 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(50, 96, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 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(50, 128, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 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(85, 0, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 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(85, 32, 35, 32));
+			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
 			perchButton.setToolTipText(Messages.getString("PerchTip"));
 		}