Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/BarrelButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/BarrelButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/BarrelButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="SphereButton.svg"
+   sodipodi:docname="BarrelButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SphereButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2648,5 +2649,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2676,5 +2677,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2687,12 +2688,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-16.356063,1011.3146)"
+       transform="matrix(0.2,0,0,0.2,-14.853461,1011.2262)"
        style="display:inline"
        inkscape:label="Barrel Buoy"
@@ -2708,45 +2709,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Barrel Buoy</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="52.94833"
-         y="1039.3102">Fasstonne</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/BeaconButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/BeaconButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/BeaconButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SuperButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -4034,5 +4035,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4073,12 +4074,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-16.983919,1018.3964)"
+       transform="matrix(0.2,0,0,0.2,-14.950987,1018.4848)"
        style="display:inline"
        inkscape:label="Beacon"
@@ -4090,45 +4091,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Beacon</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Spiere</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/CanButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/CanButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/CanButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="SparButton.svg"
+   sodipodi:docname="CanButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SparButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2165,5 +2166,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2193,5 +2194,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2204,12 +2205,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-17.25724,1012.0626)"
+       transform="matrix(0.2,0,0,0.2,-14.870755,1011.8858)"
        style="display:inline"
        inkscape:label="Can Buoy"
@@ -2222,45 +2223,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Can Buoy</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="52.94833"
-         y="1039.3102">Stumpftonne</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardEButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="60"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardWButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.59953219,0,0,0.80259616,0.02186308,207.76946)" />
     <linearGradient
        inkscape:collect="always"
@@ -225,9 +226,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.879394"
-     inkscape:cx="39.344297"
+     inkscape:zoom="23.758788"
+     inkscape:cx="29.158592"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2900"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -265,13 +266,13 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5345"
+       x="0.1723098"
+       height="31.65538"
+       width="59.65538"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3446196;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="M 32.483929,1036.8818 17.5,1036.8398 l 7.449875,10.5224 7.534054,-10.4803 z"
+       d="m 37.576781,1036.9239 -14.983929,-0.042 7.449875,10.5224 7.534054,-10.4803 z"
        id="path2871"
        sodipodi:nodetypes="cccc" />
@@ -279,76 +280,6 @@
        sodipodi:nodetypes="cccc"
        id="path3645"
-       d="m 17.5,1035.8716 14.983929,0 -7.491965,-10.5224 L 17.5,1035.8716 z"
+       d="m 22.592852,1035.9137 14.983929,0 -7.491965,-10.5224 -7.491964,10.5224 z"
        style="fill:#000000;fill-opacity:1;stroke:none" />
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1033.3982"
-       x="69.834709"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3982"
-         x="69.834709"
-         id="tspan2910"
-         sodipodi:role="line">East</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.71566"
-       y="1045.303"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.71566"
-         y="1045.303">Cardinal</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037933"
-       y="1045.1742"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037933"
-         y="1045.1742">Deutsch</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2867"
-       y="1032.9124"
-       x="69.799843"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1032.9124"
-         x="69.799843"
-         id="tspan2869"
-         sodipodi:role="line">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardNButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -17,7 +17,8 @@
    inkscape:version="0.47 r22583"
    sodipodi:docname="CardNButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardNButton_de.png"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardNButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -225,9 +226,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="32.933424"
+     inkscape:zoom="16.8"
+     inkscape:cx="18.528662"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -265,13 +266,13 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 17.54209,1036.3768 14.983929,0 -7.491965,-11.0275 -7.491964,11.0275 z"
+       d="m 17.54209,1036.4363 14.983929,0 -7.491965,-11.0275 -7.491964,11.0275 z"
        id="path2871"
        sodipodi:nodetypes="cccc" />
@@ -279,76 +280,6 @@
        sodipodi:nodetypes="cccc"
        id="path3645"
-       d="m 17.5,1047.3622 14.983929,0 -7.491965,-11.0275 L 17.5,1047.3622 z"
+       d="m 17.5,1047.4217 14.983929,0 -7.491965,-11.0275 L 17.5,1047.4217 z"
        style="fill:#000000;fill-opacity:1;stroke:none" />
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1033.3982"
-       x="69.834709"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3982"
-         x="69.834709"
-         id="tspan2910"
-         sodipodi:role="line">North</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.71566"
-       y="1045.303"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.71566"
-         y="1045.303">Cardinal</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037933"
-       y="1045.1742"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037933"
-         y="1045.1742">Deutsch</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2867"
-       y="1032.9124"
-       x="69.799843"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1032.9124"
-         x="69.799843"
-         id="tspan2869"
-         sodipodi:role="line">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardSButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardNButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -225,6 +226,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="32.814376"
+     inkscape:zoom="16.8"
+     inkscape:cx="18.409614"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -265,13 +266,13 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 32.483929,1036.3347 -14.983929,0 7.491965,11.0275 7.491964,-11.0275 z"
+       d="m 32.543453,1036.3347 -14.983929,0 7.491965,11.0275 7.491964,-11.0275 z"
        id="path2871"
        sodipodi:nodetypes="cccc" />
@@ -279,76 +280,6 @@
        sodipodi:nodetypes="cccc"
        id="path3645"
-       d="m 32.526019,1025.3493 -14.983929,0 7.491965,11.0275 7.491964,-11.0275 z"
+       d="m 32.585543,1025.3493 -14.983929,0 7.491965,11.0275 7.491964,-11.0275 z"
        style="fill:#000000;fill-opacity:1;stroke:none" />
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1033.3982"
-       x="69.834709"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3982"
-         x="69.834709"
-         id="tspan2910"
-         sodipodi:role="line">South</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.71566"
-       y="1045.303"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.71566"
-         y="1045.303">Cardinal</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037933"
-       y="1045.1742"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037933"
-         y="1045.1742">Deutsch</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2867"
-       y="1032.9124"
-       x="69.799843"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1032.9124"
-         x="69.799843"
-         id="tspan2869"
-         sodipodi:role="line">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/CardWButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -17,7 +17,8 @@
    inkscape:version="0.47 r22583"
    sodipodi:docname="CardWButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardSButton.png"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardWButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -226,8 +227,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="37.033433"
+     inkscape:cx="26.847728"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2900"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -254,5 +255,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
@@ -265,13 +266,13 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 17.5,1047.3622 14.983928,0 -7.491965,-11.0275 L 17.5,1047.3622 z"
+       d="m 17.415821,1047.3622 14.983928,0 -7.491965,-11.0275 -7.491963,11.0275 z"
        id="path2871"
        sodipodi:nodetypes="cccc" />
@@ -279,76 +280,6 @@
        sodipodi:nodetypes="cccc"
        id="path3645"
-       d="m 32.526018,1025.3493 -14.983928,0 7.491964,11.0275 7.491964,-11.0275 z"
+       d="m 32.441839,1025.3493 -14.983928,0 7.491964,11.0275 7.491964,-11.0275 z"
        style="fill:#000000;fill-opacity:1;stroke:none" />
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1033.3982"
-       x="69.834709"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3982"
-         x="69.834709"
-         id="tspan2910"
-         sodipodi:role="line">West</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.71566"
-       y="1045.303"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.71566"
-         y="1045.303">Cardinal</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037933"
-       y="1045.1742"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037933"
-         y="1045.1742">Deutsch</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2867"
-       y="1032.9124"
-       x="69.799843"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1032.9124"
-         x="69.799843"
-         id="tspan2869"
-         sodipodi:role="line">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="60"
    height="40"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -73,5 +74,6 @@
        x2="50.002548"
        y2="1052.3596"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59912248,0,0,1.004396,0.04234889,-4.5667837)" />
     <linearGradient
        inkscape:collect="always"
@@ -91,7 +93,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="38.780951"
-     inkscape:cy="9.8235431"
+     inkscape:zoom="16.8"
+     inkscape:cx="24.376189"
+     inkscape:cy="24.109257"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -120,5 +122,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -131,10 +133,10 @@
      style="display:inline">
     <rect
-       y="1012.67"
-       x="0.2509402"
-       height="39.441231"
-       width="99.50322"
+       y="1012.5549"
+       x="0.1926928"
+       height="39.614613"
+       width="59.614613"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.49680412;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3853856;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <rect
        style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.78358072;stroke-opacity:1"
@@ -142,6 +144,6 @@
        width="15.230652"
        height="20.156683"
-       x="2.435905"
-       y="1029.7506"
+       x="4.4597144"
+       y="1027.8458"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
        inkscape:export-xdpi="90"
@@ -149,5 +151,5 @@
     <path
        style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.83645499px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 27.395597,1049.9172 20.258116,0 -10.165811,-19.7086 -10.092305,19.7086 z"
+       d="m 34.95512,1047.953 20.258116,0 -10.165811,-19.7086 -10.092305,19.7086 z"
        id="path2820"
        sodipodi:nodetypes="cccc"
@@ -164,50 +166,8 @@
        sodipodi:ry="9.6428576"
        d="m 36.190476,11.369047 a 10.684524,9.6428576 0 1 1 -21.369047,0 10.684524,9.6428576 0 1 1 21.369047,0 z"
-       transform="matrix(0.7128465,0,0,0.78804359,6.7216642,1013.3063)"
+       transform="matrix(0.7128465,0,0,0.78804359,11.900236,1015.3897)"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
   </g>
-  <g
-     transform="translate(0,-1012.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1036.0173"
-       x="75.191849"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1036.0173"
-         x="75.191849"
-         id="tspan2910"
-         sodipodi:role="line">Channel</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1012.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="75.037933"
-       y="1036.1263"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="75.037933"
-         y="1036.1263">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/ConeButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/ConeButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/ConeButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="CanButton.svg"
+   sodipodi:docname="ConeButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CanButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2326,5 +2327,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2354,5 +2355,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2365,15 +2366,15 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
        id="g3653"
        inkscape:label="Cone Buoy"
        style="display:inline"
-       transform="matrix(0.2,0,0,0.2,-17.037603,1011.5686)">
+       transform="matrix(0.2,0,0,0.2,-14.916282,1011.7454)">
       <g
          id="g3678">
@@ -2412,45 +2413,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Cone Buoy</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="52.94833"
-         y="1039.3102">Spitztonne</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/FloatButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/FloatButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/FloatButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/BarrelButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2977,8 +2978,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="20.705008"
+     inkscape:cx="10.010017"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -3016,12 +3017,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-17.106496,1015.499)"
+       transform="matrix(0.2,0,0,0.2,-14.985176,1015.5874)"
        style="display:inline"
        inkscape:label="Minor Float"
@@ -3044,45 +3045,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Float</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Floß</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="60"
    height="40"
    id="svg2"
@@ -54,5 +54,6 @@
        x2="50.000004"
        y2="1052.3623"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59911932,0,0,1.0028484,0.04403199,-2.9405696)" />
   </defs>
   <sodipodi:namedview
@@ -63,7 +64,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="35.592347"
-     inkscape:cy="26.914183"
+     inkscape:zoom="16.8"
+     inkscape:cx="21.187585"
+     inkscape:cy="17.390374"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -103,13 +104,13 @@
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient5451);fill-opacity:1;stroke:#000000;stroke-width:0.50033444000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient5451);fill-opacity:1;stroke:#000000;stroke-width:0.38782403;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect4923"
-       width="99.499672"
-       height="39.499664"
-       x="0.25016722"
-       y="1012.6124" />
+       width="59.612175"
+       height="39.612175"
+       x="0.19391201"
+       y="1012.5562" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89626366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3.8469414,1037.9498 6.6655346,-9.7763 6.652487,9.7464 -13.3180216,0.03 0,-10e-5 z"
+       d="m 5.8707509,1035.926 6.6655351,-9.7763 6.652487,9.7464 -13.3180221,0.03 0,-10e-5 z"
        id="path3623"
        sodipodi:nodetypes="ccccc" />
@@ -117,14 +118,14 @@
        sodipodi:nodetypes="ccccc"
        id="path3687"
-       d="m 3.8469414,1048.9617 6.6655346,-9.7763 6.652487,9.7464 -13.3180216,0.03 0,-10e-5 z"
+       d="m 5.8707509,1046.9379 6.6655351,-9.7763 6.652487,9.7464 -13.3180221,0.03 0,-1e-4 z"
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89626366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        sodipodi:nodetypes="ccccc"
        id="path3689"
-       d="m 46.212583,1038.8283 -6.665535,9.7763 -6.652487,-9.7464 13.318022,-0.03 0,10e-5 z"
+       d="m 54.12925,1036.864 -6.665535,9.7763 -6.652487,-9.7464 13.318022,-0.03 0,10e-5 z"
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89626366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89626366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 46.212583,1027.8164 -6.665535,9.7763 -6.652487,-9.7464 13.318022,-0.03 0,10e-5 z"
+       d="m 54.12925,1025.8521 -6.665535,9.7763 -6.652487,-9.7464 13.318022,-0.03 0,10e-5 z"
        id="path3691"
        sodipodi:nodetypes="ccccc" />
@@ -137,9 +138,9 @@
        sodipodi:rx="4.6130953"
        sodipodi:ry="4.5833335"
-       d="m 30.238095,18.154762 c 0,2.531305 -2.065353,4.583334 -4.613095,4.583334 -2.547742,0 -4.613095,-2.052029 -4.613095,-4.583334 0,-2.531305 2.065353,-4.583333 4.613095,-4.583333 2.547742,0 4.613095,2.052028 4.613095,4.583333 z"
-       transform="matrix(0.97349799,0,0,0.97981954,0.06898993,1004.5888)" />
+       d="m 30.238095,18.154762 a 4.6130953,4.5833335 0 1 1 -9.22619,0 4.6130953,4.5833335 0 1 1 9.22619,0 z"
+       transform="matrix(0.97349799,0,0,0.97981954,5.0094661,1004.6483)" />
     <path
-       transform="matrix(0.97349799,0,0,0.97981954,0.03922803,1014.4995)"
-       d="m 30.238095,18.154762 c 0,2.531305 -2.065353,4.583334 -4.613095,4.583334 -2.547742,0 -4.613095,-2.052029 -4.613095,-4.583334 0,-2.531305 2.065353,-4.583333 4.613095,-4.583333 2.547742,0 4.613095,2.052028 4.613095,4.583333 z"
+       transform="matrix(0.97349799,0,0,0.97981954,4.9797042,1014.559)"
+       d="m 30.238095,18.154762 a 4.6130953,4.5833335 0 1 1 -9.22619,0 4.6130953,4.5833335 0 1 1 9.22619,0 z"
        sodipodi:ry="4.5833335"
        sodipodi:rx="4.6130953"
@@ -150,45 +151,3 @@
        sodipodi:type="arc" />
   </g>
-  <g
-     transform="translate(0,-1012.3622)"
-     id="g3612"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text3614"
-       y="1034.9376"
-       x="74.596611"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d40000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1034.9376"
-         x="74.596611"
-         id="tspan3616"
-         sodipodi:role="line">Danger</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g3636"
-     transform="translate(0,-1012.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d40000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="74.953758"
-       y="1035.9681"
-       id="text3638"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan3640"
-         x="74.953758"
-         y="1035.9681">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsolButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardEButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933406,0,0,0.8033559,0.03202456,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -226,5 +227,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="8.4000001"
-     inkscape:cx="35.12524"
+     inkscape:cx="20.720478"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
@@ -265,10 +266,10 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <path
        sodipodi:type="arc"
@@ -292,73 +293,3 @@
        sodipodi:type="arc" />
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1033.3982"
-       x="69.834709"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3982"
-         x="69.834709"
-         id="tspan2910"
-         sodipodi:role="line">Isolated</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.71566"
-       y="1045.303"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.71566"
-         y="1045.303">Danger</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037933"
-       y="1045.1742"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037933"
-         y="1045.1742">Deutsch</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2867"
-       y="1032.9124"
-       x="69.799843"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1032.9124"
-         x="69.799843"
-         id="tspan2869"
-         sodipodi:role="line">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightFloatButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightFloatButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightFloatButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="LightVesselButton.svg"
+   sodipodi:docname="LightFloatButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightVesselButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,0.13953148,210.3836)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515287,0.04684594,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2501,8 +2502,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="44.563418"
+     inkscape:cx="24.192008"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -2529,5 +2530,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2540,12 +2541,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.3906036"
-       height="31.55551"
-       width="99.555534"
+       y="1020.484"
+       x="0.12188905"
+       height="31.75622"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-5.0099188,1015.6757)"
+       transform="matrix(0.2,0,0,0.2,-14.943084,1015.5914)"
        style="display:inline"
        inkscape:label="Minor Float"
@@ -2568,45 +2569,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.88401"
-       y="1038.6528"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.88401"
-         y="1038.6528">Light Float</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.701218"
-       y="1039.4501"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.701218"
-         y="1039.4501">Leuchtfloß</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMajorButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMajorButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMajorButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="LighthouseButton.svg"
+   sodipodi:docname="LightMajorButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,0.13953148,210.3836)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
     <linearGradient
        inkscape:collect="always"
@@ -1304,8 +1305,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="44.563418"
+     inkscape:cx="24.192008"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -1332,5 +1333,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1343,12 +1344,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.3906036"
-       height="31.55551"
-       width="99.555534"
+       y="1020.4841"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-4.9486859,1005.0587)"
+       transform="matrix(0.2,0,0,0.2,-14.966032,1005.0587)"
        style="display:inline"
        inkscape:label="Light Major"
@@ -1382,59 +1383,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.88401"
-       y="1038.6528"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.88401"
-         y="1038.6528">Major Light</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.701218"
-       y="1045.0901"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.701218"
-         y="1045.0901">Feuer</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text3974"
-       y="1033.3051"
-       x="69.869568"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3051"
-         x="69.869568"
-         id="tspan3976"
-         sodipodi:role="line">Primäres</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMinorButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMinorButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightMinorButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="LightMajorButton.svg"
+   sodipodi:docname="LightMinorButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightMajorButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,0.13953148,210.3836)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
     <linearGradient
        inkscape:collect="always"
@@ -1843,8 +1844,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="44.563418"
+     inkscape:cx="24.192008"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -1871,5 +1872,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1882,12 +1883,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.3906036"
-       height="31.55551"
-       width="99.555534"
+       y="1020.4841"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-4.8719648,1004.8698)"
+       transform="matrix(0.2,0,0,0.2,-14.97349,1004.8698)"
        style="display:inline"
        inkscape:label="Light Minor"
@@ -1923,59 +1924,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.88401"
-       y="1038.6528"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.88401"
-         y="1038.6528">Minor Light</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.701218"
-       y="1045.0901"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.701218"
-         y="1045.0901">Feuer</tspan></text>
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text3974"
-       y="1033.3051"
-       x="69.869568"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1033.3051"
-         x="69.869568"
-         id="tspan3976"
-         sodipodi:role="line">Sekundäres</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightVesselButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightVesselButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightVesselButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="LightMinorButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightMinorButton.png"
+   sodipodi:docname="LightVesselButton.svg"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightVesselButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,0.13953148,210.3836)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
     <linearGradient
        inkscape:collect="always"
@@ -2172,8 +2173,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="44.563418"
+     inkscape:cx="24.192008"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -2200,5 +2201,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2211,12 +2212,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.3906036"
-       height="31.55551"
-       width="99.555534"
+       y="1020.4841"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-5.0030715,1015.5953)"
+       transform="matrix(0.2,0,0,0.2,-15.020417,1015.5111)"
        style="display:inline"
        inkscape:label="Major Float"
@@ -2229,45 +2230,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.88401"
-       y="1038.6528"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.88401"
-         y="1038.6528">Light Vessel</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.701218"
-       y="1039.4501"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.701218"
-         y="1039.4501">Feuerschiff</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LighthouseButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="CardEButton.svg"
+   sodipodi:docname="LighthouseButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/CardWButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515291,0.04684594,205.12989)" />
     <linearGradient
        inkscape:collect="always"
@@ -765,8 +766,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="44.563418"
+     inkscape:cx="24.192008"
      inkscape:cy="14.585448"
      inkscape:document-units="px"
-     inkscape:current-layer="g2900"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -793,5 +794,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -804,12 +805,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.4841"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377811;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-5.038073,1005.5159)"
+       transform="matrix(0.2,0,0,0.2,-15.055419,1005.1792)"
        style="display:inline"
        inkscape:label="Lighthouse"
@@ -842,45 +843,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.88401"
-       y="1038.6528"
-       id="text2863"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2865"
-         x="69.88401"
-         y="1038.6528">Lighthouse</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.953751"
-       y="1039.2817"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.953751"
-         y="1039.2817">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="60"
    height="40"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/Lights.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -1131,5 +1132,6 @@
        x2="50.000011"
        y2="1052.3622"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59911867,0,0,1.0028502,0.04406036,-2.9424675)" />
   </defs>
   <sodipodi:namedview
@@ -1141,5 +1143,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="42.605798"
+     inkscape:cx="32.420093"
      inkscape:cy="14.533528"
      inkscape:document-units="px"
@@ -1169,5 +1171,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1180,15 +1182,15 @@
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient4900);fill-opacity:1;stroke:#000000;stroke-width:0.50065404000000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:url(#linearGradient4900);fill-opacity:1;stroke:#000000;stroke-width:0.38807189;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect4370"
-       width="99.499367"
-       height="39.499348"
-       x="0.25032702"
-       y="1012.6125"
+       width="59.611927"
+       height="39.611931"
+       x="0.19403595"
+       y="1012.5562"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightsButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <g
-       transform="matrix(0.24,0,0,0.24,-10.987692,996.88709)"
+       transform="matrix(0.24,0,0,0.24,-5.9369293,995.96112)"
        style="display:inline"
        inkscape:label="Lighthouse"
@@ -1221,5 +1223,5 @@
     </g>
     <g
-       transform="matrix(0.2127411,0,0,0.2127411,-6.8819505,1009.8674)"
+       transform="matrix(0.2127411,0,0,0.2127411,-1.8311878,1008.9414)"
        style="display:inline"
        inkscape:label="Light"
@@ -1243,6 +1245,6 @@
        sodipodi:rx="20.863094"
        sodipodi:ry="18.571428"
-       d="m 5.1814965,31.127108 c 0.7396451,-4.958864 3.69536,-9.442424 8.1979955,-12.43564"
-       transform="matrix(1.0723689,0,0,1.2014911,-2.6752478,994.94309)"
+       d="M 5.1814965,31.127108 A 20.863094,18.571428 0 0 1 13.379492,18.691468"
+       transform="matrix(1.0723689,0,0,1.2014911,2.3755149,994.01712)"
        sodipodi:start="3.273593"
        sodipodi:end="4.0709386"
@@ -1252,6 +1254,6 @@
        sodipodi:end="6.1495533"
        sodipodi:start="5.3457358"
-       transform="matrix(1.0723689,0,0,1.2014911,-2.6752478,995.00261)"
-       d="m 38.210829,18.601908 c 4.567507,2.985326 7.574378,7.496041 8.329355,12.495165"
+       transform="matrix(1.0723689,0,0,1.2014911,2.3755149,994.07664)"
+       d="m 38.210829,18.601908 a 20.863094,18.571428 0 0 1 8.329355,12.495165"
        sodipodi:ry="18.571428"
        sodipodi:rx="20.863094"
@@ -1263,54 +1265,10 @@
     <path
        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 0.5;stroke-dashoffset:0"
-       d="M 3.8095238,30.089286 25,33.035714 12.232143,15.803571"
-       id="path6137"
-       transform="translate(0,1002.3622)" />
+       d="m 8.8602865,1031.5255 21.1904765,2.9465 -12.767857,-17.2322"
+       id="path6137" />
     <path
        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 0.5;stroke-dashoffset:0"
-       d="M 37.738095,15.77381 25.029762,33.035714 46.25,30.14881"
-       id="path6139"
-       transform="translate(0,1002.3622)" />
-  </g>
-  <g
-     transform="translate(0,-1012.3622)"
-     id="g3309"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text3311"
-       y="1034.9227"
-       x="74.696091"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d400d4;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1034.9227"
-         x="74.696091"
-         id="tspan3313"
-         sodipodi:role="line">Lights</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g3341"
-     transform="translate(0,-1012.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#d400d4;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="74.948616"
-       y="1036.1016"
-       id="text3343"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan3345"
-         x="74.948616"
-         y="1036.1016">Deutsch</tspan></text>
+       d="m 42.788858,1017.2101 -12.708333,17.2619 21.220238,-2.8869"
+       id="path6139" />
   </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchPButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchPButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchPButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="BeaconButton.svg"
+   sodipodi:docname="PerchPButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/BeaconButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -4195,5 +4196,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="40.415611"
+     inkscape:cx="29.72062"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4223,5 +4224,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4234,12 +4235,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-17.096776,1015.4008)"
+       transform="matrix(0.2,0,0,0.2,-14.975456,1015.4008)"
        style="display:inline"
        inkscape:label="Perch Port"
@@ -4251,45 +4252,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Perch</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Pricke</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchSButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchSButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/PerchSButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="PerchPButton.svg"
+   sodipodi:docname="PerchSButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PerchPButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -4356,5 +4357,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="40.415611"
+     inkscape:cx="29.72062"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4384,5 +4385,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4395,12 +4396,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-16.916475,1015.4439)"
+       transform="matrix(0.2,0,0,0.2,-14.971931,1015.4439)"
        style="display:inline"
        inkscape:label="Perch Starboard"
@@ -4413,45 +4414,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Perch</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Pricke</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/PillarButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/PillarButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/PillarButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -1115,8 +1116,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -1143,5 +1144,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1154,12 +1155,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-16.859874,1021.415)"
+       transform="matrix(0.2,0,0,0.2,-14.91533,1021.415)"
        style="display:inline"
        inkscape:label="Pillar"
@@ -1172,45 +1173,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Pillar Buoy</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="52.94833"
-         y="1039.3102">Bakentonne</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/PortButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/PortButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/PortButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -225,6 +226,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="52.590475"
+     inkscape:zoom="16.8"
+     inkscape:cx="34.316666"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -265,67 +266,33 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.4,0,0,0.4,-35.183297,987.5179)"
+       id="g4583"
+       inkscape:label="Can Buoy"
        style="display:inline"
-       inkscape:label="Can Buoy"
-       id="layer2">
+       transform="matrix(0.4,0,0,0.4,-35.302345,987.57742)">
       <path
-         sodipodi:nodetypes="ccccccsccccccccccccsccccsssc"
+         style="fill:#000407;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path4585"
          d="m 159.42774,100.24471 -28.0625,-8.843749 -15.21875,45.749999 -7.96875,0 0,5.65625 29.6875,0 c 1.28732,5.53295 6.23327,9.65624 12.15625,9.65625 5.92495,0 10.87095,-4.12052 12.15625,-9.65625 l 29.84375,0 0,-0.0625 0,-5.59375 -7.6875,0 9,-26.1875 -29.9375,-9.4375 -3.96875,-1.28125 z m -23.03125,-0.21875 47.15625,15.96875 -7.21875,21.15625 -14.15625,0 c -1.2853,-5.53573 -6.2313,-9.65625 -12.15625,-9.65625 -5.92298,1e-5 -10.86893,4.1233 -12.15625,9.65625 l -13.71875,0 12.25,-37.125 z m 13.625,32.4375 c 4.14,0 7.5,3.36 7.5,7.5 0,4.14 -3.36,7.5 -7.5,7.5 -4.14,0 -7.5,-3.36 -7.5,-7.5 0,-4.14 3.36,-7.5 7.5,-7.5 z"
-         id="path90440-0"
-         style="fill:#000407;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+         sodipodi:nodetypes="ccccccsccccccccccccsccccsssc" />
       <path
-         id="path5425"
+         style="fill:none;stroke:none"
          d="m 124.32232,136.85297 c 0.0705,-0.25633 12.07363,-36.64911 12.10443,-36.69999 0.0376,-0.062 46.76232,15.7838 46.87864,15.89804 0.0674,0.0662 -1.32108,4.31971 -3.4386,10.53421 l -3.55161,10.42324 -7.02801,0.0321 -7.028,0.0321 -0.33601,-1.02728 c -1.3281,-4.06036 -4.55016,-7.05123 -8.89652,-8.25817 -0.63411,-0.17609 -1.27824,-0.22542 -2.98547,-0.22867 -1.91208,-0.004 -2.30554,0.0315 -3.23427,0.28884 -4.16097,1.15294 -7.41617,4.26055 -8.71659,8.32137 l -0.28881,0.90186 -6.76954,0 c -6.38706,0 -6.76615,-0.0123 -6.70964,-0.21769 z"
-         style="fill:none;fill-opacity:1;stroke:none" />
+         id="path4587" />
     </g>
-  </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1039.2316"
-       x="69.71566"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1039.2316"
-         x="69.71566"
-         id="tspan2910"
-         sodipodi:role="line">Port</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.918892"
-       y="1039.2218"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.918892"
-         y="1039.2218">Backbord</tspan></text>
+    <path
+       style="fill:none;stroke:none;display:inline"
+       d="m 14.422078,1042.3289 c 0.01915,-0.05 1.109749,-3.3512 2.423555,-7.3363 1.313807,-3.9851 2.409845,-7.2683 2.43564,-7.296 0.0258,-0.028 3.940293,1.2686 8.698884,2.8808 4.758592,1.6121 8.977121,3.041 9.37451,3.1754 l 0.722524,0.2442 -1.43681,4.2111 -1.436811,4.211 -2.80025,3e-4 -2.80025,2e-4 -0.104614,-0.3422 c -0.398763,-1.3047 -1.319165,-2.375 -2.57709,-2.9971 -0.822194,-0.4065 -1.529033,-0.5546 -2.432081,-0.5094 -1.307369,0.065 -2.25776,0.4652 -3.198313,1.3452 -0.676155,0.6326 -1.085705,1.2687 -1.356487,2.1069 l -0.128143,0.3966 -2.70954,0 c -2.403176,0 -2.705603,-0.01 -2.674724,-0.091 z"
+       id="path4589" />
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
+       d="m 14.422078,1042.3289 c 0.01915,-0.05 1.109749,-3.3512 2.423555,-7.3363 1.313807,-3.9851 2.409845,-7.2683 2.43564,-7.296 0.0258,-0.028 3.940293,1.2686 8.698884,2.8808 4.758592,1.6121 8.977121,3.041 9.37451,3.1754 l 0.722524,0.2442 -1.43681,4.2111 -1.436811,4.211 -2.80025,3e-4 -2.80025,2e-4 -0.104614,-0.3422 c -0.398763,-1.3047 -1.319165,-2.375 -2.57709,-2.9971 -0.822194,-0.4065 -1.529033,-0.5546 -2.432081,-0.5094 -1.307369,0.065 -2.25776,0.4652 -3.198313,1.3452 -0.676155,0.6326 -1.085705,1.2687 -1.356487,2.1069 l -0.128143,0.3966 -2.70954,0 c -2.403176,0 -2.705603,-0.01 -2.674724,-0.091 z"
+       id="path4591" />
   </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefPortButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="PrefPortAButton.svg"
+   sodipodi:docname="PrefPortButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -358,6 +359,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="48.772324"
+     inkscape:zoom="16.8"
+     inkscape:cx="30.498515"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -387,5 +388,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -398,12 +399,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.4,0,0,0.4,-35.302351,987.74352)"
+       transform="matrix(0.4,0,0,0.4,-35.302351,987.50542)"
        id="g4867"
        inkscape:label="Can Buoy 3 Band"
@@ -411,7 +412,8 @@
       <path
          style="fill:#000407;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 22.3125,3.78125 -6.09375,18.28125 -3.1875,0 0,2.28125 11.875,0 c 0.514928,2.21318 2.505808,3.843746 4.875,3.84375 2.36998,0 4.32963,-1.629458 4.84375,-3.84375 l 11.9375,0 0,-0.03125 0,-2.25 -3.0625,0 L 47.09375,11.59375 35.125,7.8125 33.53125,7.3125 22.3125,3.78125 z m 2,3.4375 18.875,6.40625 -2.90625,8.4375 -5.65625,0 c -0.51412,-2.214292 -2.47377,-3.84375 -4.84375,-3.84375 -2.369192,4e-6 -4.360072,1.63057 -4.875,3.84375 l -5.5,0 4.90625,-14.84375 z m 5.46875,12.96875 c 1.656,0 3,1.344 3,3 0,1.656 -1.344,3 -3,3 -1.656,0 -3,-1.344 -3,-3 0,-1.656 1.344,-3 3,-3 z"
+         transform="matrix(2.5,0,0,2.5,75.607067,81.993125)"
          id="path4869"
-         d="m 159.42775,100.27581 -28.0625,-8.84375 -15.21875,45.75 -7.96875,0 0,5.65625 29.6875,0 c 1.28732,5.53295 6.23327,9.65624 12.15625,9.65625 5.92495,0 10.87095,-4.12052 12.15625,-9.65625 l 29.84375,0 0,-0.0625 0,-5.59375 -7.6875,0 9,-26.1875 -29.9375,-9.4375 -3.96875,-1.28125 z m -23.03125,-0.21875 47.15625,15.96875 -7.21875,21.15625 -14.15625,0 c -1.2853,-5.53573 -6.2313,-9.65625 -12.15625,-9.65625 -5.92298,10e-6 -10.86893,4.1233 -12.15625,9.65625 l -13.71875,0 12.25,-37.125 z m 13.625,32.4375 c 4.14,0 7.5,3.36 7.5,7.5 0,4.14 -3.36,7.5 -7.5,7.5 -4.14,0 -7.5,-3.36 -7.5,-7.5 0,-4.14 3.36,-7.5 7.5,-7.5 z"
-         sodipodi:nodetypes="ccccccsccccccccccccsccccsssc" />
+         sodipodi:nodetypes="cccccscccccccccccccsccccsssc" />
       <rect
          transform="matrix(0.94832365,0.31730466,-0.31730466,0.94832365,0,0)"
@@ -433,78 +435,26 @@
          id="path5563"
          d="m 165.46613,128.93882 c -6.60225,-2.21512 -17.10346,-5.73888 -23.33602,-7.83058 l -11.33192,-3.80309 1.11599,-3.44304 c 0.61379,-1.89367 1.12847,-3.45785 1.14374,-3.47596 0.0308,-0.0365 46.85669,15.62169 46.92707,15.69207 0.0849,0.0849 -2.26697,6.83654 -2.39036,6.86221 -0.0684,0.0142 -5.52624,-1.78649 -12.1285,-4.00161 z"
-         style="fill:none;fill-opacity:1;stroke:none" />
+         style="fill:none;stroke:none" />
       <path
          id="path5565"
          d="m 156.82069,117.41803 c -12.86242,-4.3118 -23.40489,-7.85574 -23.42771,-7.87543 -0.0314,-0.0271 2.94008,-9.18881 3.03531,-9.35852 0.0348,-0.062 46.76082,15.78383 46.8757,15.89662 0.10724,0.10529 -2.90186,9.21699 -3.03487,9.18972 -0.0342,-0.007 -10.586,-3.54059 -23.44843,-7.85239 z"
-         style="fill:none;fill-opacity:1;stroke:none" />
+         style="fill:none;stroke:none" />
       <path
          id="path5567"
          d="m 124.31343,136.92639 c 0.2045,-0.89172 6.16125,-18.60894 6.25727,-18.61109 0.0699,-0.002 10.62849,3.5098 23.46354,7.80303 l 23.33646,7.80588 -0.52097,1.55768 -0.52097,1.55768 -7.03479,0.0321 -7.03479,0.0321 -0.33601,-1.02728 c -1.3281,-4.06036 -4.55016,-7.05123 -8.89652,-8.25817 -0.63411,-0.17609 -1.27824,-0.22542 -2.98547,-0.22867 -1.91208,-0.004 -2.30554,0.0315 -3.23427,0.28884 -4.16097,1.15294 -7.41617,4.26055 -8.71659,8.32137 l -0.28881,0.90186 -6.76415,0 c -5.75635,0 -6.75816,-0.0261 -6.72393,-0.17537 z"
-         style="fill:none;fill-opacity:1;stroke:none" />
+         style="fill:none;stroke:none" />
     </g>
-  </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1045.184"
-       x="69.71566"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1045.184"
-         x="69.71566"
-         id="tspan2910"
-         sodipodi:role="line">Port</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;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="48.452381"
-       y="1033.1956"
-       id="text5305"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5307"
-         x="48.452381"
-         y="1033.1956">Preferred</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037941"
-       y="1045.2932"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037941"
-         y="1045.2932">Backbord</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.35714"
-       y="1032.3622"
-       id="text5330"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5332"
-         x="70.35714"
-         y="1032.3622">Abzweigung</tspan></text>
+    <path
+       style="fill:#00d400;fill-opacity:1;stroke:none;display:inline"
+       d="m 26.385419,1037.5663 c -5.107143,-1.7139 -9.305738,-3.1244 -9.330213,-3.1344 -0.02447,-0.01 0.162794,-0.6414 0.416152,-1.4031 0.367029,-1.1033 0.478901,-1.3776 0.550451,-1.3496 0.04939,0.019 4.201408,1.41 9.226705,3.0905 5.025298,1.6805 9.209201,3.0836 9.297563,3.1179 l 0.160658,0.062 -0.465749,1.3544 c -0.256162,0.7448 -0.489172,1.3596 -0.517801,1.3662 -0.02863,0.01 -4.230623,-1.3905 -9.337766,-3.1044 z"
+       id="path5502" />
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
+       d="m 27.3891,1034.4533 -9.353463,-3.1367 0.604244,-1.8396 c 0.332334,-1.0118 0.631965,-1.8489 0.665845,-1.8602 0.05292,-0.018 18.597067,6.2468 18.723812,6.3251 0.02542,0.016 -0.204817,0.7577 -0.511636,1.649 -0.705594,2.0495 -0.690347,2.008 -0.73652,2.0032 -0.02135,0 -4.247878,-1.4156 -9.392282,-3.1408 l 0,0 z"
+       id="path5504" />
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
+       d="m 14.392817,1042.3458 c 7.95e-4,-0.01 0.559484,-1.703 1.241533,-3.7655 0.900042,-2.7217 1.262812,-3.7457 1.322959,-3.7342 0.04558,0.01 4.264003,1.4136 9.374273,3.122 l 9.291401,3.1063 -0.212369,0.6428 -0.212369,0.6429 -2.802898,0 -2.802898,0 -0.07887,-0.3078 c -0.04338,-0.1692 -0.194403,-0.5385 -0.33561,-0.8206 -1.147805,-2.2928 -3.884882,-3.3245 -6.324255,-2.3838 -1.304455,0.5031 -2.433864,1.6815 -2.879297,3.0043 l -0.161002,0.4781 -2.711022,0.015 c -1.491061,0.01 -2.710371,0.01 -2.709576,0 l 0,0 z"
+       id="path6016" />
   </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PrefStbdButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -519,6 +520,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="48.772324"
+     inkscape:zoom="16.8"
+     inkscape:cx="23.296134"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -548,5 +549,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -559,12 +560,12 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.4,0,0,0.4,-35.061379,986.99601)"
+       transform="matrix(0.4,0,0,0.4,-35.06138,986.93649)"
        style="display:inline"
        inkscape:label="Cone Buoy 3 Band"
@@ -627,80 +628,28 @@
          id="path7528"
          d="m 158.51663,177.90266 c -10.20886,-3.42089 -18.72001,-6.26497 -18.91367,-6.32017 -0.29493,-0.0841 -0.17262,-0.23098 0.75322,-0.90466 6.42523,-4.6753 13.41958,-7.23788 22.16288,-8.12002 l 0.99723,-0.10061 1.71218,1.6204 c 4.96711,4.70087 8.97702,10.99941 11.13903,17.49658 0.45404,1.36444 0.79968,2.49599 0.7681,2.51455 -0.0316,0.0186 -8.41012,-2.76517 -18.61897,-6.18607 z"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.17677668999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          transform="translate(0,-60)"
          id="path7530"
          d="m 123.24968,196.95735 c 0,-0.39927 1.29553,-4.79875 1.86415,-6.33044 0.73144,-1.97028 2.47717,-5.55025 3.60847,-7.39989 0.9254,-1.51297 3.34337,-4.86148 3.51016,-4.86101 0.0667,1.9e-4 10.5422,3.49154 23.27896,7.75857 l 23.15775,7.75822 0,1.5664 0,1.56641 -8.16113,0.0459 -8.16113,0.046 -0.30173,-0.92984 c -0.81943,-2.52528 -2.80031,-5.13489 -5.03868,-6.63791 -5.6791,-3.81343 -13.40367,-2.2805 -17.36975,3.44698 -0.5736,0.82835 -1.70928,3.35371 -1.71245,3.8079 -0.002,0.28962 -0.47018,0.30936 -7.33839,0.30936 -4.03493,0 -7.33623,-0.066 -7.33623,-0.14665 z"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.17677668999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          transform="translate(0,-60)"
          id="path7532"
          d="m 155.65165,185.10701 c -12.36796,-4.15306 -22.5351,-7.59893 -22.59366,-7.65748 -0.12569,-0.12569 3.34138,-3.65299 4.55754,-4.63671 l 0.84243,-0.68143 19.3985,6.49887 c 10.66917,3.57437 19.45531,6.54931 19.52474,6.61097 0.18448,0.16383 0.64812,2.47085 0.94296,4.69207 0.31363,2.36277 0.31874,2.75501 0.0357,2.738 -0.12153,-0.007 -10.34021,-3.41123 -22.70816,-7.56429 l 0,0 z"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.17677668999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-  </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1045.184"
-       x="69.71566"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1045.184"
-         x="69.71566"
-         id="tspan2910"
-         sodipodi:role="line">Starboard</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;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="48.452381"
-       y="1033.1956"
-       id="text5305"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5307"
-         x="48.452381"
-         y="1033.1956">Preferred</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.037941"
-       y="1045.2932"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="70.037941"
-         y="1045.2932">Steuerbord</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="70.35714"
-       y="1032.3622"
-       id="text5330"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan5332"
-         x="70.35714"
-         y="1032.3622">Abzweigung</tspan></text>
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
+       d="m 28.230657,1037.2342 c -4.386905,-1.4733 -8.429108,-2.8327 -8.982673,-3.0209 l -1.006483,-0.3421 0.768388,-0.7746 c 0.422613,-0.426 0.894784,-0.8757 1.049268,-0.9993 l 0.280881,-0.2247 3.111976,1.0378 c 1.711587,0.5708 5.197052,1.7433 7.745478,2.6056 4.229756,1.4312 4.638464,1.5808 4.690451,1.7176 0.06737,0.1771 0.323253,1.7097 0.381397,2.2842 0.02236,0.221 0.01745,0.4003 -0.01091,0.3985 -0.02837,0 -3.640863,-1.2087 -8.027768,-2.6821 z"
+       id="path6295" />
+    <path
+       style="fill:#00d400;fill-opacity:1;stroke:none;display:inline"
+       d="m 28.216727,1033.9876 -7.394882,-2.4701 0.16274,-0.1336 c 0.221873,-0.1822 1.154587,-0.8048 1.59131,-1.0623 1.271272,-0.7495 2.921003,-1.4126 4.464286,-1.7943 1.131268,-0.2797 2.988779,-0.5596 3.261033,-0.4912 0.171331,0.043 1.586755,1.4828 2.144245,2.1811 1.134134,1.4207 2.047253,2.9844 2.676491,4.5833 0.303689,0.7718 0.589574,1.6691 0.529481,1.662 -0.0219,0 -3.367519,-1.1163 -7.434704,-2.4749 l 0,0 z"
+       id="path6297" />
+    <path
+       style="fill:#00d400;fill-opacity:1;stroke:none;display:inline"
+       d="m 14.5253,1041.6622 c -0.106399,-0.013 -0.193452,-0.048 -0.193452,-0.077 0,-0.1302 0.623318,-2.103 0.835454,-2.6441 0.331941,-0.8468 1.049605,-2.247 1.519224,-2.9642 0.525779,-0.803 1.112446,-1.5905 1.186988,-1.5934 0.03274,0 4.204611,1.3846 9.270828,3.0796 l 9.211304,3.0819 6e-6,0.5804 5e-6,0.5803 -3.216153,0 c -3.010453,0 -3.218315,-0.01 -3.249937,-0.1042 -0.604293,-1.8633 -1.945112,-3.1513 -3.772005,-3.6234 -0.585914,-0.1515 -1.673535,-0.1381 -2.351191,0.029 -1.65576,0.4078 -2.943138,1.5472 -3.551691,3.1435 -0.135626,0.3557 -0.219104,0.4954 -0.310906,0.52 -0.139322,0.037 -5.071947,0.03 -5.378474,-0.01 z"
+       id="path6809" />
   </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.svg	(revision 24658)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="60"
+   width="30"
    height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="StakeButton.svg"
+   sodipodi:docname="RegionAButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PerchSButton.png"
    inkscape:export-xdpi="90"
@@ -75,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59964245,0,0,0.75216603,0.01634949,260.83313)" />
+       gradientTransform="matrix(0.29912563,0,0,0.75464081,0.04295641,258.27815)" />
     <linearGradient
        inkscape:collect="always"
@@ -4357,5 +4357,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="31.04714"
+     inkscape:cx="25.699645"
      inkscape:cy="12.778874"
      inkscape:document-units="px"
@@ -4385,5 +4385,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4396,31 +4396,20 @@
      style="display:inline">
     <rect
-       y="1022.5289"
-       x="0.16682386"
-       height="29.666353"
-       width="59.666351"
+       y="1022.48"
+       x="0.11801904"
+       height="29.763964"
+       width="29.763962"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.33364773;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    <text
-       xml:space="preserve"
-       style="font-size:8px;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="24.654408"
-       y="1040.2633"
-       id="text3452"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3454"
-         x="24.654408"
-         y="1040.2633">IALA-A</tspan></text>
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.23603809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <rect
-       style="fill:#d40000;stroke:#000000;stroke-width:0.97859072999999996;stroke-opacity:1;fill-opacity:1"
+       style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.97859073;stroke-opacity:1"
        id="rect3456"
        width="8.021409"
        height="10.021409"
-       x="2.51036"
-       y="1032.4592" />
+       x="6.2668648"
+       y="1032.3708" />
     <path
-       style="fill:#00d400;stroke:#000000;stroke-width:0.87779163999999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 11.983987,1042.5312 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
+       style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.87779164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15.740492,1042.4428 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
        id="path3458"
        sodipodi:nodetypes="cccc" />
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/RegionBButton.svg	(revision 24658)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="60"
+   width="30"
    height="30"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="RegionAButton.svg"
+   sodipodi:docname="RegionBButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/RegionAButton.png"
    inkscape:export-xdpi="90"
@@ -75,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.59964245,0,0,0.75216603,0.01634949,260.83313)" />
+       gradientTransform="matrix(0.29912563,0,0,0.75464081,0.04295641,258.27815)" />
     <linearGradient
        inkscape:collect="always"
@@ -4385,5 +4385,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4396,31 +4396,20 @@
      style="display:inline">
     <rect
-       y="1022.5289"
-       x="0.16682386"
-       height="29.666353"
-       width="59.666351"
+       y="1022.48"
+       x="0.11801904"
+       height="29.763964"
+       width="29.763962"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.33364773;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    <text
-       xml:space="preserve"
-       style="font-size:8px;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="24.654408"
-       y="1040.2633"
-       id="text3452"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3454"
-         x="24.654408"
-         y="1040.2633">IALA-B</tspan></text>
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.23603809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <rect
-       style="fill:#00d400;stroke:#000000;stroke-width:0.97859072999999996;stroke-opacity:1;fill-opacity:1"
+       style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.97859073;stroke-opacity:1"
        id="rect3456"
        width="8.021409"
        height="10.021409"
-       x="2.51036"
-       y="1032.4592" />
+       x="6.3552532"
+       y="1032.415" />
     <path
-       style="fill:#d40000;stroke:#000000;stroke-width:0.87779163999999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="m 11.983987,1042.5312 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
+       style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.87779164px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15.82888,1042.487 5.123931,-10.1665 4.898626,10.1665 -10.022557,0 z"
        id="path3458"
        sodipodi:nodetypes="cccc" />
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/SafeWaterButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/SafeWaterButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/SafeWaterButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/StbdBButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -1436,9 +1437,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="66.757141"
+     inkscape:zoom="16.8"
+     inkscape:cx="42.82857"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
-     inkscape:current-layer="g2912"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -1465,5 +1466,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -1476,15 +1477,15 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
        id="g3742"
        inkscape:label="Sphere Buoy 2 Band"
        style="display:inline"
-       transform="matrix(0.4,0,0,0.4,-36.489128,963.1695)">
+       transform="matrix(0.4,0,0,0.4,-36.667702,963.10996)">
       <g
          id="g3752">
@@ -1499,5 +1500,5 @@
              sodipodi:rx="24.4375"
              sodipodi:ry="23.625"
-             d="m 129.32694,154.256 a 24.4375,23.625 0 1 1 42.90025,0.12552"
+             d="m 129.32694,154.256 c -6.43031,-11.47162 -2.0237,-25.81069 9.84245,-32.02721 11.86614,-6.21652 26.69836,-1.95641 33.12867,9.51521 3.96093,7.06626 3.93423,15.59456 -0.0709,22.63752"
              transform="matrix(1.1867088,0,0,1.2275216,-24.073718,10.69257)"
              sodipodi:start="2.6449863"
@@ -1530,45 +1531,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g5112"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SafeWaterButton.png"
-       sodipodi:linespacing="100%"
-       id="text5114"
-       y="1039.2218"
-       x="69.918892"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1039.2218"
-         x="69.918892"
-         id="tspan5116"
-         sodipodi:role="line">Safe Water</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.918892"
-       y="1039.2218"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SafeWaterButton.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.918892"
-         y="1039.2218">Fahrwasser</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/SparButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/SparButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/SparButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="PillarButton.svg"
+   sodipodi:docname="SparButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PillarButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2004,5 +2005,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2032,5 +2033,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2043,12 +2044,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-19.223147,1009.4855)"
+       transform="matrix(0.2,0,0,0.2,-14.892118,1009.5739)"
        style="display:inline"
        inkscape:label="Spar"
@@ -2237,45 +2238,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Spar Buoy</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="52.94833"
-         y="1039.3102">Spierentonne</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg	(revision 24658)
@@ -11,10 +11,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="60"
    height="40"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="SpecButton.svg">
+   sodipodi:docname="SpecButton.svg"
+   style="display:inline">
   <defs
      id="defs4">
@@ -50,5 +51,6 @@
        x2="50.000004"
        y2="1052.3621"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59911405,0,0,1.0028655,0.04429586,-2.9582287)" />
   </defs>
   <sodipodi:namedview
@@ -59,7 +61,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="50.678515"
-     inkscape:cy="7.2853872"
+     inkscape:zoom="16.8"
+     inkscape:cx="36.273753"
+     inkscape:cy="21.571101"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -88,5 +90,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -99,10 +101,10 @@
      style="display:inline">
     <rect
-       style="fill:url(#linearGradient4185);fill-opacity:1;stroke:#000000;stroke-width:0.50330848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       style="fill:url(#linearGradient4185);fill-opacity:1;stroke:#000000;stroke-width:0.39013091;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
        id="rect3667"
-       width="99.496696"
-       height="39.496693"
-       x="0.25165424"
-       y="1012.6138"
+       width="59.609871"
+       height="39.609871"
+       x="0.19506545"
+       y="1012.5572"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SpecButton_de.png"
        inkscape:export-xdpi="90"
@@ -110,5 +112,5 @@
     <path
        style="fill:#ffd400;fill-opacity:1;stroke:#000000;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 10.878908,1023.8598 8.518953,8.519 -8.552625,8.4852 5.75787,5.6232 8.350594,-8.4853 8.552625,8.4853 5.656855,-5.6568 -8.485284,-8.5527 8.518951,-8.4516 -5.690527,-5.6905 -8.552624,8.5526 -8.451605,-8.519 -5.623183,5.6906 z"
+       d="m 15.938432,1023.9193 8.518953,8.519 -8.552625,8.4852 5.75787,5.6232 8.350594,-8.4853 8.552625,8.4853 5.656855,-5.6568 -8.485284,-8.5527 8.518951,-8.4516 -5.690527,-5.6905 -8.552624,8.5526 -8.451605,-8.519 -5.623183,5.6906 z"
        id="path6150" />
     <rect
@@ -117,64 +119,19 @@
        width="6.9642859"
        height="7.9761906"
-       x="2.0238094"
-       y="26.011906"
-       transform="translate(0,1002.3622)" />
+       x="7.083333"
+       y="1028.4336" />
     <path
        style="fill:#ffd400;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 47.97619,33.988095 40,33.928571 l 4.047619,-7.97619 3.928571,8.035714 z"
+       d="m 53.035714,1036.4098 -7.97619,-0.059 4.047619,-7.9762 3.928571,8.0357 z"
        id="path6664"
-       transform="translate(0,1002.3622)"
        sodipodi:nodetypes="cccc" />
     <path
        id="path6666"
-       d="m 22.311663,1045.6806 1.70379,1.7038 -1.710525,1.697 1.151574,1.1247 1.670119,-1.6971 1.710525,1.6971 1.131371,-1.1314 -1.697057,-1.7105 1.703791,-1.6904 -1.138106,-1.1381 -1.710525,1.7106 -1.690321,-1.7038 -1.124636,1.1381 z"
+       d="m 27.371187,1045.7401 1.70379,1.7038 -1.710525,1.697 1.151574,1.1247 1.670119,-1.6971 1.710525,1.6971 1.131371,-1.1314 -1.697057,-1.7105 1.703791,-1.6904 -1.138106,-1.1381 -1.710525,1.7106 -1.690321,-1.7038 -1.124636,1.1381 z"
        style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.16px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 25,20 21.011905,15.952381 25,11.964286 28.928571,16.011905 25,20 z"
-       id="path6668"
-       transform="translate(0,1002.3622)" />
-  </g>
-  <g
-     transform="translate(0,-1012.3622)"
-     id="g3709"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text3711"
-       y="1035.2106"
-       x="75.132324"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#ffd400;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1035.2106"
-         x="75.132324"
-         id="tspan3713"
-         sodipodi:role="line">Special</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g3725"
-     transform="translate(0,-1012.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:10px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#ffd400;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="75.048141"
-       y="1036.1364"
-       id="text3727"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan3729"
-         x="75.048141"
-         y="1036.1364">Deutsch</tspan></text>
+       d="m 30.059524,1022.4217 -3.988095,-4.0476 3.988095,-3.9881 3.928571,4.0476 -3.928571,3.9881 z"
+       id="path6668" />
   </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/SphereButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/SphereButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/SphereButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="ConeButton.svg"
+   sodipodi:docname="SphereButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ConeButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -2487,5 +2488,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -2515,5 +2516,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -2526,15 +2527,15 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
        style="display:inline"
        inkscape:label="Sphere Buoy"
        id="layer9"
-       transform="matrix(0.2,0,0,0.2,-17.811001,999.83214)">
+       transform="matrix(0.2,0,0,0.2,-14.894185,999.74375)">
       <g
          id="g3674">
@@ -2561,45 +2562,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Sphere Buoy</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="52.94833"
-         y="1039.3102">Kugeltonne</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/StakeButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/StakeButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/StakeButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="PerchSButton.svg"
+   sodipodi:docname="StakeButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PerchSButton.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -4356,5 +4357,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="40.415611"
+     inkscape:cx="29.72062"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4384,5 +4385,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4395,12 +4396,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-16.916475,1015.4439)"
+       transform="matrix(0.2,0,0,0.2,-14.971932,1015.7091)"
        style="display:inline"
        inkscape:label="Perch Starboard"
@@ -4413,45 +4414,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:none">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Stake</tspan></text>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/StbdButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/StbdButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/StbdButton.svg	(revision 24658)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="100"
+   width="50"
    height="32"
    id="svg2"
@@ -19,5 +19,6 @@
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/StbdButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0005258,0,0,0.80006404,-0.02882728,210.3836)" />
+       gradientTransform="matrix(0.49933407,0,0,0.8033559,0.03202457,206.98513)" />
     <linearGradient
        inkscape:collect="always"
@@ -386,6 +387,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.4000001"
-     inkscape:cx="45.685713"
+     inkscape:zoom="16.8"
+     inkscape:cx="27.411904"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -415,5 +416,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -426,15 +427,15 @@
      style="display:inline">
     <rect
-       y="1020.5844"
-       x="0.22224484"
-       height="31.55551"
-       width="99.555534"
+       y="1020.5195"
+       x="0.15732755"
+       height="31.685345"
+       width="49.685345"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.44448969;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.3146551;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
        id="g3653"
        inkscape:label="Cone Buoy"
        style="display:inline"
-       transform="matrix(0.4,0,0,0.4,-35.061383,987.35311)">
+       transform="matrix(0.4,0,0,0.4,-35.061383,986.93644)">
       <g
          id="g3678">
@@ -475,48 +476,6 @@
          id="path6674"
          d="m 123.24968,196.95735 c 0,-0.0806 0.27384,-1.14582 0.60854,-2.36703 2.86668,-10.45969 9.27626,-19.26664 18.30656,-25.15377 6.02729,-3.92937 12.37122,-6.0733 20.35428,-6.87874 l 0.99723,-0.10061 1.71218,1.6204 c 8.30262,7.85759 13.23843,19.10617 13.4058,30.55152 l 0.0349,2.38649 -8.16113,0.0459 -8.16113,0.046 -0.30173,-0.92984 c -0.81943,-2.52529 -2.80031,-5.13489 -5.03868,-6.63791 -5.6791,-3.81343 -13.40367,-2.2805 -17.36975,3.44698 -0.5736,0.82835 -1.70928,3.35371 -1.71245,3.8079 -0.002,0.28962 -0.47018,0.30936 -7.33839,0.30936 -4.03493,0 -7.33623,-0.066 -7.33623,-0.14665 z"
-         style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.17677668999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00d400;fill-opacity:1;stroke:#000000;stroke-width:0.17677669;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/PortAButton_de.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1039.2316"
-       x="69.71566"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1039.2316"
-         x="69.71566"
-         id="tspan2910"
-         sodipodi:role="line">Starboard</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="69.918892"
-       y="1039.2218"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan2916"
-         x="69.918892"
-         y="1039.2218">Steuerbord</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/SuperButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/SuperButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/SuperButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="FloatButton.svg"
+   sodipodi:docname="SuperButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FloatButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -3306,5 +3307,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -3334,5 +3335,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -3345,12 +3346,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-17.01126,1015.5027)"
+       transform="matrix(0.2,0,0,0.2,-14.978328,1015.5911)"
        style="display:inline"
        inkscape:label="Major Float"
@@ -3363,45 +3364,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Superbuoy</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/images/TowerButton.svg
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/images/TowerButton.svg	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/images/TowerButton.svg	(revision 24658)
@@ -11,13 +11,14 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="85"
+   width="30"
    height="32"
    id="svg2"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="BeaconButton.svg"
+   sodipodi:docname="TowerButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/BeaconButton_de.png"
    inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   inkscape:export-ydpi="90"
+   style="display:inline">
   <defs
      id="defs4">
@@ -74,5 +75,5 @@
        y2="1052.3596"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.85012407,0,0,0.80093987,-0.00835747,209.47939)" />
+       gradientTransform="matrix(0.29904784,0,0,0.80515289,0.04684593,205.12988)" />
     <linearGradient
        inkscape:collect="always"
@@ -4762,5 +4763,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.313708"
-     inkscape:cx="31.399999"
+     inkscape:cx="20.705008"
      inkscape:cy="9.8235431"
      inkscape:document-units="px"
@@ -4790,5 +4791,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
@@ -4801,12 +4802,12 @@
      style="display:inline">
     <rect
-       y="1020.5671"
-       x="0.20497282"
-       height="31.590054"
-       width="84.59008"
+       y="1020.484"
+       x="0.12188905"
+       height="31.756222"
+       width="29.756222"
        id="rect3618"
-       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.40994564;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.24377809;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
     <g
-       transform="matrix(0.2,0,0,0.2,-17.001097,1018.4826)"
+       transform="matrix(0.2,0,0,0.2,-14.879776,1018.571)"
        style="display:inline"
        inkscape:label="Tower"
@@ -4818,45 +4819,3 @@
     </g>
   </g>
-  <g
-     transform="translate(0,-1020.3622)"
-     id="g2900"
-     inkscape:groupmode="layer"
-     inkscape:label="Text EN"
-     style="display:inline">
-    <text
-       inkscape:export-ydpi="90"
-       inkscape:export-xdpi="90"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       sodipodi:linespacing="100%"
-       id="text2908"
-       y="1038.6128"
-       x="52.833485"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       xml:space="preserve"><tspan
-         y="1038.6128"
-         x="52.833485"
-         id="tspan2910"
-         sodipodi:role="line">Tower</tspan></text>
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Text DE"
-     inkscape:groupmode="layer"
-     id="g2912"
-     transform="translate(0,-1020.3622)">
-    <text
-       xml:space="preserve"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="52.94833"
-       y="1039.3102"
-       id="text2914"
-       sodipodi:linespacing="100%"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"><tspan
-         sodipodi:role="line"
-         id="tspan4557"
-         x="52.94833"
-         y="1039.3102">Deutsch</tspan></text>
-  </g>
 </svg>
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java	(revision 24658)
@@ -13,5 +13,5 @@
 
 public class OSeaM implements SmedPluggable {
-	
+
 	private int index = -1;
 	private String msg = "";
@@ -65,6 +65,8 @@
 	public ImageIcon getIcon() {
 		URL url = getClass().getResource("/images/Smp.png");
-		if(url == null) return null;
-		else return new ImageIcon(url);
+		if (url == null)
+			return null;
+		else
+			return new ImageIcon(url);
 	}
 
@@ -78,5 +80,5 @@
 		manager.showVisualMessage(msg);
 		oseam = new OSeaMAction();
-		
+
 		return oseam.getOSeaMPanel();
 	}
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 24658)
@@ -87,15 +87,15 @@
 			Main.pref.put("color.background", "#606060");
 
-		panelChan= new PanelChan();
-		panelChan.setBounds(new Rectangle(105, 0, 295, 160));
+		panelChan = new PanelChan();
+		panelChan.setBounds(new Rectangle(65, 0, 335, 160));
 		panelChan.setVisible(false);
-		panelHaz= new PanelHaz();
-		panelHaz.setBounds(new Rectangle(105, 0, 295, 160));
+		panelHaz = new PanelHaz();
+		panelHaz.setBounds(new Rectangle(65, 0, 335, 160));
 		panelHaz.setVisible(false);
-		panelSpec= new PanelSpec();
-		panelSpec.setBounds(new Rectangle(105, 0, 295, 160));
+		panelSpec = new PanelSpec();
+		panelSpec.setBounds(new Rectangle(65, 0, 335, 160));
 		panelSpec.setVisible(false);
-		panelLights= new PanelLights();
-		panelLights.setBounds(new Rectangle(105, 0, 295, 160));
+		panelLights = new PanelLights();
+		panelLights.setBounds(new Rectangle(65, 0, 335, 160));
 		panelLights.setVisible(false);
 	}
@@ -107,8 +107,10 @@
 			oseamPanel.setSize(new Dimension(400, 360));
 
-			shapeIcon = new JLabel(new ImageIcon(getClass().getResource("/images/Cardinal_Pillar_South.png")));
+			shapeIcon = new JLabel(new ImageIcon(getClass().getResource(
+					"/images/Cardinal_Pillar_South.png")));
 			shapeIcon.setBounds(new Rectangle(265, 165, 130, 185));
 			oseamPanel.add(shapeIcon, null);
-			lightIcon = new JLabel(new ImageIcon(getClass().getResource("/images/Light_White_120.png")));
+			lightIcon = new JLabel(new ImageIcon(getClass().getResource(
+					"/images/Light_White_120.png")));
 			lightIcon.setBounds(new Rectangle(265, 165, 125, 185));
 			oseamPanel.add(lightIcon, null);
@@ -116,11 +118,14 @@
 			topIcon.setBounds(new Rectangle(265, 165, 125, 185));
 			oseamPanel.add(topIcon, null);
-			reflIcon = new JLabel(new ImageIcon(getClass().getResource("/images/Radar_Reflector_355.png")));
+			reflIcon = new JLabel(new ImageIcon(getClass().getResource(
+					"/images/Radar_Reflector_355.png")));
 			reflIcon.setBounds(new Rectangle(265, 165, 125, 185));
 			oseamPanel.add(reflIcon, null);
-			radarIcon = new JLabel(new ImageIcon(getClass().getResource("/images/Radar_Station.png")));
+			radarIcon = new JLabel(new ImageIcon(getClass().getResource(
+					"/images/Radar_Station.png")));
 			radarIcon.setBounds(new Rectangle(265, 165, 130, 185));
 			oseamPanel.add(radarIcon, null);
-			fogIcon = new JLabel(new ImageIcon(getClass().getResource("/images/Fog_Signal.png")));
+			fogIcon = new JLabel(new ImageIcon(getClass().getResource(
+					"/images/Fog_Signal.png")));
 			fogIcon.setBounds(new Rectangle(265, 165, 125, 185));
 			oseamPanel.add(fogIcon, null);
@@ -144,5 +149,5 @@
 						chanButton.setEnabled(false);
 						panelChan.setVisible(true);
-					} else { 
+					} else {
 						chanButton.setEnabled(true);
 						panelChan.setVisible(false);
@@ -151,5 +156,5 @@
 						hazButton.setEnabled(false);
 						panelHaz.setVisible(true);
-					} else { 
+					} else {
 						hazButton.setEnabled(true);
 						panelHaz.setVisible(false);
@@ -158,5 +163,5 @@
 						specButton.setEnabled(false);
 						panelSpec.setVisible(true);
-					} else { 
+					} else {
 						specButton.setEnabled(true);
 						panelSpec.setVisible(false);
@@ -165,5 +170,5 @@
 						lightsButton.setEnabled(false);
 						panelLights.setVisible(true);
-					} else { 
+					} else {
 						lightsButton.setEnabled(true);
 						panelLights.setVisible(false);
@@ -175,5 +180,5 @@
 			specButton.addActionListener(alType);
 			lightsButton.addActionListener(alType);
-			
+
 			oseamPanel.add(getTopButton(), null);
 			oseamPanel.add(getFogButton(), null);
@@ -197,5 +202,5 @@
 			radarButton.addActionListener(alMisc);
 			litButton.addActionListener(alMisc);
-			
+
 			nameLabel = new JLabel();
 			nameLabel.setBounds(new Rectangle(5, 327, 60, 20));
@@ -216,6 +221,6 @@
 		if (chanButton == null) {
 			chanButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("ChanButton"))));
-			chanButton.setBounds(new Rectangle(0, 0, 105, 40));
+					"/images/ChanButton.png")));
+			chanButton.setBounds(new Rectangle(0, 0, 65, 40));
 			chanButton.setToolTipText(Messages.getString("ChanTip"));
 		}
@@ -226,6 +231,6 @@
 		if (hazButton == null) {
 			hazButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("HazButton"))));
-			hazButton.setBounds(new Rectangle(0, 40, 105, 40));
+					"/images/HazButton.png")));
+			hazButton.setBounds(new Rectangle(0, 40, 65, 40));
 			hazButton.setToolTipText(Messages.getString("HazTip"));
 		}
@@ -236,6 +241,6 @@
 		if (specButton == null) {
 			specButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SpecButton"))));
-			specButton.setBounds(new Rectangle(0, 80, 105, 40));
+					"/images/SpecButton.png")));
+			specButton.setBounds(new Rectangle(0, 80, 65, 40));
 			specButton.setToolTipText(Messages.getString("SpecTip"));
 		}
@@ -246,6 +251,6 @@
 		if (lightsButton == null) {
 			lightsButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("LightsButton"))));
-			lightsButton.setBounds(new Rectangle(0, 120, 105, 40));
+					"/images/LightsButton.png")));
+			lightsButton.setBounds(new Rectangle(0, 120, 65, 40));
 			lightsButton.setToolTipText(Messages.getString("LightsTip"));
 		}
@@ -275,6 +280,6 @@
 	private JRadioButton getRadarButton() {
 		if (radarButton == null) {
-			radarButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RadarButton.png")));
+			radarButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RadarButton.png")));
 			radarButton.setBounds(new Rectangle(0, 235, 40, 40));
 			radarButton.setToolTipText(tr("Radar"));
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties	(revision 24658)
@@ -1,48 +1,16 @@
 TabInfo=Seamark editor
 TabName=Seamarks
-ChanButton=/images/ChanButton.png
-ChanTip=Channel marks
-HazButton=/images/HazButton.png
-HazTip=Danger marks
-SpecButton=/images/SpecButton.png
-SpecTip=Special marks
-LightsButton=/images/LightsButton.png
+ChanTip=Lateral & Safe Water marks
+HazTip=Cardinal & Isolated Danger marks
+SpecTip=Special Purpose marks
 LightsTip=Lights marks
-PortButton=/images/PortButton.png
 PortTip=Port hand marks
-StbdButton=/images/StbdButton.png
 StbdTip=Starboard hand marks
-PrefPortButton=/images/PrefPortButton.png
 PrefPortTip=Preferred Port hand marks
-PrefStbdButton=/images/PrefStbdButton.png
 PrefStbdTip=Preferred Starboard hand marks
-SafeWaterButton=/images/SafeWaterButton.png
 SafeWaterTip=Safe Water marks
-NorthButton=/images/CardNButton.png
-PortTip=North cardinal marks
-SouthButton=/images/CardSButton.png
+NorthTip=North cardinal marks
 SouthTip=South cardinal marks
-EastButton=/images/CardEButton.png
 EastTip=East cardinal marks
-WestButton=/images/CardWButton.png
 WestTip=West cardinal marks
-IsolButton=/images/IsolButton.png
 IsolTip=Isolated danger marks
-LighthouseButton=/images/LighthouseButton.png
-LightMajorButton=/images/LightMajorButton.png
-LightMinorButton=/images/LightMinorButton.png
-LightVesselButton=/images/LightVesselButton.png
-LightFloatButton=/images/LightFloatButton.png
-PillarButton=/images/PillarButton.png
-SparButton=/images/SparButton.png
-CanButton=/images/CanButton.png
-ConeButton=/images/ConeButton.png
-SphereButton=/images/SphereButton.png
-BarrelButton=/images/BarrelButton.png
-FloatButton=/images/FloatButton.png
-SuperButton=/images/SuperButton.png
-BeaconButton=/images/BeaconButton.png
-TowerButton=/images/TowerButton.png
-PerchPButton=/images/PerchPButton.png
-PerchSButton=/images/PerchSButton.png
-StakeButton=/images/StakeButton.png
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties	(revision 24658)
@@ -1,48 +1,16 @@
 TabInfo=Seamark editor
 TabName=Seezeichen
-ChanButton=/images/ChanButton_de.png
-ChanTip=Channel marks
-HazButton=/images/HazButton_de.png
-HazTip=Danger marks
-SpecButton=/images/SpecButton_de.png
-SpecTip=Special marks
-LightsButton=/images/LightsButton_de.png
+ChanTip=Lateral & Safe Water marks
+HazTip=Cardinal & Isolated Danger marks
+SpecTip=Special Purpose marks
 LightsTip=Lights marks
-PortButton=/images/PortButton_de.png
 PortTip=Port hand marks
-StbdButton=/images/StbdButton_de.png
 StbdTip=Starboard hand marks
-PrefPortButton=/images/PrefPortButton_de.png
 PrefPortTip=Preferred Port hand marks
-PrefStbdButton=/images/PrefStbdButton_de.png
 PrefStbdTip=Preferred Starboard hand marks
-SafeWaterButton=/images/SafeWaterButton_de.png
 SafeWaterTip=Safe Water marks
-NorthButton=/images/CardNButton_de.png
-PortTip=North cardinal marks
-SouthButton=/images/CardSButton_de.png
+NorthTip=North cardinal marks
 SouthTip=South cardinal marks
-EastButton=/images/CardEButton_de.png
 EastTip=East cardinal marks
-WestButton=/images/CardWButton_de.png
 WestTip=West cardinal marks
-IsolButton=/images/IsolButton_de.png
 IsolTip=Isolated danger marks
-LighthouseButton=/images/LighthouseButton_de.png
-LightMajorButton=/images/LightMajorButton_de.png
-LightMinorButton=/images/LightMinorButton_de.png
-LightVesselButton=/images/LightVesselButton_de.png
-LightFloatButton=/images/LightFloatButton_de.png
-PillarButton=/images/PillarButton_de.png
-SparButton=/images/SparButton_de.png
-CanButton=/images/CanButton_de.png
-ConeButton=/images/ConeButton_de.png
-SphereButton=/images/SphereButton_de.png
-BarrelButton=/images/BarrelButton_de.png
-FloatButton=/images/FloatButton_de.png
-SuperButton=/images/SuperButton_de.png
-BeaconButton=/images/BeaconButton_de.png
-TowerButton=/images/TowerButton_de.png
-PerchPButton=/images/PerchPButton_de.png
-PerchSButton=/images/PerchSButton_de.png
-StakeButton=/images/StakeButton_de.png
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties	(revision 24658)
@@ -1,48 +1,16 @@
 TabInfo=Seamark editor
 TabName=Seamarks
-ChanButton=/images/ChanButton.png
-ChanTip=Channel marks
-HazButton=/images/HazButton.png
-HazTip=Danger marks
-SpecButton=/images/SpecButton.png
-SpecTip=Special marks
-LightsButton=/images/LightsButton.png
+ChanTip=Lateral & Safe Water marks
+HazTip=Cardinal & Isolated Danger marks
+SpecTip=Special Purpose marks
 LightsTip=Lights marks
-PortButton=/images/PortButton.png
 PortTip=Port hand marks
-StbdButton=/images/StbdButton.png
 StbdTip=Starboard hand marks
-PrefPortButton=/images/PrefPortButton.png
 PrefPortTip=Preferred Port hand marks
-PrefStbdButton=/images/PrefStbdButton.png
 PrefStbdTip=Preferred Starboard hand marks
-SafeWaterButton=/images/SafeWaterButton.png
 SafeWaterTip=Safe Water marks
-NorthButton=/images/CardNButton.png
-PortTip=North cardinal marks
-SouthButton=/images/CardSButton.png
+NorthTip=North cardinal marks
 SouthTip=South cardinal marks
-EastButton=/images/CardEButton.png
 EastTip=East cardinal marks
-WestButton=/images/CardWButton.png
 WestTip=West cardinal marks
-IsolButton=/images/IsolButton.png
 IsolTip=Isolated danger marks
-LighthouseButton=/images/LighthouseButton.png
-LightMajorButton=/images/LightMajorButton.png
-LightMinorButton=/images/LightMinorButton.png
-LightVesselButton=/images/LightVesselButton.png
-LightFloatButton=/images/LightFloatButton.png
-PillarButton=/images/PillarButton.png
-SparButton=/images/SparButton.png
-CanButton=/images/CanButton.png
-ConeButton=/images/ConeButton.png
-SphereButton=/images/SphereButton.png
-BarrelButton=/images/BarrelButton.png
-FloatButton=/images/FloatButton.png
-SuperButton=/images/SuperButton.png
-BeaconButton=/images/BeaconButton.png
-TowerButton=/images/TowerButton.png
-PerchPButton=/images/PerchPButton.png
-PerchSButton=/images/PerchSButton.png
-StakeButton=/images/StakeButton.png
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java	(revision 24658)
@@ -35,21 +35,21 @@
 	private PanelPrefStbd panelPrefStbd = null;
 	private PanelSafeWater panelSafeWater = null;
-	
+
 	public PanelChan() {
 		super();
 		panelPort = new PanelPort();
-		panelPort.setBounds(new Rectangle(105, 0, 185, 160));
+		panelPort.setBounds(new Rectangle(55, 0, 225, 160));
 		panelPort.setVisible(false);
 		panelStbd = new PanelStbd();
-		panelStbd.setBounds(new Rectangle(105, 0, 185, 160));
+		panelStbd.setBounds(new Rectangle(55, 0, 225, 160));
 		panelStbd.setVisible(false);
 		panelPrefPort = new PanelPrefPort();
-		panelPrefPort.setBounds(new Rectangle(105, 0, 185, 160));
+		panelPrefPort.setBounds(new Rectangle(55, 0, 225, 160));
 		panelPrefPort.setVisible(false);
 		panelPrefStbd = new PanelPrefStbd();
-		panelPrefStbd.setBounds(new Rectangle(105, 0, 185, 160));
+		panelPrefStbd.setBounds(new Rectangle(55, 0, 225, 160));
 		panelPrefStbd.setVisible(false);
 		panelSafeWater = new PanelSafeWater();
-		panelSafeWater.setBounds(new Rectangle(105, 0, 185, 160));
+		panelSafeWater.setBounds(new Rectangle(55, 0, 225, 160));
 		panelSafeWater.setVisible(false);
 		initialize();
@@ -57,65 +57,65 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(panelPort, null);
-         this.add(panelStbd, null);
-         this.add(panelPrefPort, null);
-         this.add(panelPrefStbd, null);
-         this.add(panelSafeWater, null);
-         this.add(getPortButton(), null);
-         this.add(getStbdButton(), null);
-         this.add(getPrefPortButton(), null);
-         this.add(getPrefStbdButton(), null);
-         this.add(getSafeWaterButton(), null);
-         catButtons = new ButtonGroup();
-         catButtons.add(portButton);
-         catButtons.add(stbdButton);
-         catButtons.add(prefPortButton);
-         catButtons.add(prefStbdButton);
-         catButtons.add(safeWaterButton);
-			ActionListener alCat = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					if (portButton.isSelected()) {
-						portButton.setEnabled(false);
-						panelPort.setVisible(true);
-					} else { 
-						portButton.setEnabled(true);
-						panelPort.setVisible(false);
-					}
-					if (stbdButton.isSelected()) {
-						stbdButton.setEnabled(false);
-						panelStbd.setVisible(true);
-					} else { 
-						stbdButton.setEnabled(true);
-						panelStbd.setVisible(false);
-					}
-					if (prefPortButton.isSelected()) {
-						prefPortButton.setEnabled(false);
-						panelPrefPort.setVisible(true);
-					} else { 
-						prefPortButton.setEnabled(true);
-						panelPrefPort.setVisible(false);
-					}
-					if (prefStbdButton.isSelected()) {
-						prefStbdButton.setEnabled(false);
-						panelPrefStbd.setVisible(true);
-					} else { 
-						prefStbdButton.setEnabled(true);
-						panelPrefStbd.setVisible(false);
-					}
-					if (safeWaterButton.isSelected()) {
-						safeWaterButton.setEnabled(false);
-						panelSafeWater.setVisible(true);
-					} else { 
-						safeWaterButton.setEnabled(true);
-						panelSafeWater.setVisible(false);
-					}
+		this.setLayout(null);
+		this.add(panelPort, null);
+		this.add(panelStbd, null);
+		this.add(panelPrefPort, null);
+		this.add(panelPrefStbd, null);
+		this.add(panelSafeWater, null);
+		this.add(getPortButton(), null);
+		this.add(getStbdButton(), null);
+		this.add(getPrefPortButton(), null);
+		this.add(getPrefStbdButton(), null);
+		this.add(getSafeWaterButton(), null);
+		catButtons = new ButtonGroup();
+		catButtons.add(portButton);
+		catButtons.add(stbdButton);
+		catButtons.add(prefPortButton);
+		catButtons.add(prefStbdButton);
+		catButtons.add(safeWaterButton);
+		ActionListener alCat = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				if (portButton.isSelected()) {
+					portButton.setEnabled(false);
+					panelPort.setVisible(true);
+				} else {
+					portButton.setEnabled(true);
+					panelPort.setVisible(false);
 				}
-			};
-			portButton.addActionListener(alCat);
-			stbdButton.addActionListener(alCat);
-			prefPortButton.addActionListener(alCat);
-			prefStbdButton.addActionListener(alCat);
-			safeWaterButton.addActionListener(alCat);
+				if (stbdButton.isSelected()) {
+					stbdButton.setEnabled(false);
+					panelStbd.setVisible(true);
+				} else {
+					stbdButton.setEnabled(true);
+					panelStbd.setVisible(false);
+				}
+				if (prefPortButton.isSelected()) {
+					prefPortButton.setEnabled(false);
+					panelPrefPort.setVisible(true);
+				} else {
+					prefPortButton.setEnabled(true);
+					panelPrefPort.setVisible(false);
+				}
+				if (prefStbdButton.isSelected()) {
+					prefStbdButton.setEnabled(false);
+					panelPrefStbd.setVisible(true);
+				} else {
+					prefStbdButton.setEnabled(true);
+					panelPrefStbd.setVisible(false);
+				}
+				if (safeWaterButton.isSelected()) {
+					safeWaterButton.setEnabled(false);
+					panelSafeWater.setVisible(true);
+				} else {
+					safeWaterButton.setEnabled(true);
+					panelSafeWater.setVisible(false);
+				}
+			}
+		};
+		portButton.addActionListener(alCat);
+		stbdButton.addActionListener(alCat);
+		prefPortButton.addActionListener(alCat);
+		prefStbdButton.addActionListener(alCat);
+		safeWaterButton.addActionListener(alCat);
 	}
 
@@ -123,6 +123,6 @@
 		if (portButton == null) {
 			portButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PortButton"))));
-			portButton.setBounds(new Rectangle(0, 0, 105, 32));
+					"/images/PortButton.png")));
+			portButton.setBounds(new Rectangle(0, 0, 55, 32));
 			portButton.setToolTipText(Messages.getString("PortTip"));
 		}
@@ -133,6 +133,6 @@
 		if (stbdButton == null) {
 			stbdButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("StbdButton"))));
-			stbdButton.setBounds(new Rectangle(0, 32, 105, 32));
+					"/images/StbdButton.png")));
+			stbdButton.setBounds(new Rectangle(0, 32, 55, 32));
 			stbdButton.setToolTipText(Messages.getString("StbdTip"));
 		}
@@ -142,7 +142,7 @@
 	private JRadioButton getPrefPortButton() {
 		if (prefPortButton == null) {
-			prefPortButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PrefPortButton"))));
-			prefPortButton.setBounds(new Rectangle(0, 64, 105, 32));
+			prefPortButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PrefPortButton.png")));
+			prefPortButton.setBounds(new Rectangle(0, 64, 55, 32));
 			prefPortButton.setToolTipText(Messages.getString("PrefPortTip"));
 		}
@@ -152,7 +152,7 @@
 	private JRadioButton getPrefStbdButton() {
 		if (prefStbdButton == null) {
-			prefStbdButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PrefStbdButton"))));
-			prefStbdButton.setBounds(new Rectangle(0, 96, 105, 32));
+			prefStbdButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PrefStbdButton.png")));
+			prefStbdButton.setBounds(new Rectangle(0, 96, 55, 32));
 			prefStbdButton.setToolTipText(Messages.getString("PrefStbdTip"));
 		}
@@ -162,7 +162,7 @@
 	private JRadioButton getSafeWaterButton() {
 		if (safeWaterButton == null) {
-			safeWaterButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SafeWaterButton"))));
-			safeWaterButton.setBounds(new Rectangle(0, 128, 105, 32));
+			safeWaterButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/SafeWaterButton.png")));
+			safeWaterButton.setBounds(new Rectangle(0, 128, 55, 32));
 			safeWaterButton.setToolTipText(Messages.getString("SafeWaterTip"));
 		}
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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 24658)
@@ -101,6 +101,6 @@
 		if (northButton == null) {
 			northButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("NorthButton"))));
-			northButton.setBounds(new Rectangle(0, 0, 105, 32));
+					.getResource("/images/CardNButton.png")));
+			northButton.setBounds(new Rectangle(0, 0, 55, 32));
 			northButton.setToolTipText(Messages.getString("NorthTip"));
 		}
@@ -111,6 +111,6 @@
 		if (southButton == null) {
 			southButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("SouthButton"))));
-			southButton.setBounds(new Rectangle(0, 32, 105, 32));
+					.getResource("/images/CardSButton.png")));
+			southButton.setBounds(new Rectangle(0, 32, 55, 32));
 			southButton.setToolTipText(Messages.getString("SouthTip"));
 		}
@@ -121,6 +121,6 @@
 		if (eastButton == null) {
 			eastButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("EastButton"))));
-			eastButton.setBounds(new Rectangle(0, 64, 105, 32));
+					"/images/CardEButton.png")));
+			eastButton.setBounds(new Rectangle(0, 64, 55, 32));
 			eastButton.setToolTipText(Messages.getString("EastTip"));
 		}
@@ -131,6 +131,6 @@
 		if (westButton == null) {
 			westButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("WestButton"))));
-			westButton.setBounds(new Rectangle(0, 96, 105, 32));
+					"/images/CardWButton.png")));
+			westButton.setBounds(new Rectangle(0, 96, 55, 32));
 			westButton.setToolTipText(Messages.getString("WestTip"));
 		}
@@ -141,6 +141,6 @@
 		if (isolButton == null) {
 			isolButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("IsolButton"))));
-			isolButton.setBounds(new Rectangle(0, 128, 105, 32));
+					"/images/IsolButton.png")));
+			isolButton.setBounds(new Rectangle(0, 128, 55, 32));
 			isolButton.setToolTipText(Messages.getString("IsolTip"));
 		}
@@ -151,6 +151,6 @@
 		if (pillarButton == null) {
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(105, 0, 90, 32));
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(55, 0, 90, 32));
 		}
 		return pillarButton;
@@ -160,6 +160,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(105, 32, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(55, 32, 90, 32));
 		}
 		return sparButton;
@@ -169,6 +169,6 @@
 		if (floatButton == null) {
 			floatButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(105, 64, 90, 32));
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(55, 64, 90, 32));
 		}
 		return floatButton;
@@ -178,6 +178,6 @@
 		if (beaconButton == null) {
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("BeaconButton"))));
-			beaconButton.setBounds(new Rectangle(105, 96, 90, 32));
+					.getResource("/images/BeaconButton.png")));
+			beaconButton.setBounds(new Rectangle(55, 96, 90, 32));
 		}
 		return beaconButton;
@@ -187,6 +187,6 @@
 		if (towerButton == null) {
 			towerButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("TowerButton"))));
-			towerButton.setBounds(new Rectangle(105, 128, 90, 32));
+					.getResource("/images/TowerButton.png")));
+			towerButton.setBounds(new Rectangle(55, 128, 90, 32));
 		}
 		return towerButton;
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 24658)
@@ -30,5 +30,5 @@
 	private JRadioButton vesselButton = null;
 	private JRadioButton floatButton = null;
-	
+
 	public PanelLights() {
 		super();
@@ -37,37 +37,37 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(getHouseButton(), null);
-         this.add(getMajorButton(), null);
-         this.add(getMinorButton(), null);
-         this.add(getVesselButton(), null);
-         this.add(getFloatButton(), null);
-         catButtons = new ButtonGroup();
-         catButtons.add(houseButton);
-         catButtons.add(majorButton);
-         catButtons.add(minorButton);
-         catButtons.add(vesselButton);
-         catButtons.add(floatButton);
-			ActionListener alCat = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					houseButton.setEnabled(!houseButton.isSelected());
-					majorButton.setEnabled(!majorButton.isSelected());
-					minorButton.setEnabled(!minorButton.isSelected());
-					vesselButton.setEnabled(!vesselButton.isSelected());
-					floatButton.setEnabled(!floatButton.isSelected());
-				}
-			};
-			houseButton.addActionListener(alCat);
-			majorButton.addActionListener(alCat);
-			minorButton.addActionListener(alCat);
-			vesselButton.addActionListener(alCat);
-			floatButton.addActionListener(alCat);
+		this.setLayout(null);
+		this.add(getHouseButton(), null);
+		this.add(getMajorButton(), null);
+		this.add(getMinorButton(), null);
+		this.add(getVesselButton(), null);
+		this.add(getFloatButton(), null);
+		catButtons = new ButtonGroup();
+		catButtons.add(houseButton);
+		catButtons.add(majorButton);
+		catButtons.add(minorButton);
+		catButtons.add(vesselButton);
+		catButtons.add(floatButton);
+		ActionListener alCat = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				houseButton.setEnabled(!houseButton.isSelected());
+				majorButton.setEnabled(!majorButton.isSelected());
+				minorButton.setEnabled(!minorButton.isSelected());
+				vesselButton.setEnabled(!vesselButton.isSelected());
+				floatButton.setEnabled(!floatButton.isSelected());
+			}
+		};
+		houseButton.addActionListener(alCat);
+		majorButton.addActionListener(alCat);
+		minorButton.addActionListener(alCat);
+		vesselButton.addActionListener(alCat);
+		floatButton.addActionListener(alCat);
 	}
 
 	private JRadioButton getHouseButton() {
 		if (houseButton == null) {
-			houseButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("LighthouseButton"))));
-			houseButton.setBounds(new Rectangle(0, 0, 105, 32));
+			houseButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/LighthouseButton.png")));
+			houseButton.setBounds(new Rectangle(0, 0, 35, 32));
 		}
 		return houseButton;
@@ -76,7 +76,7 @@
 	private JRadioButton getMajorButton() {
 		if (majorButton == null) {
-			majorButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("LightMajorButton"))));
-			majorButton.setBounds(new Rectangle(0, 32, 105, 32));
+			majorButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/LightMajorButton.png")));
+			majorButton.setBounds(new Rectangle(0, 32, 35, 32));
 		}
 		return majorButton;
@@ -85,7 +85,7 @@
 	private JRadioButton getMinorButton() {
 		if (minorButton == null) {
-			minorButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("LightMinorButton"))));
-			minorButton.setBounds(new Rectangle(0, 64, 105, 32));
+			minorButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/LightMinorButton.png")));
+			minorButton.setBounds(new Rectangle(0, 64, 35, 32));
 		}
 		return minorButton;
@@ -94,7 +94,7 @@
 	private JRadioButton getVesselButton() {
 		if (vesselButton == null) {
-			vesselButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("LightVesselButton"))));
-			vesselButton.setBounds(new Rectangle(0, 96, 105, 32));
+			vesselButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/LightVesselButton.png")));
+			vesselButton.setBounds(new Rectangle(0, 96, 35, 32));
 		}
 		return vesselButton;
@@ -103,7 +103,7 @@
 	private JRadioButton getFloatButton() {
 		if (floatButton == null) {
-			floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("LightFloatButton"))));
-			floatButton.setBounds(new Rectangle(0, 128, 105, 32));
+			floatButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/LightFloatButton.png")));
+			floatButton.setBounds(new Rectangle(0, 128, 35, 32));
 		}
 		return floatButton;
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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java	(revision 24658)
@@ -35,5 +35,5 @@
 	private JRadioButton towerButton = null;
 	private JRadioButton perchButton = null;
-	
+
 	public PanelPort() {
 		super();
@@ -42,68 +42,68 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(getRegionAButton(), null);
-         this.add(getRegionBButton(), null);
-         this.add(getPillarButton(), null);
-         this.add(getSparButton(), null);
-         this.add(getCanButton(), null);
-         this.add(getFloatButton(), null);
-         this.add(getBeaconButton(), null);
-         this.add(getTowerButton(), null);
-         this.add(getPerchButton(), null);
-         
-         regionButtons = new ButtonGroup();
-         regionButtons.add(regionAButton);
-         regionButtons.add(regionBButton);
-			ActionListener alRegion = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					if (regionAButton.isSelected()) {
-						regionAButton.setEnabled(false);
-					} else { 
-						regionAButton.setEnabled(true);
-					}
-					if (regionBButton.isSelected()) {
-						regionBButton.setEnabled(false);
-					} else { 
-						regionBButton.setEnabled(true);
-					}
+		this.setLayout(null);
+		this.add(getRegionAButton(), null);
+		this.add(getRegionBButton(), null);
+		this.add(getPillarButton(), null);
+		this.add(getSparButton(), null);
+		this.add(getCanButton(), null);
+		this.add(getFloatButton(), null);
+		this.add(getBeaconButton(), null);
+		this.add(getTowerButton(), null);
+		this.add(getPerchButton(), null);
+
+		regionButtons = new ButtonGroup();
+		regionButtons.add(regionAButton);
+		regionButtons.add(regionBButton);
+		ActionListener alRegion = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				if (regionAButton.isSelected()) {
+					regionAButton.setEnabled(false);
+				} else {
+					regionAButton.setEnabled(true);
 				}
-			};
-			regionAButton.addActionListener(alRegion);
-			regionBButton.addActionListener(alRegion);
-         
-         shapeButtons = new ButtonGroup();
-         shapeButtons.add(pillarButton);
-         shapeButtons.add(sparButton);
-         shapeButtons.add(canButton);
-         shapeButtons.add(floatButton);
-         shapeButtons.add(beaconButton);
-         shapeButtons.add(towerButton);
-         shapeButtons.add(perchButton);
-			ActionListener alShape = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					pillarButton.setEnabled(!pillarButton.isSelected());
-					sparButton.setEnabled(!sparButton.isSelected());
-					canButton.setEnabled(!canButton.isSelected());
-					floatButton.setEnabled(!floatButton.isSelected());
-					beaconButton.setEnabled(!beaconButton.isSelected());
-					towerButton.setEnabled(!towerButton.isSelected());
-					perchButton.setEnabled(!perchButton.isSelected());
+				if (regionBButton.isSelected()) {
+					regionBButton.setEnabled(false);
+				} else {
+					regionBButton.setEnabled(true);
 				}
-			};
-			pillarButton.addActionListener(alShape);
-			sparButton.addActionListener(alShape);
-			canButton.addActionListener(alShape);
-			floatButton.addActionListener(alShape);
-			beaconButton.addActionListener(alShape);
-			towerButton.addActionListener(alShape);
-			perchButton.addActionListener(alShape);
+			}
+		};
+		regionAButton.addActionListener(alRegion);
+		regionBButton.addActionListener(alRegion);
+
+		shapeButtons = new ButtonGroup();
+		shapeButtons.add(pillarButton);
+		shapeButtons.add(sparButton);
+		shapeButtons.add(canButton);
+		shapeButtons.add(floatButton);
+		shapeButtons.add(beaconButton);
+		shapeButtons.add(towerButton);
+		shapeButtons.add(perchButton);
+		ActionListener alShape = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				pillarButton.setEnabled(!pillarButton.isSelected());
+				sparButton.setEnabled(!sparButton.isSelected());
+				canButton.setEnabled(!canButton.isSelected());
+				floatButton.setEnabled(!floatButton.isSelected());
+				beaconButton.setEnabled(!beaconButton.isSelected());
+				towerButton.setEnabled(!towerButton.isSelected());
+				perchButton.setEnabled(!perchButton.isSelected());
+			}
+		};
+		pillarButton.addActionListener(alShape);
+		sparButton.addActionListener(alShape);
+		canButton.addActionListener(alShape);
+		floatButton.addActionListener(alShape);
+		beaconButton.addActionListener(alShape);
+		towerButton.addActionListener(alShape);
+		perchButton.addActionListener(alShape);
 	}
 
 	private JRadioButton getRegionAButton() {
 		if (regionAButton == null) {
-			regionAButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 0, 65, 30));
+			regionAButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionAButton.png")));
+			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
 		}
 		return regionAButton;
@@ -112,7 +112,7 @@
 	private JRadioButton getRegionBButton() {
 		if (regionBButton == null) {
-			regionBButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(10, 30, 65, 30));
+			regionBButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionBButton.png")));
+			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
 		}
 		return regionBButton;
@@ -121,7 +121,7 @@
 	private JRadioButton getPillarButton() {
 		if (pillarButton == null) {
-			pillarButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(0, 64, 90, 32));
+			pillarButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
 		}
 		return pillarButton;
@@ -131,6 +131,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(0, 96, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
 		}
 		return sparButton;
@@ -140,6 +140,6 @@
 		if (canButton == null) {
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("CanButton"))));
-			canButton.setBounds(new Rectangle(0, 128, 90, 32));
+					"/images/CanButton.png")));
+			canButton.setBounds(new Rectangle(0, 128, 35, 32));
 		}
 		return canButton;
@@ -148,7 +148,7 @@
 	private JRadioButton getFloatButton() {
 		if (floatButton == null) {
-			floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(90, 0, 90, 32));
+			floatButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
 		}
 		return floatButton;
@@ -157,7 +157,7 @@
 	private JRadioButton getBeaconButton() {
 		if (beaconButton == null) {
-			beaconButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("BeaconButton"))));
-			beaconButton.setBounds(new Rectangle(90, 32, 90, 32));
+			beaconButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BeaconButton.png")));
+			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
 		}
 		return beaconButton;
@@ -166,7 +166,7 @@
 	private JRadioButton getTowerButton() {
 		if (towerButton == null) {
-			towerButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("TowerButton"))));
-			towerButton.setBounds(new Rectangle(90, 64, 90, 32));
+			towerButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/TowerButton.png")));
+			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
 		}
 		return towerButton;
@@ -175,11 +175,10 @@
 	private JRadioButton getPerchButton() {
 		if (perchButton == null) {
-			perchButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PerchPButton"))));
-			perchButton.setBounds(new Rectangle(90, 96, 90, 32));
+			perchButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PerchPButton.png")));
+			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
 		}
 		return perchButton;
 	}
 
-
 }
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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java	(revision 24658)
@@ -34,5 +34,5 @@
 	private JRadioButton beaconButton = null;
 	private JRadioButton towerButton = null;
-	
+
 	public PanelPrefPort() {
 		super();
@@ -41,64 +41,64 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(getRegionAButton(), null);
-         this.add(getRegionBButton(), null);
-         this.add(getPillarButton(), null);
-         this.add(getSparButton(), null);
-         this.add(getCanButton(), null);
-         this.add(getFloatButton(), null);
-         this.add(getBeaconButton(), null);
-         this.add(getTowerButton(), null);
-         
-         regionButtons = new ButtonGroup();
-         regionButtons.add(regionAButton);
-         regionButtons.add(regionBButton);
-			ActionListener alRegion = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					if (regionAButton.isSelected()) {
-						regionAButton.setEnabled(false);
-					} else { 
-						regionAButton.setEnabled(true);
-					}
-					if (regionBButton.isSelected()) {
-						regionBButton.setEnabled(false);
-					} else { 
-						regionBButton.setEnabled(true);
-					}
+		this.setLayout(null);
+		this.add(getRegionAButton(), null);
+		this.add(getRegionBButton(), null);
+		this.add(getPillarButton(), null);
+		this.add(getSparButton(), null);
+		this.add(getCanButton(), null);
+		this.add(getFloatButton(), null);
+		this.add(getBeaconButton(), null);
+		this.add(getTowerButton(), null);
+
+		regionButtons = new ButtonGroup();
+		regionButtons.add(regionAButton);
+		regionButtons.add(regionBButton);
+		ActionListener alRegion = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				if (regionAButton.isSelected()) {
+					regionAButton.setEnabled(false);
+				} else {
+					regionAButton.setEnabled(true);
 				}
-			};
-			regionAButton.addActionListener(alRegion);
-			regionBButton.addActionListener(alRegion);
-         
-         shapeButtons = new ButtonGroup();
-         shapeButtons.add(pillarButton);
-         shapeButtons.add(sparButton);
-         shapeButtons.add(canButton);
-         shapeButtons.add(floatButton);
-         shapeButtons.add(beaconButton);
-         shapeButtons.add(towerButton);
-			ActionListener alShape = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					pillarButton.setEnabled(!pillarButton.isSelected());
-					sparButton.setEnabled(!sparButton.isSelected());
-					canButton.setEnabled(!canButton.isSelected());
-					floatButton.setEnabled(!floatButton.isSelected());
-					beaconButton.setEnabled(!beaconButton.isSelected());
-					towerButton.setEnabled(!towerButton.isSelected());
+				if (regionBButton.isSelected()) {
+					regionBButton.setEnabled(false);
+				} else {
+					regionBButton.setEnabled(true);
 				}
-			};
-			pillarButton.addActionListener(alShape);
-			sparButton.addActionListener(alShape);
-			canButton.addActionListener(alShape);
-			floatButton.addActionListener(alShape);
-			beaconButton.addActionListener(alShape);
-			towerButton.addActionListener(alShape);
+			}
+		};
+		regionAButton.addActionListener(alRegion);
+		regionBButton.addActionListener(alRegion);
+
+		shapeButtons = new ButtonGroup();
+		shapeButtons.add(pillarButton);
+		shapeButtons.add(sparButton);
+		shapeButtons.add(canButton);
+		shapeButtons.add(floatButton);
+		shapeButtons.add(beaconButton);
+		shapeButtons.add(towerButton);
+		ActionListener alShape = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				pillarButton.setEnabled(!pillarButton.isSelected());
+				sparButton.setEnabled(!sparButton.isSelected());
+				canButton.setEnabled(!canButton.isSelected());
+				floatButton.setEnabled(!floatButton.isSelected());
+				beaconButton.setEnabled(!beaconButton.isSelected());
+				towerButton.setEnabled(!towerButton.isSelected());
+			}
+		};
+		pillarButton.addActionListener(alShape);
+		sparButton.addActionListener(alShape);
+		canButton.addActionListener(alShape);
+		floatButton.addActionListener(alShape);
+		beaconButton.addActionListener(alShape);
+		towerButton.addActionListener(alShape);
 	}
 
 	private JRadioButton getRegionAButton() {
 		if (regionAButton == null) {
-			regionAButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 0, 65, 30));
+			regionAButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionAButton.png")));
+			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
 		}
 		return regionAButton;
@@ -107,7 +107,7 @@
 	private JRadioButton getRegionBButton() {
 		if (regionBButton == null) {
-			regionBButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(10, 30, 65, 30));
+			regionBButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionBButton.png")));
+			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
 		}
 		return regionBButton;
@@ -116,7 +116,7 @@
 	private JRadioButton getPillarButton() {
 		if (pillarButton == null) {
-			pillarButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(0, 64, 90, 32));
+			pillarButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
 		}
 		return pillarButton;
@@ -126,6 +126,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(0, 96, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
 		}
 		return sparButton;
@@ -135,6 +135,6 @@
 		if (canButton == null) {
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("CanButton"))));
-			canButton.setBounds(new Rectangle(0, 128, 90, 32));
+					"/images/CanButton.png")));
+			canButton.setBounds(new Rectangle(0, 128, 35, 32));
 		}
 		return canButton;
@@ -143,7 +143,7 @@
 	private JRadioButton getFloatButton() {
 		if (floatButton == null) {
-			floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(90, 0, 90, 32));
+			floatButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
 		}
 		return floatButton;
@@ -152,7 +152,7 @@
 	private JRadioButton getBeaconButton() {
 		if (beaconButton == null) {
-			beaconButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("BeaconButton"))));
-			beaconButton.setBounds(new Rectangle(90, 32, 90, 32));
+			beaconButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BeaconButton.png")));
+			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
 		}
 		return beaconButton;
@@ -161,7 +161,7 @@
 	private JRadioButton getTowerButton() {
 		if (towerButton == null) {
-			towerButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("TowerButton"))));
-			towerButton.setBounds(new Rectangle(90, 64, 90, 32));
+			towerButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/TowerButton.png")));
+			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
 		}
 		return towerButton;
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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java	(revision 24658)
@@ -34,5 +34,5 @@
 	private JRadioButton beaconButton = null;
 	private JRadioButton towerButton = null;
-	
+
 	public PanelPrefStbd() {
 		super();
@@ -41,64 +41,64 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(getRegionAButton(), null);
-         this.add(getRegionBButton(), null);
-         this.add(getPillarButton(), null);
-         this.add(getSparButton(), null);
-         this.add(getConeButton(), null);
-         this.add(getFloatButton(), null);
-         this.add(getBeaconButton(), null);
-         this.add(getTowerButton(), null);
-         
-         regionButtons = new ButtonGroup();
-         regionButtons.add(regionAButton);
-         regionButtons.add(regionBButton);
-			ActionListener alRegion = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					if (regionAButton.isSelected()) {
-						regionAButton.setEnabled(false);
-					} else { 
-						regionAButton.setEnabled(true);
-					}
-					if (regionBButton.isSelected()) {
-						regionBButton.setEnabled(false);
-					} else { 
-						regionBButton.setEnabled(true);
-					}
+		this.setLayout(null);
+		this.add(getRegionAButton(), null);
+		this.add(getRegionBButton(), null);
+		this.add(getPillarButton(), null);
+		this.add(getSparButton(), null);
+		this.add(getConeButton(), null);
+		this.add(getFloatButton(), null);
+		this.add(getBeaconButton(), null);
+		this.add(getTowerButton(), null);
+
+		regionButtons = new ButtonGroup();
+		regionButtons.add(regionAButton);
+		regionButtons.add(regionBButton);
+		ActionListener alRegion = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				if (regionAButton.isSelected()) {
+					regionAButton.setEnabled(false);
+				} else {
+					regionAButton.setEnabled(true);
 				}
-			};
-			regionAButton.addActionListener(alRegion);
-			regionBButton.addActionListener(alRegion);
-         
-         shapeButtons = new ButtonGroup();
-         shapeButtons.add(pillarButton);
-         shapeButtons.add(sparButton);
-         shapeButtons.add(coneButton);
-         shapeButtons.add(floatButton);
-         shapeButtons.add(beaconButton);
-         shapeButtons.add(towerButton);
-			ActionListener alShape = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					pillarButton.setEnabled(!pillarButton.isSelected());
-					sparButton.setEnabled(!sparButton.isSelected());
-					coneButton.setEnabled(!coneButton.isSelected());
-					floatButton.setEnabled(!floatButton.isSelected());
-					beaconButton.setEnabled(!beaconButton.isSelected());
-					towerButton.setEnabled(!towerButton.isSelected());
+				if (regionBButton.isSelected()) {
+					regionBButton.setEnabled(false);
+				} else {
+					regionBButton.setEnabled(true);
 				}
-			};
-			pillarButton.addActionListener(alShape);
-			sparButton.addActionListener(alShape);
-			coneButton.addActionListener(alShape);
-			floatButton.addActionListener(alShape);
-			beaconButton.addActionListener(alShape);
-			towerButton.addActionListener(alShape);
+			}
+		};
+		regionAButton.addActionListener(alRegion);
+		regionBButton.addActionListener(alRegion);
+
+		shapeButtons = new ButtonGroup();
+		shapeButtons.add(pillarButton);
+		shapeButtons.add(sparButton);
+		shapeButtons.add(coneButton);
+		shapeButtons.add(floatButton);
+		shapeButtons.add(beaconButton);
+		shapeButtons.add(towerButton);
+		ActionListener alShape = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				pillarButton.setEnabled(!pillarButton.isSelected());
+				sparButton.setEnabled(!sparButton.isSelected());
+				coneButton.setEnabled(!coneButton.isSelected());
+				floatButton.setEnabled(!floatButton.isSelected());
+				beaconButton.setEnabled(!beaconButton.isSelected());
+				towerButton.setEnabled(!towerButton.isSelected());
+			}
+		};
+		pillarButton.addActionListener(alShape);
+		sparButton.addActionListener(alShape);
+		coneButton.addActionListener(alShape);
+		floatButton.addActionListener(alShape);
+		beaconButton.addActionListener(alShape);
+		towerButton.addActionListener(alShape);
 	}
 
 	private JRadioButton getRegionAButton() {
 		if (regionAButton == null) {
-			regionAButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 0, 65, 30));
+			regionAButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionAButton.png")));
+			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
 		}
 		return regionAButton;
@@ -107,7 +107,7 @@
 	private JRadioButton getRegionBButton() {
 		if (regionBButton == null) {
-			regionBButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(10, 30, 65, 30));
+			regionBButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionBButton.png")));
+			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
 		}
 		return regionBButton;
@@ -116,7 +116,7 @@
 	private JRadioButton getPillarButton() {
 		if (pillarButton == null) {
-			pillarButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(0, 64, 90, 32));
+			pillarButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
 		}
 		return pillarButton;
@@ -126,6 +126,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(0, 96, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
 		}
 		return sparButton;
@@ -135,6 +135,6 @@
 		if (coneButton == null) {
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("ConeButton"))));
-			coneButton.setBounds(new Rectangle(0, 128, 90, 32));
+					"/images/ConeButton.png")));
+			coneButton.setBounds(new Rectangle(0, 128, 35, 32));
 		}
 		return coneButton;
@@ -143,7 +143,7 @@
 	private JRadioButton getFloatButton() {
 		if (floatButton == null) {
-			floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(90, 0, 90, 32));
+			floatButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
 		}
 		return floatButton;
@@ -152,7 +152,7 @@
 	private JRadioButton getBeaconButton() {
 		if (beaconButton == null) {
-			beaconButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("BeaconButton"))));
-			beaconButton.setBounds(new Rectangle(90, 32, 90, 32));
+			beaconButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BeaconButton.png")));
+			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
 		}
 		return beaconButton;
@@ -161,7 +161,7 @@
 	private JRadioButton getTowerButton() {
 		if (towerButton == null) {
-			towerButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("TowerButton"))));
-			towerButton.setBounds(new Rectangle(90, 64, 90, 32));
+			towerButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/TowerButton.png")));
+			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
 		}
 		return towerButton;
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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java	(revision 24658)
@@ -30,5 +30,5 @@
 	private JRadioButton barrelButton = null;
 	private JRadioButton floatButton = null;
-	
+
 	public PanelSafeWater() {
 		super();
@@ -37,38 +37,38 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(getPillarButton(), null);
-         this.add(getSparButton(), null);
-         this.add(getSphereButton(), null);
-         this.add(getBarrelButton(), null);
-         this.add(getFloatButton(), null);
-         
-         shapeButtons = new ButtonGroup();
-         shapeButtons.add(pillarButton);
-         shapeButtons.add(sparButton);
-         shapeButtons.add(sphereButton);
-         shapeButtons.add(barrelButton);
-         shapeButtons.add(floatButton);
-			ActionListener alShape = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					pillarButton.setEnabled(!pillarButton.isSelected());
-					sparButton.setEnabled(!sparButton.isSelected());
-					sphereButton.setEnabled(!sphereButton.isSelected());
-					barrelButton.setEnabled(!barrelButton.isSelected());
-					floatButton.setEnabled(!floatButton.isSelected());
-				}
-			};
-			pillarButton.addActionListener(alShape);
-			sparButton.addActionListener(alShape);
-			sphereButton.addActionListener(alShape);
-			barrelButton.addActionListener(alShape);
-			floatButton.addActionListener(alShape);
+		this.setLayout(null);
+		this.add(getPillarButton(), null);
+		this.add(getSparButton(), null);
+		this.add(getSphereButton(), null);
+		this.add(getBarrelButton(), null);
+		this.add(getFloatButton(), null);
+
+		shapeButtons = new ButtonGroup();
+		shapeButtons.add(pillarButton);
+		shapeButtons.add(sparButton);
+		shapeButtons.add(sphereButton);
+		shapeButtons.add(barrelButton);
+		shapeButtons.add(floatButton);
+		ActionListener alShape = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				pillarButton.setEnabled(!pillarButton.isSelected());
+				sparButton.setEnabled(!sparButton.isSelected());
+				sphereButton.setEnabled(!sphereButton.isSelected());
+				barrelButton.setEnabled(!barrelButton.isSelected());
+				floatButton.setEnabled(!floatButton.isSelected());
+			}
+		};
+		pillarButton.addActionListener(alShape);
+		sparButton.addActionListener(alShape);
+		sphereButton.addActionListener(alShape);
+		barrelButton.addActionListener(alShape);
+		floatButton.addActionListener(alShape);
 	}
 
 	private JRadioButton getPillarButton() {
 		if (pillarButton == null) {
-			pillarButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(0, 0, 90, 32));
+			pillarButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(0, 0, 35, 32));
 		}
 		return pillarButton;
@@ -78,6 +78,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(0, 32, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(0, 32, 35, 32));
 		}
 		return sparButton;
@@ -86,7 +86,7 @@
 	private JRadioButton getSphereButton() {
 		if (sphereButton == null) {
-			sphereButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SphereButton"))));
-			sphereButton.setBounds(new Rectangle(0, 64, 90, 32));
+			sphereButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/SphereButton.png")));
+			sphereButton.setBounds(new Rectangle(0, 64, 35, 32));
 		}
 		return sphereButton;
@@ -95,7 +95,7 @@
 	private JRadioButton getBarrelButton() {
 		if (barrelButton == null) {
-			barrelButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("BarrelButton"))));
-			barrelButton.setBounds(new Rectangle(0, 96, 90, 32));
+			barrelButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BarrelButton.png")));
+			barrelButton.setBounds(new Rectangle(0, 96, 35, 32));
 		}
 		return barrelButton;
@@ -104,7 +104,7 @@
 	private JRadioButton getFloatButton() {
 		if (floatButton == null) {
-			floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(0, 128, 90, 32));
+			floatButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(0, 128, 35, 32));
 		}
 		return floatButton;
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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java	(revision 24658)
@@ -153,6 +153,6 @@
 		if (pillarButton == null) {
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(105, 0, 90, 32));
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(105, 0, 35, 32));
 		}
 		return pillarButton;
@@ -162,6 +162,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(105, 32, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(105, 32, 35, 32));
 		}
 		return sparButton;
@@ -171,6 +171,6 @@
 		if (canButton == null) {
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("CanButton"))));
-			canButton.setBounds(new Rectangle(105, 64, 90, 32));
+					"/images/CanButton.png")));
+			canButton.setBounds(new Rectangle(105, 64, 35, 32));
 		}
 		return canButton;
@@ -180,6 +180,6 @@
 		if (coneButton == null) {
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("ConeButton"))));
-			coneButton.setBounds(new Rectangle(105, 96, 90, 32));
+					"/images/ConeButton.png")));
+			coneButton.setBounds(new Rectangle(105, 96, 35, 32));
 		}
 		return coneButton;
@@ -188,7 +188,7 @@
 	private JRadioButton getSphereButton() {
 		if (sphereButton == null) {
-			sphereButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SphereButton"))));
-			sphereButton.setBounds(new Rectangle(105, 128, 90, 32));
+			sphereButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/SphereButton.png")));
+			sphereButton.setBounds(new Rectangle(105, 128, 35, 32));
 		}
 		return sphereButton;
@@ -197,7 +197,7 @@
 	private JRadioButton getBarrelButton() {
 		if (barrelButton == null) {
-			barrelButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("BarrelButton"))));
-			barrelButton.setBounds(new Rectangle(195, 0, 90, 32));
+			barrelButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BarrelButton.png")));
+			barrelButton.setBounds(new Rectangle(140, 0, 35, 32));
 		}
 		return barrelButton;
@@ -206,7 +206,7 @@
 	private JRadioButton getSuperButton() {
 		if (superButton == null) {
-			superButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SuperButton"))));
-			superButton.setBounds(new Rectangle(195, 32, 90, 32));
+			superButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/SuperButton.png")));
+			superButton.setBounds(new Rectangle(140, 32, 35, 32));
 		}
 		return superButton;
@@ -216,6 +216,6 @@
 		if (floatButton == null) {
 			floatButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(195, 64, 90, 32));
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(140, 64, 35, 32));
 		}
 		return floatButton;
@@ -225,6 +225,6 @@
 		if (beaconButton == null) {
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("BeaconButton"))));
-			beaconButton.setBounds(new Rectangle(195, 96, 90, 32));
+					.getResource("/images/BeaconButton.png")));
+			beaconButton.setBounds(new Rectangle(140, 96, 35, 32));
 		}
 		return beaconButton;
@@ -234,6 +234,6 @@
 		if (towerButton == null) {
 			towerButton = new JRadioButton(new ImageIcon(getClass()
-					.getResource(Messages.getString("TowerButton"))));
-			towerButton.setBounds(new Rectangle(195, 128, 90, 32));
+					.getResource("/images/TowerButton.png")));
+			towerButton.setBounds(new Rectangle(140, 128, 35, 32));
 		}
 		return towerButton;
@@ -242,5 +242,6 @@
 	private JRadioButton getWhiteButton() {
 		if (whiteButton == null) {
-			whiteButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WhiteButton.png")));
+			whiteButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/WhiteButton.png")));
 			whiteButton.setBounds(new Rectangle(4, 32, 33, 32));
 			whiteButton.setToolTipText(tr("White"));
@@ -251,5 +252,6 @@
 	private JRadioButton getRedButton() {
 		if (redButton == null) {
-			redButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/RedButton.png")));
+			redButton = new JRadioButton(new ImageIcon(getClass().getResource(
+					"/images/RedButton.png")));
 			redButton.setBounds(new Rectangle(37, 32, 33, 32));
 			redButton.setToolTipText(tr("Red"));
@@ -260,5 +262,6 @@
 	private JRadioButton getOrangeButton() {
 		if (orangeButton == null) {
-			orangeButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/OrangeButton.png")));
+			orangeButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/OrangeButton.png")));
 			orangeButton.setBounds(new Rectangle(70, 32, 33, 32));
 			orangeButton.setToolTipText(tr("Orange"));
@@ -269,5 +272,6 @@
 	private JRadioButton getAmberButton() {
 		if (amberButton == null) {
-			amberButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/AmberButton.png")));
+			amberButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/AmberButton.png")));
 			amberButton.setBounds(new Rectangle(4, 64, 33, 32));
 			amberButton.setToolTipText(tr("Amber"));
@@ -278,5 +282,6 @@
 	private JRadioButton getYellowButton() {
 		if (yellowButton == null) {
-			yellowButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/YellowButton.png")));
+			yellowButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/YellowButton.png")));
 			yellowButton.setBounds(new Rectangle(37, 64, 33, 32));
 			yellowButton.setToolTipText(tr("Yellow"));
@@ -287,5 +292,6 @@
 	private JRadioButton getGreenButton() {
 		if (greenButton == null) {
-			greenButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/GreenButton.png")));
+			greenButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/GreenButton.png")));
 			greenButton.setBounds(new Rectangle(70, 64, 33, 32));
 			greenButton.setToolTipText(tr("Green"));
@@ -296,5 +302,6 @@
 	private JRadioButton getBlueButton() {
 		if (blueButton == null) {
-			blueButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlueButton.png")));
+			blueButton = new JRadioButton(new ImageIcon(getClass().getResource(
+					"/images/BlueButton.png")));
 			blueButton.setBounds(new Rectangle(4, 96, 33, 32));
 			blueButton.setToolTipText(tr("Blue"));
@@ -305,5 +312,6 @@
 	private JRadioButton getVioletButton() {
 		if (violetButton == null) {
-			violetButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/VioletButton.png")));
+			violetButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/VioletButton.png")));
 			violetButton.setBounds(new Rectangle(37, 96, 33, 32));
 			violetButton.setToolTipText(tr("Violet"));
@@ -314,5 +322,6 @@
 	private JRadioButton getBlackButton() {
 		if (blackButton == null) {
-			blackButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/BlackButton.png")));
+			blackButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BlackButton.png")));
 			blackButton.setBounds(new Rectangle(70, 96, 33, 32));
 			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 24654)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java	(revision 24658)
@@ -35,5 +35,5 @@
 	private JRadioButton towerButton = null;
 	private JRadioButton perchButton = null;
-	
+
 	public PanelStbd() {
 		super();
@@ -42,68 +42,68 @@
 
 	private void initialize() {
-         this.setLayout(null);
-         this.add(getRegionAButton(), null);
-         this.add(getRegionBButton(), null);
-         this.add(getPillarButton(), null);
-         this.add(getSparButton(), null);
-         this.add(getConeButton(), null);
-         this.add(getFloatButton(), null);
-         this.add(getBeaconButton(), null);
-         this.add(getTowerButton(), null);
-         this.add(getPerchButton(), null);
-         
-         regionButtons = new ButtonGroup();
-         regionButtons.add(regionAButton);
-         regionButtons.add(regionBButton);
-			ActionListener alRegion = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					if (regionAButton.isSelected()) {
-						regionAButton.setEnabled(false);
-					} else { 
-						regionAButton.setEnabled(true);
-					}
-					if (regionBButton.isSelected()) {
-						regionBButton.setEnabled(false);
-					} else { 
-						regionBButton.setEnabled(true);
-					}
+		this.setLayout(null);
+		this.add(getRegionAButton(), null);
+		this.add(getRegionBButton(), null);
+		this.add(getPillarButton(), null);
+		this.add(getSparButton(), null);
+		this.add(getConeButton(), null);
+		this.add(getFloatButton(), null);
+		this.add(getBeaconButton(), null);
+		this.add(getTowerButton(), null);
+		this.add(getPerchButton(), null);
+
+		regionButtons = new ButtonGroup();
+		regionButtons.add(regionAButton);
+		regionButtons.add(regionBButton);
+		ActionListener alRegion = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				if (regionAButton.isSelected()) {
+					regionAButton.setEnabled(false);
+				} else {
+					regionAButton.setEnabled(true);
 				}
-			};
-			regionAButton.addActionListener(alRegion);
-			regionBButton.addActionListener(alRegion);
-         
-         shapeButtons = new ButtonGroup();
-         shapeButtons.add(pillarButton);
-         shapeButtons.add(sparButton);
-         shapeButtons.add(coneButton);
-         shapeButtons.add(floatButton);
-         shapeButtons.add(beaconButton);
-         shapeButtons.add(towerButton);
-         shapeButtons.add(perchButton);
-			ActionListener alShape = new ActionListener() {
-				public void actionPerformed(java.awt.event.ActionEvent e) {
-					pillarButton.setEnabled(!pillarButton.isSelected());
-					sparButton.setEnabled(!sparButton.isSelected());
-					coneButton.setEnabled(!coneButton.isSelected());
-					floatButton.setEnabled(!floatButton.isSelected());
-					beaconButton.setEnabled(!beaconButton.isSelected());
-					towerButton.setEnabled(!towerButton.isSelected());
-					perchButton.setEnabled(!perchButton.isSelected());
+				if (regionBButton.isSelected()) {
+					regionBButton.setEnabled(false);
+				} else {
+					regionBButton.setEnabled(true);
 				}
-			};
-			pillarButton.addActionListener(alShape);
-			sparButton.addActionListener(alShape);
-			coneButton.addActionListener(alShape);
-			floatButton.addActionListener(alShape);
-			beaconButton.addActionListener(alShape);
-			towerButton.addActionListener(alShape);
-			perchButton.addActionListener(alShape);
+			}
+		};
+		regionAButton.addActionListener(alRegion);
+		regionBButton.addActionListener(alRegion);
+
+		shapeButtons = new ButtonGroup();
+		shapeButtons.add(pillarButton);
+		shapeButtons.add(sparButton);
+		shapeButtons.add(coneButton);
+		shapeButtons.add(floatButton);
+		shapeButtons.add(beaconButton);
+		shapeButtons.add(towerButton);
+		shapeButtons.add(perchButton);
+		ActionListener alShape = new ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent e) {
+				pillarButton.setEnabled(!pillarButton.isSelected());
+				sparButton.setEnabled(!sparButton.isSelected());
+				coneButton.setEnabled(!coneButton.isSelected());
+				floatButton.setEnabled(!floatButton.isSelected());
+				beaconButton.setEnabled(!beaconButton.isSelected());
+				towerButton.setEnabled(!towerButton.isSelected());
+				perchButton.setEnabled(!perchButton.isSelected());
+			}
+		};
+		pillarButton.addActionListener(alShape);
+		sparButton.addActionListener(alShape);
+		coneButton.addActionListener(alShape);
+		floatButton.addActionListener(alShape);
+		beaconButton.addActionListener(alShape);
+		towerButton.addActionListener(alShape);
+		perchButton.addActionListener(alShape);
 	}
 
 	private JRadioButton getRegionAButton() {
 		if (regionAButton == null) {
-			regionAButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(10, 0, 65, 30));
+			regionAButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionAButton.png")));
+			regionAButton.setBounds(new Rectangle(0, 0, 35, 30));
 		}
 		return regionAButton;
@@ -112,7 +112,7 @@
 	private JRadioButton getRegionBButton() {
 		if (regionBButton == null) {
-			regionBButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					"/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(10, 30, 65, 30));
+			regionBButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/RegionBButton.png")));
+			regionBButton.setBounds(new Rectangle(0, 30, 35, 30));
 		}
 		return regionBButton;
@@ -121,7 +121,7 @@
 	private JRadioButton getPillarButton() {
 		if (pillarButton == null) {
-			pillarButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PillarButton"))));
-			pillarButton.setBounds(new Rectangle(0, 64, 90, 32));
+			pillarButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PillarButton.png")));
+			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
 		}
 		return pillarButton;
@@ -131,6 +131,6 @@
 		if (sparButton == null) {
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("SparButton"))));
-			sparButton.setBounds(new Rectangle(0, 96, 90, 32));
+					"/images/SparButton.png")));
+			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
 		}
 		return sparButton;
@@ -140,6 +140,6 @@
 		if (coneButton == null) {
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("ConeButton"))));
-			coneButton.setBounds(new Rectangle(0, 128, 90, 32));
+					"/images/ConeButton.png")));
+			coneButton.setBounds(new Rectangle(0, 128, 35, 32));
 		}
 		return coneButton;
@@ -148,7 +148,7 @@
 	private JRadioButton getFloatButton() {
 		if (floatButton == null) {
-			floatButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("FloatButton"))));
-			floatButton.setBounds(new Rectangle(90, 0, 90, 32));
+			floatButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/FloatButton.png")));
+			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
 		}
 		return floatButton;
@@ -157,7 +157,7 @@
 	private JRadioButton getBeaconButton() {
 		if (beaconButton == null) {
-			beaconButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("BeaconButton"))));
-			beaconButton.setBounds(new Rectangle(90, 32, 90, 32));
+			beaconButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/BeaconButton.png")));
+			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
 		}
 		return beaconButton;
@@ -166,7 +166,7 @@
 	private JRadioButton getTowerButton() {
 		if (towerButton == null) {
-			towerButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("TowerButton"))));
-			towerButton.setBounds(new Rectangle(90, 64, 90, 32));
+			towerButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/TowerButton.png")));
+			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
 		}
 		return towerButton;
@@ -175,11 +175,10 @@
 	private JRadioButton getPerchButton() {
 		if (perchButton == null) {
-			perchButton = new JRadioButton(new ImageIcon(getClass().getResource(
-					Messages.getString("PerchSButton"))));
-			perchButton.setBounds(new Rectangle(90, 96, 90, 32));
+			perchButton = new JRadioButton(new ImageIcon(getClass()
+					.getResource("/images/PerchSButton.png")));
+			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
 		}
 		return perchButton;
 	}
 
-
 }