diff --git a/map/martin/sprites/navigatum/default_1.svg b/map/martin/sprites/navigatum/default_1.svg
index 9a3e4f3f4..d5d000b54 100644
--- a/map/martin/sprites/navigatum/default_1.svg
+++ b/map/martin/sprites/navigatum/default_1.svg
@@ -1,53 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 18 18"
-   version="1.1"
-   id="svg4986"
-   height="18"
-   width="18">
-  <defs
-     id="defs4988" />
-  <metadata
-     id="metadata4991">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-53.499985,-902.86218)"
-     id="layer1">
-    <g
-       id="generic-md-1"
-       transform="translate(-180,480)">
-      <rect
-         rx="2.4000025"
-         ry="2.4000025"
-         y="422.86218"
-         x="233.49998"
-         height="18"
-         width="18"
-         id="rect3443"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#3a3836;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.20000005;marker:none;enable-background:accumulate" />
-      <rect
-         rx="1.2307723"
-         ry="1.2307742"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.23077071;marker:none;enable-background:accumulate"
-         id="rect3445"
-         width="16.000006"
-         height="16.000031"
-         x="234.49998"
-         y="423.86218" />
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18">
+  <g fill-rule="evenodd" color="#3a3836" transform="translate(-233.5 -422.86)">
+    <rect width="18" height="18" x="233.5" y="422.86" fill="#3a3836" overflow="visible" rx="2.4" ry="2.4" style="marker:none"/>
+    <rect width="16" height="16" x="234.5" y="423.86" fill="#fff" overflow="visible" rx="1.23" ry="1.23" style="marker:none"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/default_2.svg b/map/martin/sprites/navigatum/default_2.svg
index 74d87987f..15bada2fc 100644
--- a/map/martin/sprites/navigatum/default_2.svg
+++ b/map/martin/sprites/navigatum/default_2.svg
@@ -1,54 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 25 18"
-   version="1.1"
-   id="svg5037"
-   height="18"
-   width="25">
-  <defs
-     id="defs5039" />
-  <metadata
-     id="metadata5042">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-54.999985,-921.36219)"
-     id="layer1">
-    <g
-       id="generic-md-2"
-       transform="translate(-180,480)">
-      <rect
-         transform="translate(0,-1.5169706e-4)"
-         rx="2.3809547"
-         ry="2.4000025"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#3a3836;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.1952287;marker:none;enable-background:accumulate"
-         id="rect3449"
-         width="25"
-         height="18"
-         x="234.99998"
-         y="441.36218" />
-      <rect
-         rx="1.210529"
-         ry="1.2307718"
-         y="442.36218"
-         x="235.99998"
-         height="16"
-         width="23"
-         id="rect3451"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.22060561;marker:none;enable-background:accumulate" />
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 18">
+  <g fill-rule="evenodd" color="#3a3836" transform="translate(-235 -441.36)">
+    <rect width="25" height="18" x="235" y="441.36" fill="#3a3836" overflow="visible" rx="2.38" ry="2.4" style="marker:none"/>
+    <rect width="23" height="16" x="236" y="442.36" fill="#fff" overflow="visible" rx="1.21" ry="1.23" style="marker:none"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/default_3.svg b/map/martin/sprites/navigatum/default_3.svg
index 218ab6227..04e687aca 100644
--- a/map/martin/sprites/navigatum/default_3.svg
+++ b/map/martin/sprites/navigatum/default_3.svg
@@ -1,53 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 32.400002 18"
-   version="1.1"
-   id="svg5088"
-   height="18"
-   width="32.400002">
-  <defs
-     id="defs5090" />
-  <metadata
-     id="metadata5093">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-54.999985,-941.36218)"
-     id="layer1">
-    <g
-       id="generic-md-3"
-       transform="translate(-180,480)">
-      <rect
-         rx="2.4000025"
-         ry="2.4000025"
-         y="461.36218"
-         x="234.99998"
-         height="18"
-         width="32.400002"
-         id="rect3455"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#3a3836;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.20000005;marker:none;enable-background:accumulate" />
-      <rect
-         rx="1.2000027"
-         ry="1.2307718"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21528721;marker:none;enable-background:accumulate"
-         id="rect3457"
-         width="30"
-         height="15.999998"
-         x="235.99998"
-         y="462.36218" />
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32.4 18">
+  <g fill-rule="evenodd" color="#3a3836" transform="translate(-235 -461.36)">
+    <rect width="32.4" height="18" x="235" y="461.36" fill="#3a3836" overflow="visible" rx="2.4" ry="2.4" style="marker:none"/>
+    <rect width="30" height="16" x="236" y="462.36" fill="#fff" overflow="visible" rx="1.2" ry="1.23" style="marker:none"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/default_4.svg b/map/martin/sprites/navigatum/default_4.svg
index f0f4ff181..c0fe4f031 100644
--- a/map/martin/sprites/navigatum/default_4.svg
+++ b/map/martin/sprites/navigatum/default_4.svg
@@ -1,53 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 39 18"
-   version="1.1"
-   id="svg5088"
-   height="18"
-   width="39">
-  <defs
-     id="defs5090" />
-  <metadata
-     id="metadata5093">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-54.999985,-941.36218)"
-     id="layer1">
-    <g
-       id="generic-md-3"
-       transform="translate(-180,480)">
-      <rect
-         rx="2.3636391"
-         ry="2.4000025"
-         y="461.36218"
-         x="234.99998"
-         height="18"
-         width="39"
-         id="rect3455"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#3a3836;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.19087458;marker:none;enable-background:accumulate" />
-      <rect
-         rx="1.1935509"
-         ry="1.2307712"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21201575;marker:none;enable-background:accumulate"
-         id="rect3457"
-         width="37"
-         height="15.999991"
-         x="235.99998"
-         y="462.36218" />
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 39 18">
+  <g fill-rule="evenodd" color="#3a3836" transform="translate(-235 -461.36)">
+    <rect width="39" height="18" x="235" y="461.36" fill="#3a3836" overflow="visible" rx="2.36" ry="2.4" style="marker:none"/>
+    <rect width="37" height="16" x="236" y="462.36" fill="#fff" overflow="visible" rx="1.19" ry="1.23" style="marker:none"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/default_5.svg b/map/martin/sprites/navigatum/default_5.svg
index 35ee92b06..34666c011 100644
--- a/map/martin/sprites/navigatum/default_5.svg
+++ b/map/martin/sprites/navigatum/default_5.svg
@@ -1,53 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 45 18"
-   version="1.1"
-   id="svg5088"
-   height="18"
-   width="45">
-  <defs
-     id="defs5090" />
-  <metadata
-     id="metadata5093">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-55,-941.36218)"
-     id="layer1">
-    <g
-       id="generic-md-3"
-       transform="translate(-180,480)">
-      <rect
-         rx="2.9999888"
-         ry="2.9999888"
-         y="461.36218"
-         x="235"
-         height="18"
-         width="45"
-         id="rect3455"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#3a3836;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.19755852;marker:none;enable-background:accumulate" />
-      <rect
-         rx="1.9999888"
-         ry="1.9999888"
-         style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21788085;marker:none;enable-background:accumulate"
-         id="rect3457"
-         width="43"
-         height="15.999989"
-         x="235.99998"
-         y="462.36218" />
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 18">
+  <g fill-rule="evenodd" color="#3a3836" transform="translate(-235 -461.36)">
+    <rect width="45" height="18" x="235" y="461.36" fill="#3a3836" overflow="visible" rx="3" ry="3" style="marker:none"/>
+    <rect width="43" height="16" x="236" y="462.36" fill="#fff" overflow="visible" rx="2" ry="2" style="marker:none"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/default_6.svg b/map/martin/sprites/navigatum/default_6.svg
index 1959bd9f2..ad939d0ef 100644
--- a/map/martin/sprites/navigatum/default_6.svg
+++ b/map/martin/sprites/navigatum/default_6.svg
@@ -1,56 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   viewBox="0 0 50 18"
-   version="1.1"
-   id="svg5088"
-   height="18"
-   width="50">
-  <defs
-     id="defs5090" />
-  <metadata
-     id="metadata5093">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-54.999985,-941.36218)"
-     id="layer1">
-    <g
-       id="generic-md-3"
-       transform="translate(-180,480)">
-      <g
-         id="g6358">
-        <rect
-           style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#3a3836;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.18501282;marker:none;enable-background:accumulate"
-           id="rect3455"
-           width="50"
-           height="18"
-           x="234.99998"
-           y="461.36218"
-           ry="2.9999888"
-           rx="2.9999888" />
-        <rect
-           y="462.36218"
-           x="235.99998"
-           height="16.000008"
-           width="48"
-           id="rect3457"
-           style="color:#3a3836;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.20398235;marker:none;enable-background:accumulate"
-           ry="1.9999888"
-           rx="1.9999888" />
-      </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 18">
+  <g fill-rule="evenodd" color="#3a3836" transform="translate(-235 -461.36)">
+    <rect width="50" height="18" x="235" y="461.36" fill="#3a3836" overflow="visible" rx="3" ry="3" style="marker:none"/>
+    <rect width="48" height="16" x="236" y="462.36" fill="#fff" overflow="visible" rx="2" ry="2" style="marker:none"/>
   </g>
-</svg>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/exit-alt1.svg b/map/martin/sprites/navigatum/exit-alt1.svg
index 4d177de0f..1398d6441 100644
--- a/map/martin/sprites/navigatum/exit-alt1.svg
+++ b/map/martin/sprites/navigatum/exit-alt1.svg
@@ -1,16 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="entrance-alt1"
-   width="15"
-   height="15"
-   viewBox="0 0 15 15"
-   version="1.1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <path
-     id="path1"
-     style="display:inline"
-     d="M 5.5 1 C 4.8333343 1 4.8333343 2 5.5 2 L 11.5 2 C 11.776142 2 12 2.2238579 12 2.5 L 12 12.5 C 12 12.776142 11.776142 13 11.5 13 L 5.25 13 C 4.5833343 13 4.5833343 14 5.25 14 L 12 14 C 12.552284 14 13 13.552284 13 13 L 13 2 C 13 1.4477159 12.552284 1 12 1 L 5.5 1 z M 5.1113281 4.5058594 C 4.9873971 4.4977312 4.8560969 4.5405067 4.7382812 4.6542969 L 2.0722656 7.3300781 C 1.9743367 7.42776 2.0722656 7.6855469 2.0722656 7.6855469 L 4.7382812 10.361328 C 5.209544 10.816489 5.9004732 10.125559 5.4453125 9.6542969 L 3.8007812 8 L 10.5 8 C 11.166666 8 11.166666 7 10.5 7 L 3.8007812 7 L 5.4453125 5.3613281 C 5.7866831 5.0078812 5.4831213 4.5302438 5.1113281 4.5058594 z " />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
+  <path d="M5.5 1c-.67 0-.67 1 0 1h6c.28 0 .5.22.5.5v10a.5.5 0 0 1-.5.5H5.25c-.67 0-.67 1 0 1H12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H5.5zm-.39 3.5a.48.48 0 0 0-.37.15L2.07 7.33c-.1.1 0 .36 0 .36l2.67 2.67c.47.46 1.16-.23.7-.7L3.8 8h6.7c.67 0 .67-1 0-1H3.8l1.65-1.64c.34-.35.03-.83-.34-.85z"/>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/pedestrian_polygon.svg b/map/martin/sprites/navigatum/pedestrian_polygon.svg
deleted file mode 100644
index 16d599f33..000000000
--- a/map/martin/sprites/navigatum/pedestrian_polygon.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-  <title>pedestrian-polygon</title>
-  <g>
-    <polygon points="0 59.25 0 60.75 3.25 64 4.75 64 0 59.25" fill="#e4e7f2"/>
-    <polygon points="32.75 0 31.25 0 64 32.75 64 31.25 32.75 0" fill="#e4e7f2"/>
-    <polygon points="36.75 0 35.25 0 64 28.75 64 27.25 36.75 0" fill="#e4e7f2"/>
-    <polygon points="44.75 0 43.25 0 64 20.75 64 19.25 44.75 0" fill="#e4e7f2"/>
-    <polygon points="60.75 0 59.25 0 64 4.75 64 3.25 60.75 0" fill="#e4e7f2"/>
-    <polygon points="56.75 0 55.25 0 64 8.75 64 7.25 56.75 0" fill="#e4e7f2"/>
-    <polygon points="48.75 0 47.25 0 64 16.75 64 15.25 48.75 0" fill="#e4e7f2"/>
-    <polygon points="52.75 0 51.25 0 64 12.75 64 11.25 52.75 0" fill="#e4e7f2"/>
-    <polygon points="40.75 0 39.25 0 64 24.75 64 23.25 40.75 0" fill="#e4e7f2"/>
-    <polygon points="4.75 0 3.25 0 64 60.75 64 59.25 4.75 0" fill="#e4e7f2"/>
-    <polygon points="64 0.75 64 0 63.25 0 64 0.75" fill="#e4e7f2"/>
-    <polygon points="8.75 0 7.25 0 64 56.75 64 55.25 8.75 0" fill="#e4e7f2"/>
-    <polygon points="12.75 0 11.25 0 64 52.75 64 51.25 12.75 0" fill="#e4e7f2"/>
-    <polygon points="28.75 0 27.25 0 64 36.75 64 35.25 28.75 0" fill="#e4e7f2"/>
-    <polygon points="24.75 0 23.25 0 64 40.75 64 39.25 24.75 0" fill="#e4e7f2"/>
-    <polygon points="16.75 0 15.25 0 64 48.75 64 47.25 16.75 0" fill="#e4e7f2"/>
-    <polygon points="20.75 0 19.25 0 64 44.75 64 43.25 20.75 0" fill="#e4e7f2"/>
-    <polygon points="0 15.25 0 16.75 47.25 64 48.75 64 0 15.25" fill="#e4e7f2"/>
-    <polygon points="0 11.25 0 12.75 51.25 64 52.75 64 0 11.25" fill="#e4e7f2"/>
-    <polygon points="0 19.25 0 20.75 43.25 64 44.75 64 0 19.25" fill="#e4e7f2"/>
-    <polygon points="0 7.25 0 8.75 55.25 64 56.75 64 0 7.25" fill="#e4e7f2"/>
-    <polygon points="0 23.25 0 24.75 39.25 64 40.75 64 0 23.25" fill="#e4e7f2"/>
-    <polygon points="0 3.25 0 4.75 59.25 64 60.75 64 0 3.25" fill="#e4e7f2"/>
-    <polygon points="0 55.25 0 56.75 7.25 64 8.75 64 0 55.25" fill="#e4e7f2"/>
-    <polygon points="0 63.25 0 64 0.75 64 0 63.25" fill="#e4e7f2"/>
-    <polygon points="0.75 0 0 0 0 0.75 63.25 64 64 64 64 63.25 0.75 0" fill="#e4e7f2"/>
-    <polygon points="0 47.25 0 48.75 15.25 64 16.75 64 0 47.25" fill="#e4e7f2"/>
-    <polygon points="0 51.25 0 52.75 11.25 64 12.75 64 0 51.25" fill="#e4e7f2"/>
-    <polygon points="0 27.25 0 28.75 35.25 64 36.75 64 0 27.25" fill="#e4e7f2"/>
-    <polygon points="0 43.25 0 44.75 19.25 64 20.75 64 0 43.25" fill="#e4e7f2"/>
-    <polygon points="0 31.25 0 32.75 31.25 64 32.75 64 0 31.25" fill="#e4e7f2"/>
-    <polygon points="0 39.25 0 40.75 23.25 64 24.75 64 0 39.25" fill="#e4e7f2"/>
-    <polygon points="0 35.25 0 36.75 27.25 64 28.75 64 0 35.25" fill="#e4e7f2"/>
-  </g>
-</svg>
diff --git a/map/martin/sprites/navigatum/rounded_rectangle.svg b/map/martin/sprites/navigatum/rounded_rectangle.svg
new file mode 100644
index 000000000..a1f24e979
--- /dev/null
+++ b/map/martin/sprites/navigatum/rounded_rectangle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 9">
+  <path d="m0 .53.06 7.91c0 .3.23.53.51.54 4.6.05 9.18 0 13.77-.07.36 0 .66-.31.66-.68V.8a.74.74 0 0 0-.72-.76C9.7 0 5.1 0 .5 0 .22 0 0 .24 0 .53Z"/>
+</svg>
diff --git a/map/martin/sprites/navigatum/rounded_rombos.svg b/map/martin/sprites/navigatum/rounded_rombos.svg
new file mode 100644
index 000000000..0b068ecfc
--- /dev/null
+++ b/map/martin/sprites/navigatum/rounded_rombos.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 8.5">
+  <path d="m0 1.55.05 5.39a.6.6 0 0 0 .5.58l6.19.92a6.48 6.48 0 0 0 2-.02l5.6-.93a.77.77 0 0 0 .65-.76L15 1.82a.84.84 0 0 0-.7-.83L8.64.09A7.26 7.26 0 0 0 6.43.08L.5.97a.59.59 0 0 0-.5.58z"/>
+</svg>
diff --git a/map/martin/sprites/navigatum/temaki-bench.svg b/map/martin/sprites/navigatum/temaki-bench.svg
index 45ed1496a..dd969dd81 100644
--- a/map/martin/sprites/navigatum/temaki-bench.svg
+++ b/map/martin/sprites/navigatum/temaki-bench.svg
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 15 15">
-  <path d="M13.5 3L13.5 6L14.5 6L14.5 8.75L15 8.75L15 10.25L14.5 10.25L14.5 13L13.5 13L13.5 10.25L12.5 10.25L12.5 11.5L11.5 11.5L11.5 10.25L3.5 10.25L3.5 11.5L2.5 11.5L2.5 10.25L1.5 10.25L1.5 13L0.5 13L0.5 10.25L0 10.25L0 8.75L0.5 8.75L0.5 6L1.5 6L1.5 3L13.5 3zM13.5 7L13.5 7L13.5 8L12.5 8L12.5 8.75L13.5 8.75L13.5 7zM11.5 8L3.5 8L3.5 8.75L11.5 8.75L11.5 8zM1.5 7L1.5 7L1.5 8.75L2.5 8.75L2.5 8L1.5 8L1.5 7z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
+  <path d="M13.5 3v3h1v2.75h.5v1.5h-.5V13h-1v-2.75h-1v1.25h-1v-1.25h-8v1.25h-1v-1.25h-1V13h-1v-2.75H0v-1.5h.5V6h1V3h12zm0 4v1h-1v.75h1V7zm-2 1h-8v.75h8V8zm-10-1v1.75h1V8h-1V7z"/>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/temaki-tree-and-bench.svg b/map/martin/sprites/navigatum/temaki-tree-and-bench.svg
index 18030e7f0..c07b96239 100644
--- a/map/martin/sprites/navigatum/temaki-tree-and-bench.svg
+++ b/map/martin/sprites/navigatum/temaki-tree-and-bench.svg
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <path d="M4 10.94L4 14L3 14L3 10.95C1.93 10.73 1.12 9.77 1.12 8.63C1.12 8.5 1.13 8.37 1.15 8.24C1.97 3.41 2.77 1 3.56 1C4.34 1 5.11 3.41 5.86 8.23L5.86 8.23C6.05 9.49 5.23 10.68 4 10.94ZM6 11L14 11L14 14L13 14L13 12L7 12L7 14L6 14L6 11ZM7 8L13 8L13 10.5L7 10.5L7 8Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
+  <path d="M4 10.94V14H3v-3.05a2.37 2.37 0 0 1-1.85-2.71C1.97 3.41 2.77 1 3.56 1c.78 0 1.55 2.41 2.3 7.23A2.4 2.4 0 0 1 4 10.94ZM6 11h8v3h-1v-2H7v2H6v-3Zm1-3h6v2.5H7V8Z"/>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/toilet_female.svg b/map/martin/sprites/navigatum/toilet_female.svg
index bc37fecd9..3b7f3c065 100644
--- a/map/martin/sprites/navigatum/toilet_female.svg
+++ b/map/martin/sprites/navigatum/toilet_female.svg
@@ -1,15 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="15"
-   height="15"
-   viewBox="0 0 15 15"
-   id="toilet"
-   version="1.1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <path
-     d="m 6,1.5 c 0,1.9999991 3,1.9999991 3,0 0,-1.99999913 -3,-1.99999913 -3,0 z M 6.29,4 C 5.931201,4.0001157 5.599964,4.1924469 5.422,4.504 L 3.566,7.752 C 3.213388,8.3365114 4.109439,8.8485407 4.434,8.248 L 5.846,5.776 C 5.216696,7.5123649 4.601343,9.2537543 4,11 h 2 v 2.5 c 0,0.666666 1,0.666666 1,0 V 11 h 1 v 2.5 c 0,0.666666 1,0.666666 1,0 V 11 h 2 L 9.103,5.687 10.566,8.248 c 0.324561,0.6005407 1.220612,0.088511 0.868,-0.496 L 9.578,4.504 C 9.400036,4.1924469 9.068799,4.0001157 8.71,4 Z"
-     id="path1" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
+  <path d="M6 1.5c0 2 3 2 3 0s-3-2-3 0zM6.29 4a1 1 0 0 0-.87.5L3.57 7.75c-.36.59.54 1.1.86.5l1.42-2.47C5.22 7.5 4.6 9.25 4 11h2v2.5c0 .67 1 .67 1 0V11h1v2.5c0 .67 1 .67 1 0V11h2L9.1 5.69l1.47 2.56c.32.6 1.22.09.86-.5L9.58 4.5A1 1 0 0 0 8.7 4Z"/>
+</svg>
\ No newline at end of file
diff --git a/map/martin/sprites/navigatum/toilet_male.svg b/map/martin/sprites/navigatum/toilet_male.svg
index 54e995484..4f29e4666 100644
--- a/map/martin/sprites/navigatum/toilet_male.svg
+++ b/map/martin/sprites/navigatum/toilet_male.svg
@@ -1,15 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="15"
-   height="15"
-   viewBox="0 0 15 15"
-   id="toilet"
-   version="1.1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <path
-     d="M 7.5,0 C 9.499999,0 9.499999,3 7.5,3 5.5000009,3 5.5000009,0 7.5,0 Z M 5,4.5 C 5,4.2238576 5.2238576,4 5.5,4 h 4 C 9.776142,4 10,4.2238576 10,4.5 v 5 c 0,0.666666 -1,0.666666 -1,0 v 4 c 0,0.666666 -1,0.666666 -1,0 v -4 H 7 v 4 c 0,0.666666 -1,0.666666 -1,0 v -4 c 0,0.666666 -1,0.666666 -1,0 z"
-     id="path1" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15">
+  <path d="M7.5 0c2 0 2 3 0 3s-2-3 0-3ZM5 4.5c0-.28.22-.5.5-.5h4c.28 0 .5.22.5.5v5c0 .67-1 .67-1 0v4c0 .67-1 .67-1 0v-4H7v4c0 .67-1 .67-1 0v-4c0 .67-1 .67-1 0z"/>
+</svg>
\ No newline at end of file