gpsdrive (2.10~pre4-6.dfsg-5.2) unstable; urgency=low

* Non-maintainer upload [ Allison Randal ] * Disable optional mapnik libraries, gpsdrive is incompatible with APIs of mapnik version 2.0.0. * debian/patches/107-fix-disable-mapnik.dpatch: Fix known bug with gpsdrive-2.10pre4 when disabling Mapnik library. # imported from the archive
author: Christian Perrier <bubulle@debian.org> 2012-10-07 13:27:36 +0100
committer: Christian Perrier <bubulle@debian.org> 2012-10-07 13:27:36 +0100
commit: 99f5c8bf63a674faf8c507aea7425b935814548a (patch)
tree: b3202c295c4bb71ec09e3748d49b43a9fec6b4cd /data/map-icons/svg
167 files changed, 18924 insertions, 0 deletions
diff --git a/data/map-icons/svg/accommodation.svg b/data/map-icons/svg/accommodation.svg
new file mode 100644
index 0000000..3f6a81e
--- /dev/null
+++ b/data/map-icons/svg/accommodation.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <!-- derived from http://www.sodipodi.com/index.php3?section=clipart -->
+        <symbol id="symbol-hotel" viewBox="43 45 88 100">
+            <path fill="black" stroke="black" stroke-width="1" stroke-miterlimit="4"
+            d="M 0,60 C 0,65 10,65 10,60 L 10,50 L 35,70 L 35,85 C 35,90 45,90 45,85 L 45,70 L 75,70 L 75,85 C 75,90 85,90 85,85 L 85,60 L 40,60 L 5,30 C 9,20 45,20 50,25 L 50,10 C 50,5 40,5 40,10 L 40,15 L 10,15 L 10,10 C 10,5 0,5 0,10 C 0,10 0,60 0,60 z M 10,35 C 15,25 45,25 55,35 L 85,60 C 75,50 40,50 40,60 L 10,35 z "/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/accommodation/camping.svg b/data/map-icons/svg/accommodation/camping.svg
new file mode 100644
index 0000000..dc600e1
--- /dev/null
+++ b/data/map-icons/svg/accommodation/camping.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation"
+   sodipodi:docname="camping.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="21.789332"
+     inkscape:cy="15.549953"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1134"
+     inkscape:window-height="997"
+     inkscape:window-x="257"
+     inkscape:window-y="19" />
+  <metadata
+     id="metadata7">
+    <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>Tent</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jörg Ostertag</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>Jörg Ostertag</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1.19946754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.310752,11.178135 L 16.310752,1.0141162 L 24.411023,3.8179835 L 16.310752,6.5634371"
+       id="path2163" />
+    <path
+       style="opacity:1;fill:#8effff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.12988925;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.2784963,28.346449 L 16.312551,12.015469 L 24.235789,28.346449 L 8.2784963,28.346449 z "
+       id="path2161"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#5abd3f;fill-rule:evenodd;stroke:#00b000;stroke-width:1.42489433px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99431819;fill-opacity:1;opacity:1"
+       d="M 0.87317934,30.322289 L 31.641106,30.322289"
+       id="path2165" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/camping/caravan.svg b/data/map-icons/svg/accommodation/camping/caravan.svg
new file mode 100644
index 0000000..74b2bf1
--- /dev/null
+++ b/data/map-icons/svg/accommodation/camping/caravan.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation/camping"
+   sodipodi:docname="caravan.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="34.062818"
+     inkscape:cy="18.509128"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="714"
+     inkscape:window-x="460"
+     inkscape:window-y="243" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#cdba4e;fill-opacity:1;stroke:#0d0d0d;stroke-width:1.04791474;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect2160"
+       width="26.819799"
+       height="14.051943"
+       x="3.7329574"
+       y="12.518672"
+       ry="1.6728503" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#858584;fill-opacity:1;stroke:#101010;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="path2162"
+       sodipodi:cx="16.964285"
+       sodipodi:cy="28.071428"
+       sodipodi:rx="3.9285715"
+       sodipodi:ry="3.0357144"
+       d="M 20.892856 28.071428 A 3.9285715 3.0357144 0 1 1  13.035713,28.071428 A 3.9285715 3.0357144 0 1 1  20.892856 28.071428 z"
+       transform="matrix(0.8720496,0,0,1.0108877,-1.0436985,-1.9127761)" />
+    <rect
+       style="fill:#f2d31d;fill-opacity:1;stroke:#000000;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect2164"
+       width="2.6785715"
+       height="0.71428573"
+       x="0.98214287"
+       y="23.696428" />
+    <rect
+       style="fill:#2327de;fill-opacity:0.877095;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3141"
+       width="6.3392859"
+       height="4.579493"
+       x="6.9196429"
+       y="15.590151" />
+    <rect
+       style="fill:#2327de;fill-opacity:0.877095;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3143"
+       width="10.803572"
+       height="4.579493"
+       x="16.607143"
+       y="15.482143" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/camping/water.svg b/data/map-icons/svg/accommodation/camping/water.svg
new file mode 100644
index 0000000..28a5e2f
--- /dev/null
+++ b/data/map-icons/svg/accommodation/camping/water.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg height="60.0000000" id="svg1" inkscape:version="0.38.1" sodipodi:docbase="/home/danny/flat/scalable/filesystems" sodipodi:docname="pipe.svg" sodipodi:version="0.32" version="1.0" width="60.0000000" x="0" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" y="0">
+  <metadata>
+    <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <cc:Work rdf:about="">
+        <dc:title>Part of the Flat Icon Collection (Wed Aug 25 23:31:12 2004)</dc:title>
+        <dc:description></dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>hash</rdf:li>
+            <rdf:li></rdf:li>
+            <rdf:li>filesystem</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>icons</rdf:li>
+            <rdf:li>theme</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://www.openclipart.org">
+            <dc:title>Danny Allen</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Danny Allen</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Danny Allen</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date></dc:date>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:cx="36.269756" inkscape:cy="15.439017" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="685" inkscape:window-width="1016" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="4.9119411" pagecolor="#ffffff"/>
+  <defs id="defs3">
+    <linearGradient id="linearGradient900">
+      <stop id="stop901" offset="0" style="stop-color:#000;stop-opacity:1;"/>
+      <stop id="stop902" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient903" xlink:href="#linearGradient900"/>
+    <linearGradient id="linearGradient904" xlink:href="#linearGradient900"/>
+    <linearGradient id="linearGradient905" xlink:href="#linearGradient900"/>
+    <linearGradient id="linearGradient906" xlink:href="#linearGradient900"/>
+    <linearGradient id="linearGradient907" xlink:href="#linearGradient900"/>
+  </defs>
+  <path d="M 19.086141 26.281151 A 6.9982514 14.378226 0 1 0 5.0896382,26.281151 A 6.9982514 14.378226 0 1 0 19.086141 26.281151 z" id="path1025" sodipodi:cx="12.087890" sodipodi:cy="26.281151" sodipodi:rx="6.9982514" sodipodi:ry="14.378226" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" sodipodi:type="arc" style="fill:#b3b3b3;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#333333;stroke-width:2.8463275;stroke-dasharray:none;stroke-opacity:1.0000000;" transform="matrix(1.097906,0.000000,0.000000,1.097906,-1.108772,1.525751)"/>
+  <rect height="7.3799744" id="rect1026" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" style="fill:#b3b3b3;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#333333;stroke-width:1.3365112;stroke-dasharray:none;stroke-opacity:1.0000000;" transform="matrix(1.097906,0.000000,0.000000,2.160839,-1.108772,-25.60946)" width="3.3082645" x="37.917801" y="17.501526"/>
+  <path d="M -51.156250 -25.250000 L -51.156250 -10.250000 L -66.156250 -10.250000 L -66.156250 -0.81250000 L -51.156250 -0.81250000 L -51.156250 14.187500 L -41.750000 14.187500 L -41.750000 -0.81250000 L -26.718750 -0.81250000 L -26.718750 -10.250000 L -41.750000 -10.250000 L -41.750000 -25.250000 L -51.156250 -25.250000 z " id="path1029" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" style="fill:#4c4c4c;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#333333;stroke-width:4.4501524;stroke-linejoin:round;stroke-linecap:round;stroke-dasharray:none;stroke-opacity:1.0000000;" transform="matrix(0.646390,0.000000,-0.331516,0.331046,69.82802,13.78048)"/>
+  <path d="M 15.014431,36.587667 L 42.243991,36.587667 L 42.243991,50.838652 L 52.677749,50.838652 L 52.677749,26.662874 L 15.014431,26.662874 L 15.014431,36.587667 z " id="path1024" sodipodi:nodetypes="ccccccc" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" style="fill:#7f7f7f;fill-rule:evenodd;stroke:#333333;stroke-opacity:1.0000000;stroke-width:2.8463275;stroke-linejoin:round;stroke-linecap:round;fill-opacity:1.0000000;stroke-dasharray:none;" transform="matrix(1.097906,0.000000,0.000000,1.097906,-3.343950,-3.224001)"/>
+  <path d="M 55.222568 52.365543 A 6.4892879 3.0537825 0 1 0 42.243992,52.365543 A 6.4892879 3.0537825 0 1 0 55.222568 52.365543 z" id="path1030" sodipodi:cx="48.733280" sodipodi:cy="52.365543" sodipodi:rx="6.4892879" sodipodi:ry="3.0537825" sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.80000001)" sodipodi:type="arc" style="fill:#4c4c4c;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#333333;stroke-width:3.1281000;stroke-dasharray:none;stroke-opacity:1.0000000;" transform="matrix(0.891116,0.000000,0.000000,0.891116,5.298442,6.338077)"/>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hostel.svg b/data/map-icons/svg/accommodation/hostel.svg
new file mode 100644
index 0000000..42d2c18
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hostel.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <!-- derived from http://www.sodipodi.com/index.php3?section=clipart -->
+        <symbol id="symbol-hostel" viewBox="6.25 4 12.5 12">
+            <path fill="#286a9d" fill-rule="nonzero" stroke="none" d="M 5.5,4 L 9,0 L 12.5,4 L 11.5,4 L 11.5,8 L 10,8 L 10,5 L 8,5 L 8,8 L 6.5,8 L 6.5,4 L 5.5,4 z M 0.5,3.5 C 2,2.5 2.3,1 2.5,0 C 2.7,1 3,2.5 4.5,3.5 L 3.3,3.5 C 3.3,4 4,5 5,6 L 3,6 L 3,8 L 2,8 L 2,6 L 0,6 C 1,5 1.7,4 1.7,3.5 L 0.5,3.5 z M 0,8 L 0,7.5 L 12.5,7.5 L 12.5,8 L 0,8 z " />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hotel.svg b/data/map-icons/svg/accommodation/hotel.svg
new file mode 100644
index 0000000..8612d14
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hotel.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation"
+   sodipodi:docname="hotel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="21.769455"
+     inkscape:cy="9.1839918"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="708"
+     inkscape:window-x="486"
+     inkscape:window-y="262" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.6785714,14.321429 L 2.5,28.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.8571429,23.071429 L 29.642857,23.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29.821429,27.714286 L 30,18.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="17.982145"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-5.1484883)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="19.94643"
+       ry="0.22321428" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hotel/five_star.svg b/data/map-icons/svg/accommodation/hotel/five_star.svg
new file mode 100644
index 0000000..dfb940a
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hotel/five_star.svg
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation/hotel"
+   sodipodi:docname="five_star.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="21.769455"
+     inkscape:cy="19.223576"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="942"
+     inkscape:window-height="760"
+     inkscape:window-x="450"
+     inkscape:window-y="210" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.6785714,14.321429 L 2.5,28.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.8571429,23.071429 L 29.642857,23.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29.821429,27.714286 L 30,18.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="17.982145"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-5.1484883)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="19.94643"
+       ry="0.22321428" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2163"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,-0.7700162,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3136"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,4.9389852,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3138"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,10.647986,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3140"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,16.356988,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3142"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,22.06599,3.1882643)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hotel/four_star.svg b/data/map-icons/svg/accommodation/hotel/four_star.svg
new file mode 100644
index 0000000..1d31f3f
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hotel/four_star.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation/hotel"
+   sodipodi:docname="four_star.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="21.769455"
+     inkscape:cy="26.799721"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="942"
+     inkscape:window-height="760"
+     inkscape:window-x="450"
+     inkscape:window-y="210" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.6785714,14.321429 L 2.5,28.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.8571429,23.071429 L 29.642857,23.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29.821429,27.714286 L 30,18.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="17.982145"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-5.1484883)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="19.94643"
+       ry="0.22321428" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2163"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,-0.7700162,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3136"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,4.9389852,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3138"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,10.647986,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3140"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,16.356988,3.1882643)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hotel/one_star.svg b/data/map-icons/svg/accommodation/hotel/one_star.svg
new file mode 100644
index 0000000..24ef628
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hotel/one_star.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation/hotel"
+   sodipodi:docname="one_star.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="21.769455"
+     inkscape:cy="26.799721"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="942"
+     inkscape:window-height="760"
+     inkscape:window-x="450"
+     inkscape:window-y="210" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.6785714,14.321429 L 2.5,28.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.8571429,23.071429 L 29.642857,23.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29.821429,27.714286 L 30,18.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="17.982145"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-5.1484883)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="19.94643"
+       ry="0.22321428" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2163"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,-0.7700162,3.1882643)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hotel/three_star.svg b/data/map-icons/svg/accommodation/hotel/three_star.svg
new file mode 100644
index 0000000..4f04315
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hotel/three_star.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation/hotel"
+   sodipodi:docname="three_star.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="21.769455"
+     inkscape:cy="26.799721"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="942"
+     inkscape:window-height="760"
+     inkscape:window-x="450"
+     inkscape:window-y="210" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.6785714,14.321429 L 2.5,28.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.8571429,23.071429 L 29.642857,23.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29.821429,27.714286 L 30,18.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="17.982145"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-5.1484883)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="19.94643"
+       ry="0.22321428" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2163"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,-0.7700162,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3136"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,4.9389852,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3138"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,10.647986,3.1882643)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/hotel/two_star.svg b/data/map-icons/svg/accommodation/hotel/two_star.svg
new file mode 100644
index 0000000..d61e040
--- /dev/null
+++ b/data/map-icons/svg/accommodation/hotel/two_star.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation/hotel"
+   sodipodi:docname="two_star.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="21.769455"
+     inkscape:cy="26.799721"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="942"
+     inkscape:window-height="760"
+     inkscape:window-x="450"
+     inkscape:window-y="210" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.6785714,14.321429 L 2.5,28.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 2.8571429,23.071429 L 29.642857,23.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 29.821429,27.714286 L 30,18.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="17.982145"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-5.1484883)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="19.94643"
+       ry="0.22321428" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2163"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,-0.7700162,3.1882643)" />
+    <path
+       sodipodi:type="star"
+       style="fill:#efda00;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3136"
+       sodipodi:sides="5"
+       sodipodi:cx="7.5892859"
+       sodipodi:cy="2"
+       sodipodi:r1="3.3035715"
+       sodipodi:r2="1.6517857"
+       sodipodi:arg1="-0.33029735"
+       sodipodi:arg2="0.29802118"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 10.714286,0.92857143 L 9.1682599,2.4850125 L 9.5739531,4.640962 L 7.6159414,3.6515706 L 5.6908776,4.7036329 L 6.0267858,2.5357143 L 4.4313378,1.029975 L 6.5969522,0.67951899 L 7.5359748,-1.3031413 L 8.53849,0.64818357 L 10.714286,0.92857143 z "
+       transform="matrix(0.6255805,0,0,0.6357092,4.9389852,3.1882643)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/accommodation/motel.svg b/data/map-icons/svg/accommodation/motel.svg
new file mode 100644
index 0000000..971fca8
--- /dev/null
+++ b/data/map-icons/svg/accommodation/motel.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/accommodation"
+   sodipodi:docname="motel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="21.769455"
+     inkscape:cy="16.683992"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="708"
+     inkscape:window-x="486"
+     inkscape:window-y="262" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.6785714,4.321429 L 2.5,18.25"
+       id="path2157" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.8571429,13.071429 L 29.642857,13.25"
+       id="path2159" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 29.821429,17.714286 L 30,8.607143"
+       id="path2161" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2163"
+       width="14.107142"
+       height="2.5"
+       x="13.392857"
+       y="7.9821453"
+       ry="1.25" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.29999995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="7.7678571"
+       sodipodi:cy="16.017857"
+       sodipodi:rx="1.5178572"
+       sodipodi:ry="1.3392857"
+       d="M 9.2857143 16.017857 A 1.5178572 1.3392857 0 1 1  6.2499999,16.017857 A 1.5178572 1.3392857 0 1 1  9.2857143 16.017857 z"
+       transform="matrix(1.2835091,0,0,1.287977,-0.9076151,-15.148488)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2169"
+       width="5.4464283"
+       height="0.44642857"
+       x="5.0892854"
+       y="9.9464302"
+       ry="0.22321428" />
+    <rect
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2164"
+       width="30.089285"
+       height="11.339286"
+       x="0.98214287"
+       y="20.035715"
+       ry="0" />
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#dde711;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,3;stroke-dashoffset:4.5"
+       d="M 0.98214286,25.660714 L 30.892857,25.660714"
+       id="path2166" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/education.svg b/data/map-icons/svg/education.svg
new file mode 100644
index 0000000..84f5ddf
--- /dev/null
+++ b/data/map-icons/svg/education.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-school" viewBox="160 216 320.8 432.5">
+            <path fill="#AF7519" d="M93,284.7c0,11-9,20-20,20s-20-9-20-20s9-20,20-20S93,273.7,93,284.7z" />
+            <path fill="#AF7519" d="M237,328.7c0,11-9,20-20,20s-20-9-20-20s9-20,20-20S237,317.7,237,328.7z" />
+            <path fill="none" stroke="#AF7519" stroke-width="20" d="M163,4.7l-116,361" />
+            <path fill="none" stroke="#AF7519" stroke-width="18.9041" d="M163,4.7L232,431" />
+            <path fill="none" stroke="#AF7519" stroke-width="20" d="M163,4.7l149,277" />
+            <path d="M6,53.7c0,0,283,67,284,70s-3,222-3,222l-287-97L6,53.7z" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M36,128.7c-1.2-8.1,16.8-17.4,25-17.2 c14.7,0.4,20,10.1,26.8,23.3c7.8,15,10.9,36,12.3,53c0.5,6.2,1.3,40.2,4.9,39.9" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M94,158.7c-17.5-12.4-58.4,7.4-59,28 c-0.5,17.8,16,23,29.9,26c15.4,3.2,19.2,0.8,29.1-11" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M136,101.7c-11.6,26.2-2.8,64-5,92.9 c-1.2,16.3,0.7,40.2-2,54.1" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M131,176.7c10.8-4.2,18.3-17.9,32.8-10 c11.5,6.3,13.7,23.1,14.2,34.9c0.7,15.6-3.3,26.4-18.8,31.8c-7.6,2.7-25.5,5.8-24.2-7.7" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M261,196.7c-4.1-11.8-20.9-19.9-33.1-16.8 c-16.3,4.2-23.3,25-21.9,40.1c2.3,25.4,29.8,56.5,52,31.7" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/education/school.svg b/data/map-icons/svg/education/school.svg
new file mode 100644
index 0000000..84f5ddf
--- /dev/null
+++ b/data/map-icons/svg/education/school.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-school" viewBox="160 216 320.8 432.5">
+            <path fill="#AF7519" d="M93,284.7c0,11-9,20-20,20s-20-9-20-20s9-20,20-20S93,273.7,93,284.7z" />
+            <path fill="#AF7519" d="M237,328.7c0,11-9,20-20,20s-20-9-20-20s9-20,20-20S237,317.7,237,328.7z" />
+            <path fill="none" stroke="#AF7519" stroke-width="20" d="M163,4.7l-116,361" />
+            <path fill="none" stroke="#AF7519" stroke-width="18.9041" d="M163,4.7L232,431" />
+            <path fill="none" stroke="#AF7519" stroke-width="20" d="M163,4.7l149,277" />
+            <path d="M6,53.7c0,0,283,67,284,70s-3,222-3,222l-287-97L6,53.7z" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M36,128.7c-1.2-8.1,16.8-17.4,25-17.2 c14.7,0.4,20,10.1,26.8,23.3c7.8,15,10.9,36,12.3,53c0.5,6.2,1.3,40.2,4.9,39.9" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M94,158.7c-17.5-12.4-58.4,7.4-59,28 c-0.5,17.8,16,23,29.9,26c15.4,3.2,19.2,0.8,29.1-11" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M136,101.7c-11.6,26.2-2.8,64-5,92.9 c-1.2,16.3,0.7,40.2-2,54.1" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M131,176.7c10.8-4.2,18.3-17.9,32.8-10 c11.5,6.3,13.7,23.1,14.2,34.9c0.7,15.6-3.3,26.4-18.8,31.8c-7.6,2.7-25.5,5.8-24.2-7.7" />
+            <path fill="none" stroke="#FFFFFF" stroke-width="20" d="M261,196.7c-4.1-11.8-20.9-19.9-33.1-16.8 c-16.3,4.2-23.3,25-21.9,40.1c2.3,25.4,29.8,56.5,52,31.7" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/education/school/primary.svg b/data/map-icons/svg/education/school/primary.svg
new file mode 100644
index 0000000..d69114a
--- /dev/null
+++ b/data/map-icons/svg/education/school/primary.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   version="1.0"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/education/school"
+   sodipodi:docname="primary.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="17.680587"
+     inkscape:cy="16.386923"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="857"
+     inkscape:window-height="579"
+     inkscape:window-x="1811"
+     inkscape:window-y="110"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-146.6732,-50.39987)">
+    <text
+       xml:space="preserve"
+       style="font-size:0.09486658px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="1007.2923"
+       y="14.718156"
+       id="text1872"
+       transform="scale(0.178243,5.610315)"><tspan
+         sodipodi:role="line"
+         id="tspan1874"
+         x="1007.2923"
+         y="14.718156"
+         style="text-align:center;text-anchor:middle;fill:red">A</tspan><tspan
+         sodipodi:role="line"
+         x="1007.2923"
+         y="14.836739"
+         id="tspan1876"
+         style="text-align:center;text-anchor:middle"><tspan
+           style="text-align:center;text-anchor:middle;fill:blue"
+           id="tspan1880">B</tspan><tspan
+           style="text-align:center;text-anchor:middle;fill:lime"
+           id="tspan1882"> C</tspan></tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12.45235729px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="155.53258"
+       y="65.496773"
+       id="text1885"
+       transform="scale(1.037696,0.963673)"><tspan
+         sodipodi:role="line"
+         id="tspan1887"
+         x="155.53258"
+         y="65.496773"
+         style="text-align:center;text-anchor:middle;fill:red">A</tspan><tspan
+         sodipodi:role="line"
+         x="155.53258"
+         y="81.062219"
+         id="tspan1889"
+         style="text-align:center;text-anchor:middle"><tspan
+           style="text-align:center;text-anchor:middle;fill:blue"
+           id="tspan1891">B</tspan><tspan
+           style="text-align:center;text-anchor:middle;fill:lime"
+           id="tspan1893"> C</tspan></tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/education/university.svg b/data/map-icons/svg/education/university.svg
new file mode 100644
index 0000000..b7c2e23
--- /dev/null
+++ b/data/map-icons/svg/education/university.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
+            <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
+            <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39"/>
+            <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
+            <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/empty.svg b/data/map-icons/svg/empty.svg
new file mode 100644
index 0000000..6cff3a9
--- /dev/null
+++ b/data/map-icons/svg/empty.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg"
+   sodipodi:docname="empty.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="9.1839918"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="420"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1" />
+</svg>
diff --git a/data/map-icons/svg/food.svg b/data/map-icons/svg/food.svg
new file mode 100644
index 0000000..6b4fa5c
--- /dev/null
+++ b/data/map-icons/svg/food.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- derived from http://www.sodipodi.com/index.php3?section=clipart -->
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-restaurant" viewBox="49 74 103 103">
+            <path fill="black" stroke="none" d="M 84,24 C 80,20 64,38 57,46 C 55,48 52,52 58,58 C 5,109 -5,116 2,123 C 9,130 16,120 66,66 C 72,72 77,69 79,67 C 87,60 104,44 100,40 C 96,36 81,60 77,57 C 73,54 96,36 92,32 C 88,28 71,53 67,49 C 63,45 88,28 84,24 z"/>
+            <path fill="black" stroke="none" d="M 35,53 C 79,101 98,116 90,123 C 81,131 70,111 26,62 C 6,77 -9,36 1,26 C 11,16 55,33 35,53 z"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/food/bar.svg b/data/map-icons/svg/food/bar.svg
new file mode 100644
index 0000000..11ee5d3
--- /dev/null
+++ b/data/map-icons/svg/food/bar.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/food"
+   sodipodi:docname="bar.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="9.1839918"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="420" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.45413351px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 15.637782,13.115965 L 15.637782,28.976463"
+       id="path2159" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.30536804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.637939,16.333445 L 4.166657,4.1887054 L 26.726201,4.1887054 L 15.637939,16.333445 z "
+       id="path2157"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.45413351px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 6.4551021,29.769486 L 23.800165,29.769486"
+       id="path2161" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/food/pub.svg b/data/map-icons/svg/food/pub.svg
new file mode 100644
index 0000000..24c1d3c
--- /dev/null
+++ b/data/map-icons/svg/food/pub.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-pub" viewBox="3 4.5 6 9">
+            <path fill="#aa5605" stroke="none" d="M 1.2,9 C 1.2,9 1,3 0.3,1.7 L 5.7,1.7 C 5,3 4.8,9 4.8,9" />
+            <path fill="#ffe680" stroke="none" d="M 5.7,1.7 L 0.3,1.7 C 0,1 0,1 0,0 L 6,0 C 6,1 6,1 5.7,1.7 z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/food/restaurant.svg b/data/map-icons/svg/food/restaurant.svg
new file mode 100644
index 0000000..6b4fa5c
--- /dev/null
+++ b/data/map-icons/svg/food/restaurant.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- derived from http://www.sodipodi.com/index.php3?section=clipart -->
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-restaurant" viewBox="49 74 103 103">
+            <path fill="black" stroke="none" d="M 84,24 C 80,20 64,38 57,46 C 55,48 52,52 58,58 C 5,109 -5,116 2,123 C 9,130 16,120 66,66 C 72,72 77,69 79,67 C 87,60 104,44 100,40 C 96,36 81,60 77,57 C 73,54 96,36 92,32 C 88,28 71,53 67,49 C 63,45 88,28 84,24 z"/>
+            <path fill="black" stroke="none" d="M 35,53 C 79,101 98,116 90,123 C 81,131 70,111 26,62 C 6,77 -9,36 1,26 C 11,16 55,33 35,53 z"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/health.svg b/data/map-icons/svg/health.svg
new file mode 100644
index 0000000..e22fa49
--- /dev/null
+++ b/data/map-icons/svg/health.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-hospital" viewBox="7.5 7.5 15 15">
+            <path fill="none" stroke="red" stroke-width="2" d="M 12.5,7.5 L 2.5,7.5 L 2.5,7.5 L 12.5,7.5 z M 7.5,2.3 L 7.5,12.5 L 7.5,12.5"/>
+            <path fill="none" stroke="red" stroke-width="1" d="M 14.5 7.5 A 7 7 0 1 1 0.5,7.5 A 7 7 0 1 1 14.5 7.5 z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/health/doctor.svg b/data/map-icons/svg/health/doctor.svg
new file mode 100644
index 0000000..ad93f81
--- /dev/null
+++ b/data/map-icons/svg/health/doctor.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-doctor" viewBox="18 18 36 36">
+            <ellipse fill="#00cc00" cx="18" cy="18" rx="18" ry="18"/>
+            <path fill="#ffffff" d="M32 21.44 A16 16 -180 1 0 0 21.44 A16 16 -180 1 0 32 21.44 Z M10 6.94 L22 6.94 L22 15.44 L30.5 15.44 L30.5 27.44 L22 27.44 L22 35.94 L10 35.94 L10 27.44 L1.5 27.44 L1.5 15.44 L10 15.44 L 10 6.94 Z" transform="translate(2,-3.44)"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/health/eye_specialist.png b/data/map-icons/svg/health/eye_specialist.png
new file mode 100644
index 0000000..b09bce2
--- /dev/null
+++ b/data/map-icons/svg/health/eye_specialist.png
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg height="160.00000px" id="svg2" inkscape:version="0.41" sodipodi:docbase="/home/nicu/Desktop/newsvg" sodipodi:docname="eye.svg" sodipodi:version="0.32" width="240.00000px" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg">
+  <metadata>
+    <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <cc:Work rdf:about="">
+        <dc:title>eye</dc:title>
+        <dc:description></dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>face</rdf:li>
+            <rdf:li>bodypart</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://www.openclipart.org">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Nicu Buculei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Nicu Buculei</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date></dc:date>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs3"/>
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:current-layer="layer1" inkscape:cx="120.00000" inkscape:cy="80.000000" inkscape:document-units="px" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="791" inkscape:window-width="1152" inkscape:window-x="0" inkscape:window-y="24" inkscape:zoom="1.0000000" pagecolor="#ffffff"/>
+  <g id="layer1" inkscape:groupmode="layer" inkscape:label="Layer 1">
+    <path d="M 129.06745,9.9791853 C 121.24987,16.611883 125.73944,25.232590 123.04705,32.309468 C 119.60939,38.549660 109.64920,35.529677 103.39679,37.397575 C 99.356691,34.330748 99.614961,25.527513 96.135321,21.864928 C 92.537579,28.466957 102.62553,40.975089 89.924316,42.073694 C 77.712677,44.150578 88.375986,27.599885 84.280652,20.888257 C 83.343675,22.630012 82.569655,23.278064 81.657699,23.133956 C 84.817371,32.572218 77.281523,48.456949 67.324384,50.514332 C 58.424229,58.201957 60.477074,39.676934 55.577092,35.324761 C 56.431665,34.773938 53.566383,36.649305 54.357676,37.476576 C 59.278471,43.480794 56.547774,51.090569 55.329625,58.860999 C 54.854826,62.554571 42.945603,64.232491 46.355597,65.577739 C 50.176894,63.763127 40.577324,71.966357 36.038617,71.092295 C 37.086442,65.229920 31.057994,61.202314 28.379724,59.912846 C 30.887989,66.813053 35.946622,85.698762 22.425417,83.954124 C 19.840720,80.432232 18.337495,77.058023 12.064735,73.799110 C 20.489962,85.456153 17.221696,100.71315 9.0305662,105.19918 C 20.716921,99.877295 35.053971,76.569333 47.010952,71.560456 C 66.576996,61.940887 86.845884,53.036070 108.25693,48.480257 C 115.30238,48.474930 129.35993,41.930436 129.00415,53.050670 C 133.22017,63.526233 131.17907,75.332091 124.14805,84.110903 C 117.51753,94.264927 105.72794,103.24805 93.042443,98.587863 C 80.872740,95.545900 72.200888,84.856042 69.981088,72.741422 C 70.737623,67.570598 65.019109,60.997611 61.195910,66.219774 C 61.981505,76.843604 67.542379,89.506995 75.812282,96.641778 C 86.141244,105.36684 101.76343,105.80581 112.68002,97.892772 C 125.02342,89.954379 136.65992,77.349141 137.35453,62.004756 C 137.69975,56.596948 130.59062,43.358047 138.94510,47.427496 C 156.00396,49.632579 166.01678,60.172278 172.75313,59.703790 C 178.75725,60.112229 184.60206,58.847212 176.28495,65.779735 C 183.15038,65.898589 169.01489,73.059298 167.53395,77.369085 C 153.30538,94.857303 131.05973,103.51783 109.63450,108.31314 C 93.257061,111.30201 76.339729,111.80725 59.801127,110.05296 C 51.222905,107.01663 42.298481,109.05347 33.855772,111.43189 C 27.138068,113.02739 18.644489,114.15612 13.687848,108.30004 C 4.7699419,101.47446 2.8934672,115.14305 12.576663,115.58302 C 25.100691,119.69197 37.047744,110.44432 49.687641,113.03003 C 56.133845,112.64108 62.050153,115.69694 55.601016,121.60308 C 55.095400,128.76385 54.960531,135.03121 53.969983,145.80402 C 59.484228,139.30685 57.058846,129.22889 60.767295,121.44715 C 61.671602,110.52592 79.046594,113.46657 77.117406,123.99975 C 78.902688,133.13332 82.709354,142.89731 78.683204,151.86474 C 90.636637,147.89343 81.739782,131.95458 81.307303,122.84425 C 79.714916,117.03207 80.530483,112.74953 88.167292,114.55206 C 93.948939,114.78773 103.09260,110.19042 99.478901,118.99953 C 102.43696,126.85260 104.14161,134.95853 103.95337,143.39153 C 106.86524,138.46706 109.73085,131.84837 106.19835,127.62314 C 103.34677,121.34612 103.28990,106.37962 114.33564,111.71860 C 120.61461,116.33420 117.97140,125.77121 120.10077,131.96382 C 127.34406,126.28071 121.09082,117.88608 121.83353,110.55174 C 125.44856,99.661071 142.42431,104.08283 139.38665,115.79969 C 139.58026,120.80598 141.79135,125.47588 142.80687,126.84080 C 146.93093,117.13451 136.26586,102.96285 145.30886,96.228444 C 155.33199,94.465824 161.80607,103.64493 168.58739,109.23215 C 166.82964,103.71701 164.55917,97.115353 159.60472,94.518456 C 147.44246,89.335545 169.59160,85.704196 174.32481,92.366660 C 175.80496,94.317258 175.28132,89.986464 174.63885,89.788964 C 168.46894,88.323444 164.26800,78.198727 173.73004,79.427317 C 184.38937,78.698141 189.92757,91.527885 197.95216,93.310253 C 195.70045,87.693550 187.92682,79.852686 182.13035,76.603490 C 178.92858,75.397853 169.95010,74.707203 177.56827,72.340811 C 185.89613,74.373949 193.22138,76.766568 200.31488,81.429201 C 200.86967,81.416884 199.55677,79.999750 199.54691,80.093102 C 195.12731,77.076162 184.48238,69.356151 185.35774,68.149064 C 193.55105,65.936726 201.37717,70.779552 207.80793,73.089879 C 204.60557,68.025007 198.62986,64.175382 196.52372,63.778240 C 209.40198,63.437198 226.53630,59.163266 236.52372,50.983802 C 227.34786,55.491991 218.04844,60.288822 207.43252,60.300874 C 202.62789,60.571959 192.08868,61.582519 191.24058,60.386988 C 201.49034,55.336026 213.80928,53.201856 222.28205,45.348393 C 205.26244,53.630623 193.87422,55.491115 196.82012,53.344540 C 205.69774,52.770727 218.03556,36.036577 220.03547,33.457216 C 205.25894,44.337676 216.39338,30.341439 219.55239,25.836204 C 214.08504,29.388377 209.41923,38.490393 200.72178,38.274877 C 198.41297,34.211080 185.60679,40.566834 180.52265,35.144817 C 181.01599,26.580246 180.76123,27.384103 172.12767,36.137574 C 163.33846,37.989245 166.32828,28.331502 163.71843,24.734486 C 158.99955,29.417683 162.90029,38.663559 151.92048,35.075621 C 143.22573,36.914319 144.93133,25.348524 144.25415,20.830724 C 139.77154,24.900998 146.67835,37.932543 135.91465,34.960289 C 122.33634,38.254047 129.61063,22.343672 127.91794,14.910886 C 127.92887,12.822657 129.20655,12.063007 129.06745,9.9791853 z M 99.001901,51.777395 C 90.175387,53.792676 77.541088,63.946062 82.485608,73.550642 C 91.387878,82.008234 110.75466,75.295740 109.10783,61.923720 C 107.91001,57.054190 102.68586,54.576944 99.001901,51.777395 z M 93.408986,55.921714 C 98.553701,62.242481 81.105646,73.578728 88.934123,61.325504 C 90.172309,59.329601 91.764291,57.585777 93.408986,55.921714 z M 100.10514,62.531529 C 99.414041,68.442165 87.109451,73.524256 96.588321,66.565134 C 97.935481,65.390362 99.186491,64.075181 100.10514,62.531529 z M 102.96396,65.025800 C 103.10112,69.110993 97.034351,67.357347 102.64498,65.320565 L 102.96396,65.025800 z M 103.27094,67.078777 C 106.13513,72.535232 92.655087,74.230354 100.74310,69.383777 C 101.62582,68.661097 102.47261,67.893942 103.27094,67.078777 z M 97.092831,70.743431 L 95.621828,71.560526 L 97.092831,70.743431 z " id="path1311" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"/>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/health/hospital.svg b/data/map-icons/svg/health/hospital.svg
new file mode 100644
index 0000000..e22fa49
--- /dev/null
+++ b/data/map-icons/svg/health/hospital.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-hospital" viewBox="7.5 7.5 15 15">
+            <path fill="none" stroke="red" stroke-width="2" d="M 12.5,7.5 L 2.5,7.5 L 2.5,7.5 L 12.5,7.5 z M 7.5,2.3 L 7.5,12.5 L 7.5,12.5"/>
+            <path fill="none" stroke="red" stroke-width="1" d="M 14.5 7.5 A 7 7 0 1 1 0.5,7.5 A 7 7 0 1 1 14.5 7.5 z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/health/pharmacy.svg b/data/map-icons/svg/health/pharmacy.svg
new file mode 100644
index 0000000..3533c6f
--- /dev/null
+++ b/data/map-icons/svg/health/pharmacy.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol
+            id="symbol-pharmacy_dispensing" viewBox="18 18 36 36">
+            <rect style="fill:#00cc00" x="0" y="0" width="36" height="36" rx="2" ry="2"/>
+            <path style="fill:#ffffff" d="M20.14 17.3 L20.14 9.44 L11.86 9.44 L11.86 17.3 L4 17.3 
+            L4 25.58 L11.86 25.58 L11.86 33.44 L20.14 33.44 L20.14 25.58 L28 25.58 L28 17.3 L20.14 17.3 Z
+            M0.5 37.44 L31.5 37.44 a0.5 0.5 -180 0 0 0.5 -0.5 L32 5.94 a0.5 0.5 -180 0 0 -0.5 -0.5 
+            L0.5 5.44 a0.5 0.5 -180 0 0 -0.5 0.5 L0 36.94 a0.5 0.5 -180 0 0 0.5 0.5 Z M2 35.44 L2
+            7.44 L30 7.44 L30 35.44 L2 35.44 Z"
+            transform="translate(2,-3.44)"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/incomming/Biohazard_Warning.svg b/data/map-icons/svg/incomming/Biohazard_Warning.svg
new file mode 100644
index 0000000..397d599
--- /dev/null
+++ b/data/map-icons/svg/incomming/Biohazard_Warning.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="331"
+   height="314"
+   viewBox="0.001 0 331 314"
+   enable-background="new 0.001 0 331 314"
+   xml:space="preserve"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docname="International Biohazard Warning Symbol.svg"
+   sodipodi:docbase="C:\Documents and Settings\940753\Työpöytä"><metadata
+   id="metadata9"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><sodipodi:namedview
+   inkscape:window-height="823"
+   inkscape:window-width="968"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:zoom="1.2006369"
+   inkscape:cx="165.5"
+   inkscape:cy="157"
+   inkscape:window-x="271"
+   inkscape:window-y="182"
+   inkscape:current-layer="svg2" />
+<defs
+   id="defs4">
+</defs>
+<path
+   d="M75.33,165.564c-2.168,20.533,2.768,41.485,13.996,58.82c5.106,7.884,11.44,14.964,18.705,20.918  c3.639,2.983,7.51,5.684,11.567,8.067c2.039,1.197,4.126,2.315,6.253,3.351c1.067,0.52,2.146,1.018,3.232,1.494  c1.901,0.834,2.512-1.824,3.352-3.393c2.804-5.229,4.835-10.865,6.014-16.681c0.338-1.663,1.146-2.615-0.557-3.404  c-1.068-0.494-2.123-1.019-3.162-1.569c-2.07-1.1-4.082-2.309-6.023-3.621c-8.059-5.452-14.875-12.695-19.822-21.074  c-4.867-8.245-7.878-17.539-8.773-27.071c-0.24-2.562-0.336-5.14-0.271-7.713c0.037-1.484,0.129-2.97,0.262-4.45  c-1.475-0.546-2.971-1.034-4.484-1.465C89.041,165.905,82.153,165.155,75.33,165.564 M127.14,121.929  c16.854-12.137,39.013-15.574,58.752-9.084c4.676,1.537,9.174,3.607,13.387,6.152c1.816,1.098,3.76,3.531,5.512,2.034  c2.127-1.815,4.129-3.778,5.984-5.869c3.417-3.849,6.344-8.131,8.686-12.712c-4.326-3.219-8.938-6.052-13.768-8.451  c-18.846-9.365-40.801-11.83-61.271-6.97c-9.726,2.311-19.047,6.254-27.486,11.61c-1.892,1.201-3.739,2.473-5.537,3.812  c1.279,2.504,2.734,4.92,4.348,7.223C118.957,114.256,122.801,118.393,127.14,121.929 M192.411,234.988  c0.947,5.853,2.756,11.562,5.346,16.893c0.888,1.822,2.666,6.938,4.75,6.002c2.17-0.976,4.303-2.035,6.39-3.178  c8.623-4.725,16.463-10.858,23.133-18.083c13.326-14.438,21.706-33.086,23.589-52.648c0.52-5.402,0.557-10.851,0.109-16.261  c-0.163-1.972,0.479-2.944-1.782-3.003c-1.487-0.04-2.978-0.024-4.465,0.045c-2.961,0.139-5.912,0.495-8.819,1.063  c-2.904,0.567-5.769,1.347-8.559,2.33c-2.156,0.761-1.251,1.722-1.146,3.755c0.075,1.518,0.1,3.034,0.069,4.553  c-0.101,5.342-0.849,10.67-2.237,15.829C223.724,211.08,210.143,226.975,192.411,234.988 M22.373,193.256  c20.755-36.501,72-43.867,102.368-14.938c0.932,0.889,9.705,10.924,9.387,11.107c2.159-1.247,4.317-2.493,6.478-3.739  c2.422-1.397,4.844-2.797,7.267-4.194c1.337-0.772,0.2-1.872-0.046-3.272c-0.511-2.897-0.279-5.917,0.655-8.706  c1.417-4.226,4.439-7.83,8.343-9.977c0.475-0.262,5.283-2.027,5.283-1.95c0-0.958,0-1.916,0-2.873c0-3.146,0-6.289,0-9.435  c0-1.172,0-2.343,0-3.515c0-1.714-2.77-0.993-4.146-1.149c-36.082-4.091-62.223-37.891-57.689-73.736  c2.045-16.158,10.346-31.236,22.774-41.737c7.614-6.433,16.677-11.097,26.347-13.521c2.467-0.619,1.486-3.208,1.486-5.585  c0-2.012,0-4.023,0-6.034c-37.878,5.568-69.961,33.562-80.666,70.313c-2.775,9.531-4.09,19.473-3.93,29.396  c0.102,6.34,0.807,12.669,2.111,18.875c0.486,2.315-0.51,1.773-2.471,2.473c-1.402,0.499-2.793,1.03-4.172,1.591  c-3.261,1.329-6.451,2.832-9.553,4.498c-17.467,9.385-31.898,23.946-41.045,41.544c-13.151,25.309-14.797,55.735-4.275,82.264  c2.786-1.608,5.572-3.218,8.359-4.825c2.018-1.164,1.217-1.211,0.559-3.744c-1.136-4.368-1.816-8.854-2.027-13.36  C13,216.695,16.254,203.943,22.373,193.256 M287.431,280.387c-17.186,10.461-37.741,13.489-56.965,6.84  c-19.219-6.618-34.516-22.153-40.912-41.436c-3.588-10.826-4.314-22.571-2.053-33.75c1.187-5.856,3.185-11.543,5.91-16.859  c-0.472-1.141-4.748-2.742-5.789-3.343c-2.529-1.462-5.062-2.923-7.591-4.384c-1.169-0.675-0.813-0.817-1.922,0.304  c-2.078,2.099-4.67,3.673-7.496,4.532c-5.016,1.524-10.574,0.728-14.957-2.15c-0.577-0.379-3.689-3.344-3.945-3.197  c-0.977,0.564-1.953,1.129-2.93,1.692c-2.729,1.575-5.459,3.151-8.188,4.728c-0.903,0.521-1.807,1.043-2.71,1.564  c-0.925,0.533,1.213,3.481,1.594,4.34c4.96,11.161,6.69,23.633,4.986,35.726c-2.544,18.052-12.729,34.733-27.818,45.018  c-16.273,11.091-36.85,14.462-55.789,8.896c-9.525-2.809-18.373-7.759-25.713-14.45c-0.619-0.564-3.664-4.103-4.207-3.788  c-0.974,0.562-1.947,1.124-2.92,1.686c-2.195,1.269-4.392,2.534-6.588,3.802c25.053,31.647,68.307,45.056,106.871,33.14  c10.344-3.196,20.155-8.105,28.931-14.445c2.317-1.674,4.563-3.447,6.727-5.314c1.469-1.268,1.532-2.373,3.196-0.932  c1.09,0.944,2.201,1.866,3.332,2.764c4.822,3.825,10.002,7.2,15.445,10.076c17.799,9.404,38.291,13.182,58.271,10.728  c25.688-3.154,49.598-16.482,65.67-36.785c-2.787-1.608-5.572-3.217-8.359-4.825c-2.215-1.278-2.521,0.453-4.338,2.18  C294.179,275.589,290.911,278.152,287.431,280.387 M281.776,127.865c-3.984-2.3-8.128-4.325-12.393-6.055  c-2.322-0.941-4.682-1.796-7.068-2.56c0.532-2.449,0.973-4.919,1.318-7.401c1.182-8.485,1.264-17.124,0.248-25.631  c-1.719-14.396-6.639-28.347-14.328-40.638C234.267,21.145,208.513,4.195,179.978,0c0,2.276,0,4.554,0,6.831c0,1.27,0,2.54,0,3.81  c0,1.375,4.59,1.825,5.869,2.242c9.807,3.203,18.822,8.755,26.1,16.069c14.012,14.083,21.026,34.102,18.76,53.846  c-2.037,17.953-11.636,34.498-26.125,45.283c-8.875,6.605-19.385,10.904-30.352,12.377c-0.693,0.093-5.48,0.346-5.48,0.715  c0,0.905,0,1.809,0,2.713c0,3.384,0,6.768,0,10.152c0,1.045,0,2.091,0,3.136c0,1.008,2.401,1.07,3.266,1.412  c4.492,1.781,8.146,5.397,9.972,9.874c0.869,2.132,1.313,4.428,1.313,6.729c0,0.762-1.012,5.897-0.832,6.002  c2.348,1.354,4.695,2.71,7.043,4.065c2.273,1.313,4.547,2.626,6.82,3.938c0.446,0.259,7.553-8.975,8.75-10.19  c7.268-7.391,16.326-13.038,26.184-16.254c37.057-12.094,77.027,11.165,85.025,49.311c2.082,10.247,1.686,20.957-1.182,31.017  c-0.688,2.406,1.336,2.499,3.398,3.69c1.973,1.139,3.943,2.277,5.916,3.416C342.317,205.065,323.774,152.112,281.776,127.865"
+   id="path6" />
+</svg>
+\ No newline at end of file
diff --git a/data/map-icons/svg/incomming/Blue_danube_easy.svg b/data/map-icons/svg/incomming/Blue_danube_easy.svg
new file mode 100644
index 0000000..56992d3
--- /dev/null
+++ b/data/map-icons/svg/incomming/Blue_danube_easy.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 76)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"    "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
+	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg  xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 width="400" height="120" viewBox="0 0 400 120" overflow="visible" enable-background="new 0 0 400 120"
+	 xml:space="preserve">
+	<symbol  id="Sharp" viewBox="-10 -26.3 20 52.6">
+		<g>
+			<g>
+				<path d="M-5-26.3h1.5v50H-5V-26.3z"/>
+				<path d="M3.5-23.7H5v50H3.5V-23.7z"/>
+				<path d="M10-10.5l-20-6v6l20,6V-10.5z"/>
+				<path d="M10,10.1l-20-6v6l20,6V10.1z"/>
+			</g>
+		</g>
+	</symbol>
+	<symbol  id="Treble_clef" viewBox="-25.9 -76.3 51.8 152.6">
+		<g>
+			<path d="M22-12.5c-4.4,5-9.8,9.6-16.7,9.3C4.2,2.9,2.6,8.4,1.1,14.6c0,0,9.6,11.9,14.3,20.4c4.7,8.6,0,30.4-8.6,41.2
+				C2.3,72.8-1,68.6-3.6,63.6c-6.3-12.2,0.1-41.9,0.1-41.9S-21,1.1-22.2-1.8c-2.1-4.4-5.1-8.1-3.1-19.6C-23.3-33-16.8-38.6-9-43
+				c5.5-2.7,8.9-3.5,17.5-2.6C9-55.9,8.2-69.9-3.2-73.8c-5.5-1.6-12.5,1.9-12.9,8c3.3-1.7,6.9,0,8.6,2.9c0.9,2.2,1,4.5,0.4,6.8
+				c-2,5.1-8.8,6.2-12.8,3.1c-4.9-4.3-3.8-11.6-0.3-16.7c3.6-4.4,8.8-7.2,14.5-6.6c18.6,2,17.1,27.9,17.1,31.2
+				c4.2,1.8,9.7,4.6,12.7,12.3C27.3-25.2,26.4-17.5,22-12.5z M-3.3,38.5c0,12,5.4,19.4,13.4,25.4c6.2-8.4,1.5-20-1.7-25.8
+				c-3.1-5.8-9.7-13.9-9.7-13.9S-3.3,29.6-3.3,38.5z M-20.1-22.5C-20.2-6.2-1.2,11.7-1.2,11.7c1-2.5,4-15.2,4-15.2
+				C-5-3.9-9.5-9.8-10.8-12.7c-1.3-3-2-6.4-1.4-10c0.9-5.2,6.8-10.8,9.6-11.9c1.1-0.4,1.7,1.7,1.3,2.3c-1.7,1-4.3,2.4-5.8,7.2
+				c-2.5,7.9,4.1,13.2,11.7,13C5-15.7,8.5-35.3,8.6-42.5C-6.4-43.9-20-36.2-20.1-22.5z M11.4-42.1c-0.2,8.3-2.7,23-3.8,29.9
+				c6.5-0.4,12.6-8.4,13.1-13.8C21.3-33.1,20.1-38.4,11.4-42.1z"/>
+		</g>
+	</symbol>
+	<symbol  id="half_note" viewBox="-13.5 -39.5 27 79.1">
+		<g>
+			<g>
+				<path d="M12,39.5h1.5v-66H12V39.5z"/>
+				<path d="M-12.2-36.2c-3.2,4.1-0.4,10.6,6.4,14.3c6.7,3.8,14.8,3.4,18-0.7c3.2-4.1,0.4-10.6-6.4-14.3C-0.9-40.7-9-40.4-12.2-36.2
+					z"/>
+				<path fill="#FFFFFF" d="M10.6-23.3c-1.1,2-6.7,0.9-12.5-2.5c-0.1,0-0.1-0.1-0.2-0.1S-2.3-26-2.3-26c-5.7-3.4-9.4-7.7-8.2-9.6
+					c1.1-2,6.7-0.9,12.5,2.5c0.1,0,0.1,0.1,0.2,0.1l0.1,0.1C8-29.6,11.7-25.3,10.6-23.3z"/>
+			</g>
+		</g>
+	</symbol>
+	<symbol  id="quarter_note" viewBox="-13.5 -39.5 27 79">
+		<g>
+			<g>
+				<path d="M12,39.5h1.5v-66H12V39.5z"/>
+				<g>
+					<path d="M-12.2-36.2c-3.2,4.1-0.4,10.6,6.4,14.3c6.7,3.8,14.8,3.4,18-0.7c3.2-4.1,0.4-10.6-6.4-14.3
+						C-0.9-40.6-9-40.3-12.2-36.2z"/>
+				</g>
+			</g>
+		</g>
+	</symbol>
+	<symbol  id="quarter_rest" viewBox="-9.6 -28 19.3 55.9">
+		<g>
+			<path d="M-5.6,26.6c1.5-1.6,13-15.7,13-15.7S1.1,4.8,1.1-1.6c0-7.5,8.6-14.3,8.6-14.3L8.8-17c-3.3,1.9-8.9,2.1-11.4-0.8
+				c-3.1-3.6,3.9-9.1,3.9-9.1L0.4-28C-2-26.2-12.1-16.6-7.8-11.9C-5.2-9-2-8.1,2.5-10.5L-9.6,2c7,8.6,8.2,11.1,8.2,13.4
+				c0,4.8-3.4,8.2-5.1,10.4c-0.6,0.9-1.7,1.6-1,2.2C-6.9,28.6-6.5,27.7-5.6,26.6z"/>
+		</g>
+	</symbol>
+	<g id="Background">
+		<path fill="#FFFFFF" d="M400,120H0V0h400V120z"/>
+	</g>
+	<g id="Music">
+		<path id="line_1" d="M400,85.6H0V85h400V85.6z"/>
+		<path id="line_2" d="M400,79H0v-0.7h400V79z"/>
+		<path id="line_3" d="M400,72.3H0v-0.7h400V72.3z"/>
+		<path id="line_4" d="M400,65.6H0V65h400V65.6z"/>
+		<path id="line_5" d="M400,59H0v-0.7h400V59z"/>
+		<g>
+			<path d="M46.9,84.8v-0.4h0.9v-2.7h-4.3v-0.9l5.7-7.9h1.5v7.3h1.2v1.4h-1.2v2.7h0.9v0.4H46.9z M47.8,80.3v-4.8l-3.4,4.8H47.8z"/>
+		</g>
+		<g>
+			<path d="M46,65v-0.4h0.3c0.4,0,0.8,0,1.1-0.1c0.3-0.1,0.5-0.1,0.7-0.3c0.2-0.1,0.3-0.3,0.4-0.6s0.1-0.9,0.1-1.7v-0.5
+				c0-0.7-0.1-1.2-0.3-1.5s-0.5-0.4-1-0.4c-0.4,0-0.7,0-0.9,0.1c-0.2,0.1-0.3,0.2-0.3,0.4c0,0.1,0.1,0.2,0.3,0.3c0,0,0,0,0,0
+				c0.3,0.2,0.4,0.3,0.5,0.5c0.1,0.2,0.1,0.4,0.1,0.6c0,0.4-0.1,0.7-0.3,0.9s-0.5,0.3-0.9,0.3c-0.4,0-0.7-0.1-1-0.4s-0.4-0.6-0.4-1
+				c0-0.6,0.3-1.1,0.9-1.5c0.6-0.4,1.3-0.7,2.1-0.7c1.3,0,2.3,0.3,3.1,0.8c0.7,0.5,1.1,1.3,1.1,2.3c0,0.8-0.3,1.4-0.8,1.8
+				c-0.5,0.5-1.3,0.8-2.4,0.9c1.2,0.2,2.1,0.5,2.7,1c0.6,0.5,0.9,1.2,0.9,2.2c0,1-0.4,1.8-1.3,2.4c-0.8,0.6-1.9,0.9-3.3,0.9
+				c-1,0-1.8-0.2-2.4-0.7c-0.6-0.4-0.9-1-0.9-1.6c0-0.4,0.1-0.8,0.4-1s0.6-0.4,1-0.4c0.4,0,0.7,0.1,0.9,0.4s0.3,0.6,0.3,1
+				c0,0.2,0,0.4-0.1,0.6c-0.1,0.2-0.2,0.3-0.4,0.4c-0.1,0-0.1,0.1-0.2,0.1c-0.2,0.1-0.3,0.2-0.3,0.3c0,0.2,0.1,0.3,0.4,0.4
+				s0.6,0.2,1,0.2c0.3,0,0.5-0.1,0.7-0.2c0.2-0.1,0.4-0.3,0.5-0.5s0.2-0.5,0.3-0.8c0.1-0.3,0.1-0.8,0.1-1.5v-0.8
+				c0-0.9-0.2-1.5-0.5-1.8c-0.3-0.3-0.9-0.5-1.9-0.5H46z"/>
+		</g>
+		<path d="M87.2,85.2h-0.7V58.6h0.7V85.2z"/>
+		<path d="M176,85.2h-0.7V58.6h0.7V85.2z"/>
+		<path d="M264.7,85.2H264V58.6h0.7V85.2z"/>
+		<path d="M353.3,85.2h-0.7V58.6h0.7V85.2z"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(0.3333 0 0 -0.3333 68.6665 78.7998)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(0.1977 0 0 -0.1977 44.8335 33.1582)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(0.3333 0 0 -0.3333 101.3335 78.7998)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(0.3333 0 0 -0.3333 127.3335 72.1338)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(0.3333 0 0 -0.3333 153.3335 65.4668)"/>
+		<path d="M156.3,82c-0.1-0.2-0.4-0.1-0.5,0c-5,8.2-30.5,26.6-54.1,12.9c-0.1-0.1-0.4,0.2-0.3,0.3C125.3,110.2,150.9,92.4,156.3,82z
+			"/>
+		<use xlink:href="#Sharp"  width="20" height="52.6" x="-10" y="-26.3" transform="matrix(0.3333 0 0 -0.3333 27.0337 58.6572)"/>
+		<use xlink:href="#Sharp"  width="20" height="52.6" x="-10" y="-26.3" transform="matrix(0.3333 0 0 -0.3333 36.0332 68.1572)"/>
+		
+			<use xlink:href="#half_note"  width="27" height="79.1" x="-13.5" y="-39.5" transform="matrix(0.3333 0 0 -0.3333 194 65.4668)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 240 62.1318)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 240 68.7988)"/>
+		<path d="M246.7,52.3h-13.3v-0.7h13.3V52.3z"/>
+		<path id="Stacatto" d="M241,45.3c0,0.6-0.4,1-1,1s-1-0.4-1-1c0-0.6,0.4-1,1-1S241,44.7,241,45.3z"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 280 62.1318)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 280 68.7988)"/>
+		<path d="M286.7,52.3h-13.3v-0.7h13.3V52.3z"/>
+		<path id="Stacatto_1_" d="M281,45.3c0,0.6-0.4,1-1,1s-1-0.4-1-1c0-0.6,0.4-1,1-1S281,44.7,281,45.3z"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 333.333 68.7988)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 333.333 75.4658)"/>
+		<g id="decrescendo">
+			<path d="M370.7,107.7l-137.3-4.3v-0.7l137.3,4.3V107.7z"/>
+			<path d="M233.3,112l137.3-4.3V107l-137.3,4.3V112z"/>
+		</g>
+		<path id="Stacatto_2_" d="M334.3,52c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1C333.9,51,334.3,51.4,334.3,52z"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 366.667 68.7988)"/>
+		
+			<use xlink:href="#quarter_note"  width="27" height="79" x="-13.5" y="-39.5" transform="matrix(-0.3333 0 0 0.3333 366.667 75.4658)"/>
+		<path id="Stacatto_3_" d="M367.7,52c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1C367.2,51,367.7,51.4,367.7,52z"/>
+		<g id="mezzoforte">
+			<path id="mezzo" d="M71.9,108.5c0,0-0.2-0.2-0.2-0.2l0,0l0,0c-0.1-0.1-0.3,0-0.4,0.1c-0.3,0.5-0.9,1.2-1.1,1.2c0,0,0,0,0,0
+				c0,0,0,0,0-0.1c0-0.2,0.2-0.6,0.4-1.2l0.3-0.8c0.4-1.3,0.9-2.7,0.9-3.3c0-0.4-0.4-1.2-1.2-1.2c-1.6,0-2.7,1.8-3.6,3.3
+				c0,0,0,0,0,0c0.3-1,0.7-1.9,0.7-2.3c0-0.5-0.6-1.1-1.3-1.1c-1.4,0-2.5,1.7-3.3,3c0.4-0.9,0.7-1.8,0.7-2.1c0-0.6-0.4-0.9-1.1-0.9
+				c-1.5,0-2.8,1.6-3,2.1c-0.1,0.1-0.1,0.3,0.1,0.4c0,0,0.2,0.2,0.2,0.2c0.1,0.1,0.2,0.1,0.2,0.1c0.1,0,0.2,0,0.2-0.1
+				c0.2-0.3,0.9-1,1-1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0.2-0.2,0.9-0.5,1.6l-0.3,1c0,0-1.1,3.4-1.1,3.4c-0.1,0.2,0,0.3,0,0.3
+				c0.1,0.1,0.2,0.1,0.3,0.1h1.4c0.1,0,0.3,0,0.4-0.2c0,0,0.6-1.6,0.6-1.6c0.2-0.6,0.5-1.1,0.7-1.5c1-1.6,2.1-2.9,2.3-2.9
+				c0.1,0,0.1,0,0.1,0.2c0,0.3-0.6,2-0.8,2.6l-1,3c0,0.1,0,0.2,0,0.3c0.1,0.1,0.2,0.1,0.3,0.1h1.5c0.1,0,0.3,0,0.4-0.2
+				c0,0,0.5-1.6,0.5-1.6c0.1-0.4,0.3-0.9,0.6-1.2c1.2-1.8,2.2-3.1,2.4-3.2c0,0,0.1,0,0.1,0.2c0,0.3-0.1,0.8-0.7,2.3
+				c-0.7,1.9-1,2.8-0.9,3.2c0,0.4,0.3,0.8,1,0.8c1.9,0,3.2-2,3.3-2.3C72,108.8,72.1,108.6,71.9,108.5z"/>
+			<path id="forte" d="M79.1,98.3c-1.1,0-2.4,0.8-2.8,1.4c-1,1.2-1.3,2.1-1.6,3c-0.1,0.3-0.2,0.6-0.3,0.9h-1.3
+				c-0.2,0-0.3,0.1-0.4,0.3c0,0-0.1,0.5-0.1,0.5c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.1,0.1,0.2,0.1h1.2l-1.3,6c-0.4,2-1.1,4.6-2.1,4.6
+				c-0.2,0-0.2-0.1-0.2-0.2c-0.1-0.7-0.5-1.2-1.1-1.2c-0.6,0-1,0.5-1,1.1c0,0.8,0.7,1.3,1.8,1.3c2.7,0,4.3-4.1,4.7-5.4
+				c0.4-1.4,0.9-3.3,1.3-4.9l0.3-1.4h1.7c0.3,0,0.3-0.2,0.4-0.3c0,0,0.1-0.4,0.1-0.4c0-0.1,0-0.2-0.1-0.3c0,0-0.1-0.1-0.2-0.1h-1.6
+				l0.1-0.4c0.4-1.7,0.9-3.8,1.8-3.8c0.3,0,0.4,0.2,0.4,0.4c0.1,0.5,0.3,1.1,1.2,1.1c0.6,0,1-0.6,1-1.1
+				C81.3,99.1,80.7,98.3,79.1,98.3z"/>
+		</g>
+		<text transform="matrix(0.9529 0 0 1 42.0273 22.6328)"><tspan x="0" y="0" style="font-family:serif; font-weight:bold;" font-size="18.0504">Tempo di valse</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 49.5542 40.6328)"><tspan x="0" y="0" style="font-family:serif; font-weight:bold;" font-size="16">=142</tspan></text>
+		
+			<use xlink:href="#Treble_clef"  width="51.8" height="152.6" x="-25.9" y="-76.3" transform="matrix(0.3333 0 0 -0.3333 11.6665 70.6328)"/>
+		
+			<use xlink:href="#quarter_rest"  width="19.3" height="55.9" x="-9.6" y="-28" transform="matrix(0.3333 0 0 -0.3333 301.6665 71.1328)"/>
+		
+			<use xlink:href="#quarter_rest"  width="19.3" height="55.9" x="-9.6" y="-28" transform="matrix(0.3333 0 0 -0.3333 385.333 71.1328)"/>
+	</g>
+	<g id="Notations">
+		<text transform="matrix(0.9529 0 0 1 36.5132 28.1943)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">1</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 0.4258 53.9658)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">4</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 33.4258 56.6328)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">5</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 39.0923 97.2998)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">2</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 83.0923 57.2998)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">3</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 73.0923 97.6328)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">6</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 93.4258 107.667)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">7</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 141.4258 104.2998)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">8</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 188.4258 99.6328)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">9</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 229.6143 37.9658)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">10</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 294.9478 56.9658)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">11</tspan></text>
+		<text transform="matrix(0.9529 0 0 1 225.9478 101.6328)"><tspan x="0" y="0" fill="#FB0F0C" style="font-family:Courier; font-weight:bold;" font-size="16" letter-spacing="-1.6">12</tspan></text>
+	</g>
+</svg>
diff --git a/data/map-icons/svg/incomming/Chukbol.svg b/data/map-icons/svg/incomming/Chukbol.svg
new file mode 100644
index 0000000..df92b65
--- /dev/null
+++ b/data/map-icons/svg/incomming/Chukbol.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="Chukbol.svg"
+   sodipodi:docbase="C:\Documents and Settings\XLB\Escritorio\Archivos de AEL\Tchoukball"
+   inkscape:version="0.40+cvs"
+   sodipodi:version="0.32"
+   id="svg3708"
+   height="64.000000px"
+   width="64.000000px">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     inkscape:window-y="31"
+     inkscape:window-x="110"
+     inkscape:window-height="543"
+     inkscape:window-width="640"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="34.780181"
+     inkscape:cx="33.617028"
+     inkscape:zoom="5.5492487"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF
+       id="RDF5">
+      <cc:Work
+         id="Work6"
+         rdf:about="">
+        <dc:format
+           id="format7">image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+           id="type9" />
+        <dc:title
+           id="title3733">Chukbol</dc:title>
+        <dc:date
+           id="date3735">15/122005</dc:date>
+        <dc:creator
+           id="creator3737">
+          <cc:Agent
+             id="Agent3739">
+            <dc:title
+               id="title3741">Fernando Inocencio</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher
+           id="publisher3743">
+          <cc:Agent
+             id="Agent3745">
+            <dc:title
+               id="title3747">Fajro</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:language
+           id="language3749">Español</dc:language>
+        <dc:description
+           id="description3751">Tchoukball</dc:description>
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain"
+           id="license3753" />
+        <dc:subject
+           id="subject3755">
+          <rdf:Bag
+             id="Bag3757">
+            <rdf:li
+               id="li3891">Tchoukball</rdf:li>
+            <rdf:li
+               id="li3893">Chukbol</rdf:li>
+            <rdf:li
+               id="li3895">Cxukpilko</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:contributor
+           id="contributor3779">
+          <cc:Agent
+             id="Agent3781">
+            <dc:title
+               id="title3783">Fajro</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:rights
+           id="rights3897">
+          <cc:Agent
+             id="Agent3899">
+            <dc:title
+               id="title3901"></dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+      <cc:License
+         id="License3785"
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           id="permits3787"
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           id="permits3789"
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           id="permits3791"
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <rect
+       ry="58.121475"
+       rx="0.00000000"
+       y="4.4408921e-015"
+       x="4.4408921e-015"
+       height="64.000000"
+       width="64.000000"
+       id="Rectangulo"
+       style="fill:#1404ab;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:2.0000000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dashoffset:0.00000000;stroke-opacity:1.0000000" />
+    <path
+       sodipodi:nodetypes="ccccccccccc"
+       id="path2119"
+       d="M 12.436597,56.208367 C 13.615742,55.544779 13.466009,53.851778 12.436597,53.375356 L 7.2427439,53.217966 L 7.2427439,35.432954 L 25.657315,55.264030 C 27.499764,55.529182 27.901037,54.690055 27.703379,53.532746 L 7.0853545,31.655606 C 6.4071523,31.023686 5.4256283,31.327008 5.2276857,31.933652 L 5.1966802,55.736198 L 5.1966802,56.208367 L 12.436597,56.208367 z "
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:5.0000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
+    <path
+       sodipodi:nodetypes="cccccccccccc"
+       id="path2879"
+       d="M 21.288991,38.375831 C 19.521123,39.138674 18.174457,38.158754 18.764880,36.338708 L 39.664980,15.916656 L 33.356961,9.4761253 C 32.956295,7.4420338 33.955002,6.7443928 35.730242,7.1028443 L 42.655380,14.342762 C 43.419074,15.167142 43.434103,16.178689 42.812770,16.703604 L 38.405864,21.267900 L 45.331002,28.350427 L 40.451928,34.173838 L 32.739842,26.776531 L 21.288991,38.375831 z "
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1.0000000" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path2881"
+       d="M 41.902877,35.836234 L 44.071886,33.321925 L 59.845279,49.843900 C 60.679301,51.248495 59.753964,52.840256 57.799215,52.204743 L 41.902877,35.836234 z "
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path2883"
+       d="M 46.993399,29.970534 L 44.759425,32.496613 L 51.715084,39.256514 C 54.156464,39.577532 54.108539,37.877158 53.761146,36.738282 L 46.993399,29.970534 z "
+       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    <path
+       transform="matrix(0.113233,0.000000,0.000000,0.113233,-6.292753,-8.339605)"
+       sodipodi:open="true"
+       sodipodi:end="6.1232237"
+       sodipodi:start="0.00000000"
+       d="M 354.44014,233.67494 A 29.884169,27.799227 0 1 1 354.05862,229.24707"
+       sodipodi:ry="27.799227"
+       sodipodi:rx="29.884169"
+       sodipodi:cy="233.67494"
+       sodipodi:cx="324.55597"
+       id="path2885"
+       style="stroke-opacity:1.0000000;stroke-dashoffset:0.00000000;stroke-miterlimit:4.0000000;stroke-linejoin:round;stroke-linecap:square;stroke-width:5.0000000;stroke:none;fill-rule:nonzero;fill-opacity:1.0000000;fill:#ffffff"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.113233,0.000000,0.000000,0.113233,-6.607532,-8.339605)"
+       sodipodi:open="true"
+       sodipodi:end="6.1232237"
+       sodipodi:start="0.00000000"
+       d="M 333.59073,157.22707 A 28.494207,29.189188 0 1 1 333.22696,152.57780"
+       sodipodi:ry="29.189188"
+       sodipodi:rx="28.494207"
+       sodipodi:cy="157.22707"
+       sodipodi:cx="305.09653"
+       id="path2887"
+       style="stroke-opacity:1.0000000;stroke-dashoffset:0.00000000;stroke-miterlimit:4.0000000;stroke-linejoin:round;stroke-linecap:square;stroke-width:8.0000000;stroke:#ffffff;fill-rule:nonzero;fill-opacity:1.0000000;fill:none"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/Emblem-deadly.svg b/data/map-icons/svg/incomming/Emblem-deadly.svg
new file mode 100644
index 0000000..da10b4a
--- /dev/null
+++ b/data/map-icons/svg/incomming/Emblem-deadly.svg
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   xmlns:ns="http://ns.adobe.com/Variables/1.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   i:viewOrigin="249.2485 453.7085"
+   i:rulerOrigin="-242 -332"
+   i:pageBounds="242 460 370 332"
+   width="48pt"
+   height="48pt"
+   viewBox="0 0 128.251 121.702"
+   overflow="visible"
+   enable-background="new 0 0 128.251 121.702"
+   xml:space="preserve"
+   id="svg153"
+   sodipodi:version="0.32"
+   sodipodi:docname="skull.svg"
+   sodipodi:docbase="/home/rursus/Desktop/icons/Grass/scalable/apps"
+   inkscape:version="0.44.1">
+  <defs
+   id="defs195"><linearGradient
+   y2="85.9819"
+   x2="79.3954"
+   y1="32.4824"
+   x1="2.9902"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient3782">
+      <stop
+   id="stop3784"
+   style="stop-color:white;stop-opacity:1;"
+   offset="0.0056" /><stop
+   offset="0.49434999"
+   style="stop-color:#faf4bb;stop-opacity:1;"
+   id="stop3788" />
+      <stop
+   id="stop3786"
+   style="stop-color:#d1cf5c;stop-opacity:1;"
+   offset="0.9831" />
+      
+      
+      
+    </linearGradient><linearGradient
+   id="linearGradient3755"><stop
+     id="stop3757"
+     offset="0"
+     style="stop-color:black;stop-opacity:1;" /><stop
+     style="stop-color:black;stop-opacity:0.84955752;"
+     offset="0.5"
+     id="stop3761" /><stop
+     id="stop3759"
+     offset="1"
+     style="stop-color:black;stop-opacity:0;" /></linearGradient><linearGradient
+   y2="85.9819"
+   x2="79.3954"
+   y1="32.4824"
+   x1="2.9902"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient3731">
+      <stop
+   id="stop3733"
+   style="stop-color:#c4cefd;stop-opacity:1;"
+   offset="0.0056" />
+      <stop
+   id="stop3735"
+   style="stop-color:#3240cf;stop-opacity:1;"
+   offset="0.9831" />
+      
+      
+      
+    </linearGradient>
+    <linearGradient
+   id="XMLID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="2.9902"
+   y1="32.4824"
+   x2="79.3954"
+   y2="85.9819">
+      <stop
+   offset="0.0056"
+   style="stop-color:#FFFFFF"
+   id="stop186" />
+      <stop
+   offset="0.9831"
+   style="stop-color:#1C1C1C"
+   id="stop187" />
+      
+      
+      
+    </linearGradient>
+  
+    
+    
+    
+    
+    
+  
+      
+    
+      
+      
+    
+      <linearGradient
+   id="XMLID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="30.1553"
+   y1="51.205101"
+   x2="78.9132"
+   y2="85.345802"
+   gradientTransform="matrix(1.53777,0,0,1.53789,2.6399,-29.3369)">
+        <stop
+   offset="0.0056"
+   style="stop-color:#FFFFFF"
+   id="stop175" />
+        <stop
+   offset="0.9831"
+   style="stop-color:#1C1C1C"
+   id="stop176" />
+        
+        
+        
+      </linearGradient>
+      
+      
+    
+      
+      
+    <radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3755"
+   id="radialGradient3753"
+   cx="64.282196"
+   cy="61.039604"
+   fx="64.282196"
+   fy="61.039604"
+   r="63.954281"
+   gradientTransform="matrix(1,0,0,0.999956,0,2.675063e-3)"
+   gradientUnits="userSpaceOnUse" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3782"
+   id="radialGradient3780"
+   cx="62.975849"
+   cy="42.444698"
+   fx="62.975849"
+   fy="42.444698"
+   r="23.902042"
+   gradientTransform="matrix(1,0,0,1.29819,0,-12.6566)"
+   gradientUnits="userSpaceOnUse" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3782"
+   id="radialGradient3806"
+   cx="63.986263"
+   cy="49.442539"
+   fx="63.986263"
+   fy="49.442539"
+   r="21.7887"
+   gradientTransform="matrix(1,0,0,0.470718,0,26.16907)"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3782"
+   id="linearGradient3814"
+   x1="62.752071"
+   y1="56.040272"
+   x2="62.849331"
+   y2="105.54034"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient3782"
+   id="linearGradient3816"
+   x1="62.752071"
+   y1="56.040272"
+   x2="62.849331"
+   y2="105.54034"
+   gradientUnits="userSpaceOnUse" /></defs>
+  <sodipodi:namedview
+   id="base"
+   inkscape:zoom="5.6568542"
+   inkscape:cx="22.655027"
+   inkscape:cy="27.851162"
+   inkscape:window-width="980"
+   inkscape:window-height="610"
+   inkscape:window-x="62"
+   inkscape:window-y="111"
+   inkscape:current-layer="svg153" />
+  <metadata
+   id="metadata154">
+    <sfw
+   id="sfw9">
+      <slices
+   id="slices11" />
+      <sliceSourceBounds
+   x="249.249"
+   y="332.007"
+   width="128.251"
+   height="121.702"
+   bottomLeftOrigin="true"
+   id="sliceSourceBounds13" />
+    </sfw>
+    <ns:variableSets>
+      <ns:variableSet
+   varSetName="binding1"
+   locked="none">
+        <ns:variables />
+        <ns:sampleDataSets />
+      </ns:variableSet>
+    </ns:variableSets>
+  <rdf:RDF><cc:Work
+     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
+  
+<path
+   d="M 128.23648,61.026491 C 128.24371,96.344758 99.618082,124.98221 64.298263,124.99108 C 28.978454,124.99995 0.33843408,96.376901 0.32791974,61.058634 C 0.31740893,25.74037 28.940383,-2.8997231 64.260196,-2.911873 C 99.580002,-2.924019 128.22268,25.696378 128.23646,61.014641"
+   id="path4457"
+   style="fill:url(#radialGradient3753);fill-opacity:1.0;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" /><path
+   id="path1381"
+   d="M 41.308156,38.771817 L 39.287335,32.763063 L 41.308156,22.40314 L 50.065048,14.529598 L 60.393691,11.628821 L 67.803368,11.628821 L 76.784798,14.3224 L 84.868083,22.817535 L 86.439833,27.7903 L 86.664368,34.627848 L 84.194475,38.357421 L 72.518619,63.014036 L 72.518619,70.058782 L 71.251758,70.909281 L 70.077465,71.076405 L 70.274537,68.54903 L 70.008761,71.702196 L 69.002432,72.079158 L 67.810964,72.071723 L 66.897201,71.936153 L 66.492574,70.818234 L 66.319367,68.846099 L 65.822169,71.913845 L 65.602677,72.589782 L 64.874056,73.094876 L 63.960296,73.215572 L 63.00025,72.951871 L 62.271629,72.218352 L 61.959569,68.922179 L 61.740077,72.288899 L 60.910259,72.881512 L 59.525027,73.260573 L 58.463785,72.870836 L 57.772822,72.139415 L 57.498421,68.546363 L 57.362873,71.189096 L 56.810763,71.995266 L 55.564382,72.288901 L 54.80399,71.947213 L 53.840831,71.216551 L 53.433084,70.058782 L 53.882157,58.662867 L 41.308156,38.771817 z "
+   style="fill:url(#radialGradient3780);fill-opacity:1.0;fill-rule:evenodd;stroke:black;stroke-width:2.00392187;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   id="path2910"
+   d="M 100.13651,91.81462 L 100.36104,95.958588 L 98.115689,98.030574 L 94.747653,100.93135 L 91.379617,100.10256 L 78.356546,88.499445 L 62.639049,81.247499 L 44.900729,75.238744 L 31.877658,72.130767 L 27.386945,73.166759 L 24.917051,73.581157 L 20.875408,72.337965 L 22.671693,68.608394 L 27.386945,66.329211 L 32.326729,62.806838 L 35.245694,64.050028 L 39.511871,67.779601 L 52.984014,72.545165 L 67.578833,78.968315 L 86.888903,86.634659 L 96.094868,90.985826 L 100.13651,91.81462 z "
+   style="fill:url(#linearGradient3814);fill-opacity:1.0;fill-rule:evenodd;stroke:black;stroke-width:2.00392187;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   id="path2906"
+   d="M 92.27776,62.806838 L 97.442081,63.428432 L 98.789297,66.122013 L 103.72908,66.329211 L 105.52537,69.644386 L 103.50455,72.545165 L 101.03465,72.545165 L 95.421261,70.47318 L 72.069547,79.175515 L 53.657619,88.292247 L 42.430836,92.229018 L 37.940122,96.580184 L 35.021157,100.93135 L 32.775801,102.17454 L 26.937872,99.066566 L 25.366122,93.679405 L 28.509622,90.57143 L 36.368372,89.742636 L 54.7803,81.040301 L 75.662118,73.373959 L 88.685189,66.536409 L 92.27776,62.806838 z "
+   style="fill:url(#linearGradient3816);fill-opacity:1.0;fill-rule:evenodd;stroke:black;stroke-width:2.00392187;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
+   id="path2144"
+   d="M 58.161559,56.439842 L 52.336858,59.698863 L 46.727889,57.781791 L 42.197561,50.880341 L 42.413294,43.212061 L 48.453724,39.186217 L 55.141345,42.445235 L 60.966049,44.554012 L 69.595235,43.595477 L 78.008695,40.528164 L 83.833396,42.445235 L 85.774963,48.004736 L 82.323288,53.755947 L 78.440152,56.439842 L 73.909828,59.123744 L 69.595235,57.781791 L 62.691885,50.113513 L 58.161559,56.439842 z "
+   style="fill:url(#radialGradient3806);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.96038902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+   id="path3676"
+   d="M 63.986262,52.239715 L 61.740904,52.446915 L 60.169156,56.383684 L 60.169156,58.455669 L 61.516369,57.626875 L 62.863584,55.55489 L 63.761727,57.419678 L 65.10894,58.248471 L 65.558013,55.969288 L 63.986262,52.239715 z "
+   style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" /><path
+   style="fill:#8b8b69;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21676981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 61.929555,47.307859 L 53.130538,42.894616 L 48.213442,40.339576 L 43.813936,43.359166 L 43.813936,48.701517 L 46.919469,53.579315 L 52.354153,55.437523 L 57.271254,54.276144 L 61.929555,47.307859 z "
+   id="path4438" /><path
+   style="fill:#45451b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21676981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 60.470075,47.530996 L 53.416022,44.026234 L 49.474053,41.997163 L 45.94703,44.395158 L 45.94703,48.637765 L 48.43669,52.511446 L 52.793603,53.987133 L 56.735577,53.064829 L 60.470075,47.530996 z "
+   id="path2914" /><path
+   style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.25981092;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 59.235126,47.801948 L 54.253218,45.569068 L 51.469212,44.276347 L 48.97826,45.804108 L 48.97826,48.507069 L 50.736578,50.97499 L 53.813637,51.91515 L 56.597646,51.32755 L 59.235126,47.801948 z "
+   id="path4440" /><path
+   style="fill:#8b8b69;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21676981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 64.807985,47.100659 L 73.607002,42.687416 L 78.524098,40.132376 L 82.923604,43.151966 L 82.923604,48.494317 L 79.818071,53.372115 L 74.383387,55.230323 L 69.466286,54.068944 L 64.807985,47.100659 z "
+   id="path4449" /><path
+   style="fill:#45451b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.21676981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 66.267465,47.323796 L 73.321518,43.819034 L 77.263487,41.789963 L 80.79051,44.187958 L 80.79051,48.430565 L 78.30085,52.304246 L 73.943937,53.779933 L 70.001963,52.857629 L 66.267465,47.323796 z "
+   id="path4451" /><path
+   style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.25981092;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+   d="M 67.502414,47.594748 L 72.484322,45.361868 L 75.268328,44.069147 L 77.75928,45.596908 L 77.75928,48.299869 L 76.000962,50.76779 L 72.923903,51.70795 L 70.139894,51.12035 L 67.502414,47.594748 z "
+   id="path4453" /></svg>
+\ No newline at end of file
diff --git a/data/map-icons/svg/incomming/Erste_hilfe.svg b/data/map-icons/svg/incomming/Erste_hilfe.svg
new file mode 100644
index 0000000..a6e1356
--- /dev/null
+++ b/data/map-icons/svg/incomming/Erste_hilfe.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN"
+	"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<svg width="300" height="300" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path fill="#006600" d="M0 0L0 300L300 300L300 0L0 0z"/>
+	<path fill="white" d="M120,60  L120,120  L60,120  L60,181  L120,181  L120,241  L181,241  L181,181  L241,181  L241,120  L181,120  L181,60 z"/>
+</svg>
+<!--
+<rdf:RDF xmlns="http://web.resource.org/cc/"
+		xmlns:dc="http://purl.org/dc/elements/1.1/"
+		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<Work rdf:about="">
+	<license rdf:resource="http://de.wikipedia.org/wiki/Wikipedia:GNU_Free_Documentation_License" />
+	<dc:title>Erste Hilfe Kreuz</dc:title>
+	<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+</Work>
+<License rdf:about="http://de.wikipedia.org/wiki/Wikipedia:GNU_Free_Documentation_License">
+	<permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+	<permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+	<permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+	<permits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+	<requires rdf:resource="http://web.resource.org/cc/Notice" />
+	<requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
+	<requires rdf:resource="http://web.resource.org/cc/SourceCode" />
+	<requires rdf:resource="http://web.resource.org/cc/Attribution" />
+</License>
+</rdf:RDF> -->
+\ No newline at end of file
diff --git a/data/map-icons/svg/incomming/Gouvernail_svg.svg b/data/map-icons/svg/incomming/Gouvernail_svg.svg
new file mode 100644
index 0000000..0c88ae8
--- /dev/null
+++ b/data/map-icons/svg/incomming/Gouvernail_svg.svg
@@ -0,0 +1,943 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="269.00000pt"
+   height="269.00000pt"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.42.2"
+   sodipodi:docbase="C:\Documents and Settings\nom\Bureau"
+   sodipodi:docname="gouvernail_svg.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3129">
+      <stop
+         style="stop-color:#dd8300;stop-opacity:1;"
+         offset="0"
+         id="stop3131" />
+      <stop
+         style="stop-color:#dd8300;stop-opacity:0;"
+         offset="1"
+         id="stop3133" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3105">
+      <stop
+         style="stop-color:#ffed4d;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3107" />
+      <stop
+         style="stop-color:#df8500;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3109" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3099">
+      <stop
+         id="stop3101"
+         offset="0.00000000"
+         style="stop-color:#f5cc00;stop-opacity:1.0000000;" />
+      <stop
+         id="stop3103"
+         offset="1.0000000"
+         style="stop-color:#854f00;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3031">
+      <stop
+         style="stop-color:#dd8300;stop-opacity:1;"
+         offset="0"
+         id="stop3033" />
+      <stop
+         style="stop-color:#854f00;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop3035" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3021">
+      <stop
+         style="stop-color:#5f1200;stop-opacity:1.0000000;"
+         offset="0.00000000"
+         id="stop3023" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.00000000;"
+         offset="1.0000000"
+         id="stop3025" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3031"
+       id="radialGradient3037"
+       cx="249.18234"
+       cy="288.60486"
+       fx="249.18234"
+       fy="288.60486"
+       r="103.09366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.975385,-5.429304e-2,4.052114e-2,1.474310,-334.7187,-243.3941)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3061"
+       cx="126.56636"
+       cy="287.35767"
+       fx="126.56636"
+       fy="287.35767"
+       r="24.018681"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.494293,-79.97537,25.28396)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3063"
+       cx="166.09789"
+       cy="370.25449"
+       fx="166.09789"
+       fy="370.25449"
+       r="21.667093"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,1.026384,-79.97537,-129.8034)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3065"
+       cx="249.56636"
+       cy="410.35767"
+       fx="249.56636"
+       fy="410.35767"
+       r="11.872261"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,2.023092,-79.97537,-539.8686)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3067"
+       cx="333.60648"
+       cy="370.82614"
+       fx="333.60648"
+       fy="370.82614"
+       r="22.238747"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.974295,-79.97537,-110.5026)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3069"
+       cx="372.56635"
+       cy="287.35767"
+       fx="372.56635"
+       fy="287.35767"
+       r="24.018681"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.494293,-79.97537,25.28396)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3071"
+       cx="333.60648"
+       cy="202.74588"
+       fx="333.60648"
+       fy="202.74588"
+       r="22.238747"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.974295,-79.97537,-114.8231)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3073"
+       cx="249.56636"
+       cy="164.35767"
+       fx="249.56636"
+       fy="164.35767"
+       r="11.872261"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,2.023092,-79.97537,-288.1879)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3075"
+       cx="166.09789"
+       cy="203.31754"
+       fx="166.09789"
+       fy="203.31754"
+       r="21.667093"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,1.026384,-79.97537,-125.3990)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3095"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,4.594855,0.000000,-860.4623)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3121"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3123"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3135"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,0.000000,1.000000,-4.840875,0.000000)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3155"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3173"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,4.594855,0.000000,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3175"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,0.000000,1.000000,-4.840875,0.000000)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3177"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3179"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,4.594855,-5.516421e-16,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,0.000000,1.000000,-4.840875,2.324529e-16)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3221"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,4.594855,2.966377e-15,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,0.000000,1.000000,-4.840875,-2.775558e-16)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3231"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,0.000000,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,-2.241789e-17,4.594855,-2.324868e-14,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,-4.878909e-18,1.000000,-4.840875,4.562323e-15)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,-4.878909e-18,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,-4.878909e-18,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,2.241789e-17,4.594855,-3.424434e-15,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3263"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,4.878909e-18,1.000000,-4.840875,-7.227552e-14)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,4.878909e-18,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,4.878909e-18,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3289"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,1.494525e-17,4.594855,-4.553885e-14,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,3.252607e-18,1.000000,-4.840875,2.116016e-14)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3293"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,3.252607e-18,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3295"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,3.252607e-18,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3099"
+       id="radialGradient3297"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,-1.494525e-17,4.594855,-6.369321e-14,-860.4623)"
+       cx="249.01563"
+       cy="239.35938"
+       fx="249.01563"
+       fy="239.35938"
+       r="10.231636" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.018709,0.000000,-3.252607e-18,1.000000,-4.840875,-7.238655e-14)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3301"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,-3.252607e-18,1.000000,144.8537,21.07143)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3129"
+       id="linearGradient3303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.419433,0.000000,-3.252607e-18,1.000000,144.8537,-20.92857)"
+       x1="239.65192"
+       y1="239.14790"
+       x2="258.74092"
+       y2="239.14790" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3311"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3315"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3319"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3323"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3327"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3331"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3335"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3105"
+       id="radialGradient3339"
+       gradientUnits="userSpaceOnUse"
+       cx="242.85715"
+       cy="278.79074"
+       fx="242.85715"
+       fy="278.79074"
+       r="16.928572" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="23.197404"
+     inkscape:cy="253.21453"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1280"
+     inkscape:window-height="753"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:url(#radialGradient3073);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 168.65349,20.801402 C 164.29721,20.801402 160.77849,26.835692 160.77849,34.246632 C 160.77849,39.639832 162.67867,44.231612 165.37224,46.362782 C 165.33360,52.142542 160.77328,62.779762 158.21599,67.844242 L 180.96599,67.844242 C 179.12885,64.396622 173.16070,53.167942 172.71599,46.610062 C 175.35831,44.445592 177.21598,39.916222 177.21599,34.586622 C 177.21600,28.596222 174.89808,23.583862 171.71599,21.852292 C 171.46162,21.668942 171.20177,21.557462 170.93474,21.419582 C 170.91523,21.412762 170.89181,21.426152 170.87224,21.419582 C 170.16131,21.061182 169.43148,20.801402 168.65349,20.801402 z "
+       id="path1415" />
+    <g
+       id="g3191"
+       transform="matrix(2.032879e-18,1.000000,-1.000000,2.032879e-18,457.3996,-80.69112)">
+      <path
+         style="fill:url(#radialGradient3225);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         id="path3193" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3227);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         id="path3195" />
+      <path
+         id="path3197"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3229);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3231);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         id="path3199" />
+    </g>
+    <g
+       id="g3233"
+       transform="matrix(-0.707107,0.707107,0.707107,0.707107,141.2200,-211.6569)">
+      <path
+         style="fill:url(#radialGradient3253);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         id="path3235" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3255);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         id="path3237" />
+      <path
+         id="path3239"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3257);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3259);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         id="path3241" />
+    </g>
+    <g
+       transform="matrix(-0.707107,0.707107,-0.707107,-0.707107,549.0217,196.1448)"
+       id="g3243">
+      <path
+         id="path3245"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         style="fill:url(#radialGradient3261);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+      <path
+         id="path3247"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         style="opacity:0.60805863;fill:url(#linearGradient3263);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3265);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         id="path3249" />
+      <path
+         id="path3251"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3267);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    </g>
+    <g
+       id="g3279"
+       transform="matrix(-0.707107,-0.707107,0.707107,-0.707107,141.2200,547.9478)">
+      <path
+         style="fill:url(#radialGradient3297);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         id="path3281" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3299);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         id="path3283" />
+      <path
+         id="path3285"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3301);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3303);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         id="path3287" />
+    </g>
+    <g
+       transform="matrix(-0.707107,-0.707107,-0.707107,0.707107,549.0217,140.1461)"
+       id="g3269">
+      <path
+         id="path3271"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         style="fill:url(#radialGradient3289);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+      <path
+         id="path3273"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         style="opacity:0.60805863;fill:url(#linearGradient3291);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3293);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         id="path3275" />
+      <path
+         id="path3277"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3295);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    </g>
+    <g
+       transform="matrix(2.032879e-18,1.000000,1.000000,-2.032879e-18,-119.3191,-80.69112)"
+       id="g3181">
+      <path
+         id="path3183"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         style="fill:url(#radialGradient3217);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+      <path
+         id="path3185"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         style="opacity:0.60805863;fill:url(#linearGradient3219);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3221);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         id="path3187" />
+      <path
+         id="path3189"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3223);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    </g>
+    <g
+       id="g3163"
+       transform="matrix(1.000000,0.000000,0.000000,-1.000000,-79.97537,456.6839)">
+      <path
+         style="fill:url(#radialGradient3173);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         id="path3165" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3175);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         id="path3167" />
+      <path
+         id="path3169"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3177);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3179);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         id="path3171" />
+    </g>
+    <path
+       id="path1526"
+       d="M 168.65349,313.84424 C 164.29721,313.84424 160.77849,307.80995 160.77849,300.39901 C 160.77849,295.00581 162.67867,290.41403 165.37224,288.28286 C 165.33360,282.50310 160.77328,271.86588 158.21599,266.80140 L 180.96599,266.80140 C 179.12885,270.24902 173.16070,281.47770 172.71599,288.03558 C 175.35831,290.20005 177.21598,294.72942 177.21599,300.05902 C 177.21600,306.04942 174.89808,311.06178 171.71599,312.79335 C 171.46162,312.97670 171.20177,313.08818 170.93474,313.22606 C 170.91523,313.23288 170.89181,313.21949 170.87224,313.22606 C 170.16131,313.58446 169.43148,313.84424 168.65349,313.84424 z "
+       style="fill:url(#radialGradient3065);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+    <path
+       id="path1528"
+       d="M 316.11241,166.38532 C 316.11241,162.02904 310.07812,158.51032 302.66718,158.51032 C 297.27398,158.51032 292.68220,160.41050 290.55103,163.10407 C 284.77127,163.06543 274.13405,158.50511 269.06957,155.94782 L 269.06957,178.69782 C 272.51719,176.86068 283.74587,170.89253 290.30375,170.44782 C 292.46822,173.09014 296.99759,174.94781 302.32719,174.94782 C 308.31759,174.94783 313.32995,172.62991 315.06152,169.44782 C 315.24487,169.19345 315.35635,168.93360 315.49423,168.66657 C 315.50105,168.64706 315.48766,168.62364 315.49423,168.60407 C 315.85263,167.89314 316.11241,167.16331 316.11241,166.38532 z "
+       style="fill:url(#radialGradient3069);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+    <path
+       style="fill:url(#radialGradient3061);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 23.069574,166.38532 C 23.069574,162.02904 29.103864,158.51032 36.514804,158.51032 C 41.908004,158.51032 46.499784,160.41050 48.630954,163.10407 C 54.410714,163.06543 65.047934,158.50511 70.112414,155.94782 L 70.112414,178.69782 C 66.664794,176.86068 55.436114,170.89253 48.878234,170.44782 C 46.713764,173.09014 42.184394,174.94781 36.854794,174.94782 C 30.864394,174.94783 25.852034,172.62991 24.120464,169.44782 C 23.937114,169.19345 23.825634,168.93360 23.687754,168.66657 C 23.680934,168.64706 23.694324,168.62364 23.687754,168.60407 C 23.329354,167.89314 23.069574,167.16331 23.069574,166.38532 z "
+       id="path1530" />
+    <path
+       style="fill:url(#radialGradient3067);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 273.86019,270.26620 C 276.94055,267.18584 275.16177,260.43084 269.92144,255.19052 C 266.10788,251.37695 261.51737,249.47370 258.10576,249.87138 C 254.04618,245.75715 249.74916,235.01086 247.97631,229.62146 L 231.88963,245.70814 C 235.62652,246.84692 247.78651,250.56668 252.73809,254.88934 C 252.40020,258.28825 254.28938,262.80457 258.05797,266.57318 C 262.29381,270.80904 267.47710,272.71429 270.95159,271.68862 C 271.26110,271.63840 271.52367,271.53349 271.80999,271.44217 C 271.82860,271.43319 271.83570,271.40716 271.85418,271.39797 C 272.61031,271.14869 273.31007,270.81632 273.86019,270.26620 z "
+       id="path1532" />
+    <path
+       id="path1534"
+       d="M 66.647614,63.053622 C 69.727974,59.973262 76.482974,61.752042 81.723294,66.992372 C 85.536864,70.805932 87.440114,75.396442 87.042434,78.808052 C 91.156667,82.867632 101.90296,87.164652 107.29235,88.937502 L 91.205677,105.02418 C 90.066897,101.28729 86.347134,89.127302 82.024474,84.175722 C 78.625564,84.513612 74.109244,82.624432 70.340634,78.855842 C 66.104774,74.620002 64.199524,69.436712 65.225194,65.962222 C 65.275414,65.652712 65.380324,65.390142 65.471644,65.103822 C 65.480624,65.085212 65.506654,65.078112 65.515844,65.059632 C 65.765124,64.303502 66.097494,63.603742 66.647614,63.053622 z "
+       style="fill:url(#radialGradient3075);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+    <path
+       id="path1536"
+       d="M 66.647614,270.44871 C 69.727974,273.52907 76.482974,271.75029 81.723294,266.50996 C 85.536864,262.69640 87.440114,258.10589 87.042434,254.69428 C 91.156667,250.63470 101.90296,246.33768 107.29235,244.56483 L 91.205677,228.47815 C 90.066897,232.21504 86.347134,244.37503 82.024474,249.32661 C 78.625564,248.98872 74.109244,250.87790 70.340634,254.64649 C 66.104774,258.88233 64.199524,264.06562 65.225194,267.54011 C 65.275414,267.84962 65.380324,268.11219 65.471644,268.39851 C 65.480624,268.41712 65.506654,268.42422 65.515844,268.44270 C 65.765124,269.19883 66.097494,269.89859 66.647614,270.44871 z "
+       style="fill:url(#radialGradient3063);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+    <path
+       style="fill:url(#radialGradient3071);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 273.86019,63.236132 C 276.94055,66.316492 275.16177,73.071492 269.92144,78.311812 C 266.10788,82.125382 261.51737,84.028632 258.10576,83.630952 C 254.04618,87.745182 249.74916,98.491467 247.97631,103.88087 L 231.88963,87.794192 C 235.62652,86.655412 247.78651,82.935652 252.73809,78.612992 C 252.40020,75.214082 254.28938,70.697762 258.05797,66.929152 C 262.29381,62.693292 267.47710,60.788042 270.95159,61.813712 C 271.26110,61.863932 271.52367,61.968842 271.80999,62.060162 C 271.82860,62.069142 271.83570,62.095172 271.85418,62.104362 C 272.61031,62.353642 273.31007,62.686012 273.86019,63.236132 z "
+       id="path1538" />
+    <g
+       id="g3157"
+       transform="translate(-79.97537,-120.0348)">
+      <path
+         id="path2273"
+         d="M 248.62500,192.84375 C 244.26872,192.84375 240.75000,198.87031 240.75000,206.28125 C 240.75000,211.67446 242.65018,216.27508 245.34375,218.40625 C 245.33452,219.78742 245.34834,225.15261 245.34375,228.93750 L 239.28125,239.40625 L 245.34375,249.90625 C 245.34834,253.62737 245.33463,258.94773 245.34375,260.31250 C 242.65018,262.44367 240.75000,267.04431 240.75000,272.43750 C 240.75000,279.84844 244.26872,285.87499 248.62500,285.87500 C 249.40299,285.87500 250.13282,285.60841 250.84375,285.25000 C 250.86332,285.24343 250.88674,285.25683 250.90625,285.25000 C 251.17328,285.11212 251.43313,285.02710 251.68750,284.84375 C 254.86959,283.11218 257.18752,278.08414 257.18750,272.09375 C 257.18749,266.76415 255.32982,262.22696 252.68750,260.06250 C 252.79326,258.50294 252.79119,253.37523 252.84375,249.65625 L 258.75000,239.40625 L 252.84375,229.18750 C 252.79120,225.41443 252.79437,220.23216 252.68750,218.65625 C 255.32982,216.49178 257.18749,211.95460 257.18750,206.62500 C 257.18752,200.63460 254.86959,195.60657 251.68750,193.87500 C 251.43313,193.69165 251.17328,193.60663 250.90625,193.46875 C 250.88674,193.46193 250.86332,193.47532 250.84375,193.46875 C 250.13282,193.11035 249.40299,192.84375 248.62500,192.84375 z "
+         style="fill:url(#radialGradient3095);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.99452198;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" />
+      <path
+         id="path3127"
+         d="M 239.80405,239.14790 L 258.23147,239.14790"
+         style="opacity:0.60805863;fill:url(#linearGradient3135);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+      <path
+         style="opacity:0.60805863;fill:url(#linearGradient3147);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
+         d="M 245.58141,260.21933 L 253.16853,260.21933"
+         id="path3145" />
+      <path
+         id="path3153"
+         d="M 245.58141,218.21933 L 253.16853,218.21933"
+         style="opacity:0.60805863;fill:url(#linearGradient3155);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
+    </g>
+    <path
+       style="fill:url(#radialGradient3037);fill-opacity:1.0000000;stroke:#000000;stroke-width:0.77724046;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       d="M 169.21913,65.864982 C 112.52499,65.864982 66.501944,111.86373 66.501944,168.55789 C 66.501944,225.25202 112.52499,271.27506 169.21913,271.27506 C 225.91326,271.27506 271.91203,225.25202 271.91202,168.55789 C 271.91202,111.86374 225.91327,65.864982 169.21913,65.864982 z M 167.83467,84.105842 C 213.99594,84.105842 251.46089,121.57079 251.46089,167.73206 C 251.46089,213.89333 213.99595,251.35828 167.83467,251.35828 C 121.67338,251.35827 84.208454,213.89334 84.208454,167.73206 C 84.208454,121.57079 121.67340,84.105842 167.83467,84.105842 z "
+       id="path1349" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3121);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       id="path1540"
+       sodipodi:cx="242.85715"
+       sodipodi:cy="278.79074"
+       sodipodi:rx="16.428572"
+       sodipodi:ry="16.428572"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       transform="matrix(1.238686,0.000000,0.000000,1.238686,-131.6168,-176.7641)" />
+    <path
+       transform="matrix(0.567382,0.000000,0.000000,0.567382,31.41423,10.38916)"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       sodipodi:ry="16.428572"
+       sodipodi:rx="16.428572"
+       sodipodi:cy="278.79074"
+       sodipodi:cx="242.85715"
+       id="path2269"
+       style="fill:url(#radialGradient3123);fill-opacity:1.0000000;stroke:#000000;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3311);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       id="path3309"
+       sodipodi:cx="242.85715"
+       sodipodi:cy="278.79074"
+       sodipodi:rx="16.428572"
+       sodipodi:ry="16.428572"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,130.2969,108.9844)" />
+    <path
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,130.2969,138.2788)"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       sodipodi:ry="16.428572"
+       sodipodi:rx="16.428572"
+       sodipodi:cy="278.79074"
+       sodipodi:cx="242.85715"
+       id="path3313"
+       style="fill:url(#radialGradient3315);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3319);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       id="path3317"
+       sodipodi:cx="242.85715"
+       sodipodi:cy="278.79074"
+       sodipodi:rx="16.428572"
+       sodipodi:ry="16.428572"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,115.9022,123.8841)" />
+    <path
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,144.6915,123.6315)"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       sodipodi:ry="16.428572"
+       sodipodi:rx="16.428572"
+       sodipodi:cy="278.79074"
+       sodipodi:cx="242.85715"
+       id="path3321"
+       style="fill:url(#radialGradient3323);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3327);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       id="path3325"
+       sodipodi:cx="242.85715"
+       sodipodi:cy="278.79074"
+       sodipodi:rx="16.428572"
+       sodipodi:ry="16.428572"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,140.9035,113.0249)" />
+    <path
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,120.1954,133.9856)"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       sodipodi:ry="16.428572"
+       sodipodi:rx="16.428572"
+       sodipodi:cy="278.79074"
+       sodipodi:cx="242.85715"
+       id="path3329"
+       style="fill:url(#radialGradient3331);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3335);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       id="path3333"
+       sodipodi:cx="242.85715"
+       sodipodi:cy="278.79074"
+       sodipodi:rx="16.428572"
+       sodipodi:ry="16.428572"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,140.1460,133.7331)" />
+    <path
+       transform="matrix(0.160738,0.000000,0.000000,0.160738,119.6904,113.2775)"
+       d="M 259.28572 278.79074 A 16.428572 16.428572 0 1 1  226.42858,278.79074 A 16.428572 16.428572 0 1 1  259.28572 278.79074 z"
+       sodipodi:ry="16.428572"
+       sodipodi:rx="16.428572"
+       sodipodi:cy="278.79074"
+       sodipodi:cx="242.85715"
+       id="path3337"
+       style="fill:url(#radialGradient3339);fill-opacity:1.0000000;stroke:#000000;stroke-width:3.5298612;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.58351648;fill:none;fill-opacity:1.0000000;stroke:#000000;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
+       id="path4069"
+       sodipodi:cx="257.84143"
+       sodipodi:cy="280.85818"
+       sodipodi:rx="97.732262"
+       sodipodi:ry="97.732262"
+       d="M 355.57369 280.85818 A 97.732262 97.732262 0 1 1  160.10917,280.85818 A 97.732262 97.732262 0 1 1  355.57369 280.85818 z"
+       transform="translate(-88.07690,-112.4586)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/Herzlinie.svg b/data/map-icons/svg/incomming/Herzlinie.svg
new file mode 100644
index 0000000..76edbb5
--- /dev/null
+++ b/data/map-icons/svg/incomming/Herzlinie.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+	"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="690" height="500" version="1.1"
+		xmlns="http://www.w3.org/2000/svg"
+		xmlns:xlink="http://www.w3.org/1999/xlink">
+
+	<!-- Metadata -->
+	<desc  xml:lang="de">Dieses Bild zeigt den Unterschied zwischen der Drehung um die Herzlinie und die um die Schienenmitte.</desc>
+
+	<!-- Stylesheet -->
+	<style type="text/css"><![CDATA[
+		text { fill: black; }
+		text.explanation { font-size: 16; }
+		#middleMarker { fill: red; }
+		#Person { stroke: black; }
+		.personBefore { fill: #cdc6cd; }
+		.personAfter { fill: #838183; }
+	]]></style>
+
+	<!-- Definitions -->
+	<defs>
+		<circle id="middleMarker" cx="0" cy="0" r="6" />
+
+		<symbol id="Person">
+			<!-- Head -->
+			<circle cx="59" cy="30" r="30" /><!-- y+319 -->
+
+			<!-- Body                 right shoulder           right hand                right foot        left foot                  left hand             left shoulder -->
+			<path d="M15,60  L101,60  Q118,60 118,79  L118,170  Q106,188 94,170  L94,304  Q76.5,330 59,304  Q42.5,330 24,304  L24,170  Q12,188 0,170  L0,79  Q0,60 15,60 z" />
+			<!-- Lines between body and arms and the legs -->
+			<path d="M94,170 L94,110   M24,170 L24,110   M59,304 L59,220" fill="none" />
+
+			<!-- Base-line (under a Person) -->
+			<circle cx="-21"  cy="318" r="7" />
+			<circle cx="142" cy="318" r="7"  />
+			<rect x="-14" y="316" width="149" height="5" />
+		</symbol>
+	</defs>
+
+	<!--
+		————————————
+		|Main Image|
+	    ————————————
+	-->
+	<!-- Background -->
+	<rect x="0" y="0" width="690" height="500" fill="white" />
+	<!-- Headline -->
+	<text x="345" y="30" text-anchor="middle" font-size="26">
+		Herzlinienprinzip
+	</text>
+
+	<!-- left Person -->
+	<g transform="translate(59,60)">
+		<use xlink:href="#Person" class="personBefore" />
+		<use xlink:href="#Person" class="personAfter" transform="rotate(45 59 320)"/>
+		<use xlink:href="#middleMarker" transform="translate(59,320)"/>
+		<text class="explanation" xml:lang="de">
+			<tspan x="-30" y="410">Weg, den der Kopf zurücklegt bei</tspan>
+			<tspan x="-30" y="435">Drehung um die Schienenmitte</tspan>
+		</text>
+	</g>
+
+	<!-- right Person -->
+	<g transform="translate(500,60)">
+		<use xlink:href="#Person" class="personBefore" />
+		<use xlink:href="#Person" class="personAfter" transform="rotate(45 59 107)"/>
+		<use xlink:href="#middleMarker" transform="translate(59,107)" />
+		<text class="explanation" xml:lang="de">
+			<tspan x="-80" y="410">Weg, den der Kopf zurücklegt bei</tspan>
+			<tspan x="-80" y="435">Drehung um die Herzlinie</tspan>
+		</text>
+	</g>
+</svg>
+<!-- License: GNU Free Documentation License 1.2
+	<rdf:RDF xmlns="http://web.resource.org/cc/"
+			xmlns:dc="http://purl.org/dc/elements/1.1/"
+			xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+		<Work rdf:about="">
+			<license rdf:resource="http://www.gnu.org/copyleft/fdl.html" />
+			<dc:title>Herzlinienprinzip</dc:title>
+			<dc:date>2004-2005</dc:date>
+			<dc:description>Dieses Bild zeigt den Unterschied zwischen der Drehung um die Herzlinie und die um die Schienenmitte.</dc:description>
+			<dc:creator><Agent><dc:title>Boris23, Krummbein123</dc:title></Agent></dc:creator>
+			<dc:rights><Agent><dc:title>Boris23, Krummbein123</dc:title></Agent></dc:rights>
+			<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+		</Work>
+		<License rdf:about="http://www.gnu.org/copyleft/fdl.html">
+			<permits rdf:resource="http://web.resource.org/cc/Reproduction" />
+			<permits rdf:resource="http://web.resource.org/cc/Distribution" />
+			<permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+			<requires rdf:resource="http://web.resource.org/cc/Notice" />
+			<requires rdf:resource="http://web.resource.org/cc/Attribution" />
+			<requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
+			<requires rdf:resource="http://web.resource.org/cc/SourceCode" />
+		</License>
+</rdf:RDF> -->
+\ No newline at end of file
diff --git a/data/map-icons/svg/incomming/Human.svg b/data/map-icons/svg/incomming/Human.svg
new file mode 100644
index 0000000..58252b8
--- /dev/null
+++ b/data/map-icons/svg/incomming/Human.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Humans from the Pioneer 11 plaque, GFDL-1.2 SVG rendition derived from PD NASA image. Copyright 2005, Gregory Maxwell -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   x="0.00000000"
+   y="0.00000000"
+   width="687.00000"
+   height="863.00000"
+   id="svg3553">
+  <defs
+     id="defs3" />
+  <g
+     id="layer1">
+    <g
+       id="humans">
+      <path
+         d="M 640.26159,827.96893 C 635.09409,824.76283 627.73479,816.56823 623.90759,809.75863 C 620.08039,802.94893 615.12979,797.37746 612.90639,797.37746 C 605.68959,797.37746 601.10969,788.34182 600.62779,773.15249 C 600.16299,758.50586 587.55359,729.33812 562.02239,683.85196 C 555.12259,671.55934 552.71439,663.29592 552.71439,651.91237 C 552.71439,640.67335 550.33169,632.32939 543.82799,620.79344 C 538.94049,612.12416 531.13199,591.87461 526.47589,575.79446 C 521.81969,559.71430 513.48549,536.26633 507.95549,523.68786 L 497.90099,500.81791 L 496.02819,517.53278 C 493.81819,537.25718 495.56599,613.30295 498.53439,626.57390 C 499.67009,631.65184 499.38949,657.96482 497.91079,685.04719 C 495.81599,723.41151 496.12609,737.34681 499.31459,748.13679 C 505.94559,770.57558 504.92669,774.96834 491.50329,781.81645 C 483.82869,785.73173 478.38579,791.21351 476.33679,797.09131 C 471.95149,809.67093 450.34449,820.94093 439.81219,816.14213 C 433.55249,813.28993 432.55289,810.86833 433.18859,800.09513 C 433.77339,790.18278 435.86349,785.98307 442.74279,780.89694 C 454.08729,772.50963 463.46569,757.25530 463.46569,747.19051 C 463.46569,742.83800 459.15159,722.22807 453.87869,701.39063 C 446.84979,673.61369 443.95609,654.23706 443.03399,628.77348 C 441.92619,598.18044 440.31089,589.75942 429.47669,558.09284 C 422.64539,538.12652 413.92429,518.67667 409.86099,514.34645 C 405.83729,510.05826 399.70119,501.15687 396.22519,494.56555 C 390.21669,483.17197 390.15809,482.11028 395.03589,473.02276 C 399.33139,465.02010 400.03119,455.38844 399.33539,413.85142 C 398.58619,369.12615 399.18219,362.30466 405.38569,344.60673 C 410.50319,330.00737 412.71539,314.97949 414.01549,285.98317 C 415.60269,250.58485 416.42999,246.28252 422.99229,239.29811 C 426.96789,235.06674 434.08829,230.00273 438.81519,228.04476 C 452.37339,222.42879 456.63759,202.76489 449.78619,177.45374 C 443.06279,152.61553 445.56069,126.18738 455.94339,112.30897 C 463.54099,102.15335 492.04779,86.465342 502.90409,86.465342 C 512.73379,86.465342 529.03759,102.53568 539.91769,122.94886 C 548.56679,139.17619 549.64499,144.01662 549.71029,166.91221 C 549.81279,202.81942 553.24339,215.07805 566.34069,226.33803 C 580.24649,238.29308 586.56259,253.91320 586.58559,276.40469 C 586.59549,286.19179 588.67289,307.92767 591.20189,324.70667 C 597.08949,363.76911 597.03499,392.02125 591.03309,412.23193 C 585.22289,431.79681 584.65099,448.69279 587.57969,514.24363 C 590.16549,572.12123 597.08299,617.89655 605.93659,635.71890 C 614.78009,653.52076 616.79209,661.94608 623.51689,709.33819 C 630.13029,755.94485 635.21789,768.43493 655.55019,787.97917 C 665.07609,797.13590 666.58349,800.52063 666.58349,812.75343 C 666.58349,834.52183 658.42499,839.23783 640.26159,827.96893 z M 658.51529,829.04003 C 659.72009,827.83543 657.65449,824.54823 653.92529,821.73533 L 647.14499,816.62093 L 653.99629,806.99913 C 660.14749,798.36055 660.10269,796.08095 653.79779,796.91505 C 652.68999,797.06161 645.88529,787.41961 638.67639,775.48838 C 625.62829,753.89299 617.90809,725.91928 617.50469,698.77333 C 617.33379,687.27339 610.36999,657.11779 604.51499,642.52329 C 601.96819,636.17527 600.34759,634.93859 598.46529,637.90697 C 596.58839,640.86695 595.86879,640.29989 595.79999,635.80652 C 595.72189,630.70103 595.19699,630.43864 592.72249,634.26775 C 590.15149,638.24606 589.73269,638.16481 589.69209,633.68000 C 589.66619,630.81776 590.81779,627.75109 592.25119,626.86515 C 593.68469,625.97922 593.58919,618.62679 592.03909,610.52642 C 590.48889,602.42606 588.07069,576.40997 586.66509,552.71290 C 585.25959,529.01583 583.97019,508.98719 583.79979,508.20478 C 583.62929,507.42241 579.66749,511.36086 574.99569,516.95694 C 566.63279,526.97428 566.41729,527.03863 561.05929,521.11802 C 556.68659,516.28625 556.23909,513.46846 558.78209,506.77982 C 560.52279,502.20130 561.87439,496.12183 561.78569,493.26987 C 561.65559,489.09291 560.68489,489.43110 556.79399,495.00899 C 554.13729,498.81745 550.74769,501.93346 549.26149,501.93346 C 544.69879,501.93346 546.26869,465.49882 551.35429,453.36333 C 553.99149,447.07028 556.88939,429.79838 557.79409,414.98137 C 559.33759,389.70032 558.86729,386.81986 550.15639,368.20514 C 550.15639,368.20514 543.02712,358.13862 542.11605,348.52418 C 541.20497,338.90974 546.51209,329.74738 546.51209,329.74738 C 552.42909,310.20471 551.87919,308.46178 542.12419,315.84006 C 538.83859,318.32521 533.29899,320.35334 529.81409,320.34700 C 522.63619,320.33398 501.88389,308.61239 504.46639,306.02981 C 505.39419,305.10206 509.32079,306.56158 513.19219,309.27320 C 522.88759,316.06414 538.24309,315.53738 544.89629,308.18563 C 550.25229,302.26742 550.28989,298.90823 545.30289,271.90046 C 543.91239,264.36992 548.80899,258.97377 551.07729,265.53708 C 551.84549,267.76018 553.83369,282.30449 555.49529,297.85777 C 557.15689,313.41105 559.78998,329.52062 564.25192,333.54611 C 565.60846,338.50322 567.14673,340.90574 567.22185,349.74738 C 564.96793,359.36536 565.72886,368.99724 565.85102,389.89980 C 566.00459,416.17862 559.74739,444.38343 557.34319,451.15402 C 552.17649,465.70403 549.35184,497.66790 552.43549,491.16207 C 556.45900,488.41568 554.48777,478.50265 555.72787,473.42471 C 557.86517,464.67310 561.76219,469.30831 562.43829,481.92944 C 564.36754,493.45406 564.21159,500.77655 563.23049,505.00469 C 562.24939,509.23284 564.34701,511.35842 565.59431,510.11109 C 566.84171,508.86376 568.00028,504.57383 567.94679,496.58174 C 568.04994,484.04700 571.05879,485.13091 576.70049,485.74008 C 584.49799,486.58204 585.48849,480.01573 580.35289,461.52676 C 577.85429,452.53172 578.75579,444.14215 584.98229,418.44117 C 593.97079,381.34027 594.35339,371.21171 588.10619,335.74621 C 585.57179,321.35871 583.48869,299.89285 583.47689,288.04432 C 583.46509,276.19578 582.02479,261.35001 580.27619,255.05371 C 576.02939,239.76258 557.83609,220.40397 550.47639,223.34517 C 547.47569,224.54434 537.56440,227.95194 527.40850,228.57128 C 527.40850,228.57128 509.17560,229.41403 508.94330,226.92440 C 508.69129,224.22338 526.24559,224.88065 526.24559,224.88065 C 536.23119,223.28732 545.07429,221.31052 545.89709,220.48775 C 546.71989,219.66499 542.79179,216.52501 537.16809,213.51003 C 521.78859,205.26481 512.70639,195.34927 512.70639,186.80377 L 512.70639,179.14846 L 499.62679,186.62681 C 492.43309,190.73990 484.12369,194.12184 481.16159,194.14223 C 478.19949,194.16262 475.77589,195.64593 475.77589,197.43847 C 475.77589,199.23101 477.16079,199.84173 478.85339,198.79561 C 480.54609,197.74950 481.93099,198.24695 481.93099,199.90105 C 481.93099,201.55516 482.77159,205.09912 483.79899,207.77653 C 484.82639,210.45394 484.13399,212.64455 482.26019,212.64455 C 480.38649,212.64455 478.75609,210.22099 478.63709,207.25885 C 478.43579,202.24528 478.27629,202.23665 476.32899,207.13403 C 475.17849,210.02751 469.57869,215.83100 463.88509,220.03067 L 453.53309,227.66643 L 467.81590,228.03067 C 473.38985,227.77885 484.39883,232.91813 461.06799,230.97881 C 429.63160,229.25279 417.76819,242.94874 417.47629,293.50689 C 417.35019,315.34254 415.61519,328.39083 411.14749,341.10212 C 405.96249,355.85432 404.99239,366.50360 404.99239,408.66887 C 404.99239,446.97131 403.85819,461.55812 400.16129,470.79739 C 395.60859,482.17580 395.69469,483.58587 401.65609,495.27120 C 407.90429,507.51846 414.22509,514.24507 414.22509,508.64699 C 414.22509,507.06172 412.23679,504.11451 409.80659,502.09765 C 405.11019,498.20000 400.20319,481.07650 402.98539,478.29434 C 403.89629,477.38345 406.04889,481.29094 407.76899,486.97766 C 410.71659,496.72248 410.80139,496.51890 409.24459,483.43787 C 408.30569,475.54930 409.68829,460.52280 412.44769,448.62453 C 415.11789,437.11083 417.30259,419.75993 417.30259,410.06697 C 417.30259,398.15285 419.38159,388.49377 423.71989,380.25190 C 431.27919,365.89086 434.95529,354.91822 438.87799,335.00779 C 441.31159,322.65524 440.81699,318.83583 435.64929,310.07739 C 430.01119,300.52135 429.85789,298.36479 433.63479,281.73431 C 435.88329,271.83429 438.68889,265.29726 439.86949,267.20759 C 441.05019,269.11793 440.34709,276.92144 438.30709,284.54876 C 431.49719,310.01003 447.64469,325.58479 466.44289,311.68670 C 471.19339,308.17452 475.94029,306.16107 476.99159,307.21236 C 479.50999,309.73080 463.33959,320.31222 456.93279,320.33823 C 453.19549,320.35340 451.56819,324.21368 450.46669,335.67694 C 449.38669,346.91784 445.67529,355.93895 436.52409,369.56732 C 426.44209,384.58188 423.68679,391.81644 422.13959,407.33648 C 421.08709,417.89494 418.67709,436.95357 416.78399,449.68896 C 412.21379,480.43391 414.99549,498.74094 431.50289,546.55781 C 439.09939,568.56224 446.09049,591.41298 447.03879,597.33725 C 447.98709,603.26152 451.25649,610.87843 454.30419,614.26373 C 458.78869,619.24495 459.08949,621.10775 455.88149,624.03120 C 452.84759,626.79603 451.02379,626.79603 448.10819,624.03120 C 442.26249,618.48759 446.65549,649.56190 459.06769,701.55373 C 470.81589,750.76396 472.03829,763.52450 465.00449,763.52450 C 462.46549,763.52450 460.38819,765.04622 460.38819,766.90607 C 460.38819,768.76592 456.21239,774.18839 451.10869,778.95600 L 441.82919,787.62436 L 450.27249,794.26585 L 458.71579,800.90733 L 451.08869,806.76783 C 441.22379,814.34783 449.28349,814.80793 461.51979,807.36333 C 466.95309,804.05753 472.30949,796.67085 475.45589,788.14483 C 479.74649,776.51843 481.89239,774.27321 488.82759,774.15451 C 499.76189,773.96737 501.57869,771.65358 498.87439,761.35966 C 496.82039,753.54104 496.39919,753.31660 494.27359,758.90819 C 492.98669,762.29348 492.53469,766.10194 493.26909,767.37142 C 494.00349,768.64091 492.94879,769.67958 490.92529,769.67958 C 488.18619,769.67958 487.73509,761.61898 489.15989,738.13478 C 494.41449,651.52159 494.96109,625.78149 491.66619,620.10709 C 488.52309,614.69406 488.26629,614.81901 488.17969,621.80371 C 488.11339,627.14463 487.12859,628.38626 484.80329,626.06090 C 482.47789,623.73554 482.83129,617.94619 486.01479,606.21076 C 489.09809,594.84503 490.57359,572.86187 490.71429,536.19376 L 490.91939,482.74416 L 478.06419,466.94908 C 470.99379,458.26179 461.10289,446.67386 456.08439,441.19812 C 451.06599,435.72237 447.81179,430.39034 448.85299,429.34915 C 452.04729,426.15491 456.84249,430.79836 469.31209,449.16070 C 487.04219,475.26933 489.25719,476.49182 496.82409,464.34495 C 503.41619,453.76280 515.78389,444.13745 515.78389,449.58919 C 515.78389,451.29618 514.74529,452.70224 513.47579,452.71381 C 512.20629,452.72539 507.89229,457.54457 503.88899,463.42314 C 494.89469,476.63087 496.00329,484.45967 512.23199,522.33824 C 518.66439,537.35166 527.08859,560.71451 530.95249,574.25569 C 534.81639,587.79687 543.50589,609.09749 550.26269,621.59037 C 559.10779,637.94464 561.50969,644.94617 558.84079,646.59564 C 552.58559,650.46159 558.30889,667.55743 577.44279,702.16053 C 587.32719,720.03610 598.84049,743.57929 603.02799,754.47874 C 616.92139,790.64099 631.11729,815.66253 642.16829,823.46673 C 653.85559,831.72023 655.33179,832.22363 658.51529,829.04003 z M 569.81539,627.42788 C 564.28229,619.52830 563.73319,615.80250 568.10219,615.80250 C 569.79479,615.80250 571.17969,617.42458 571.17969,619.40710 C 571.17969,621.38962 573.47169,625.54430 576.27299,628.63973 C 579.07429,631.73515 579.84529,634.26775 577.98629,634.26775 C 576.12729,634.26775 572.45039,631.18981 569.81539,627.42788 z M 460.38819,628.36912 C 460.38819,626.53543 461.92319,625.03513 463.79939,625.03513 C 465.90119,625.03513 466.46929,622.08192 465.27949,617.34127 C 464.11059,612.68387 464.66309,609.64742 466.67959,609.64742 C 471.28759,609.64742 469.02809,628.86685 464.23509,630.44027 C 462.11929,631.13484 460.38819,630.20284 460.38819,628.36912 z M 525.33079,420.37861 C 525.59129,413.60783 530.20389,405.55154 532.08089,408.58870 C 533.16499,410.34281 532.06309,414.40556 529.63219,417.61707 C 527.20129,420.82858 525.26559,422.07126 525.33079,420.37861 z M 439.58569,409.64898 C 435.10119,402.46824 434.82259,400.37459 438.35139,400.37459 C 439.77239,400.37459 442.51239,403.83682 444.44049,408.06844 C 448.60869,417.21665 445.03779,418.37919 439.58569,409.64898 z M 475.77589,392.68073 C 475.77589,389.85964 477.50699,388.12853 479.62279,388.83381 C 483.97959,390.28607 483.50069,395.23503 478.85339,396.78411 C 477.16079,397.34835 475.77589,395.50182 475.77589,392.68073 z M 525.01659,355.95058 C 525.01659,351.81615 531.59759,338.22382 532.94629,339.57255 C 535.37399,342.00030 530.89879,357.28901 527.76049,357.28901 C 526.25129,357.28901 525.01659,356.68670 525.01659,355.95058 z M 441.97009,305.74018 C 442.08179,300.26902 447.34529,295.14030 449.41369,298.48716 C 450.57149,300.36052 450.66289,303.27815 449.61679,304.97080 C 447.39819,308.56050 441.90119,309.11360 441.97009,305.74018 z M 531.17169,302.27007 C 531.17169,300.78470 533.24899,297.84534 535.78799,295.73817 C 539.64469,292.53731 540.40429,292.98168 540.40429,298.43890 C 540.40429,302.19335 538.44139,304.97080 535.78799,304.97080 C 533.24899,304.97080 531.17169,303.75548 531.17169,302.27007 z M 488.08609,231.46874 C 488.08609,229.97351 490.85589,228.02582 494.24109,227.14054 C 501.50899,225.23996 502.59449,229.60773 495.52819,232.31931 C 489.06779,234.79841 488.08609,234.68620 488.08609,231.46874 z M 488.08609,222.13364 C 488.08609,220.29993 489.21439,218.79963 490.59359,218.79963 C 491.97279,218.79963 495.49439,213.78105 498.41939,207.64722 C 501.34439,201.51339 504.45199,197.20920 505.32509,198.08234 C 507.74149,200.49873 496.31599,222.79794 491.93299,224.21973 C 489.81719,224.90608 488.08609,223.96734 488.08609,222.13364 z M 610.00619,782.56679 C 605.70229,778.26294 605.03269,778.22074 605.03269,782.25352 C 605.03269,788.57636 612.23389,795.77766 613.81459,791.03553 C 614.45539,789.11315 612.74159,785.30223 610.00619,782.56679 z M 560.46149,361.13593 C 556.74169,331.94308 555.43049,326.37375 552.67819,328.07480 C 546.03839,332.17836 546.09399,350.05155 552.78639,362.89121 C 556.47389,369.96589 560.12849,375.75426 560.90759,375.75426 C 561.68669,375.75426 561.48599,369.17601 560.46149,361.13593 z M 446.34169,340.36253 C 447.74389,334.40182 447.46069,332.22055 445.54249,334.20744 C 443.90839,335.90009 441.67279,342.13211 440.57449,348.05638 C 438.18959,360.92124 443.02209,354.47429 446.34169,340.36253 z M 470.32119,200.03520 C 471.20609,194.00579 469.31879,187.55703 464.66459,180.70787 C 457.28599,169.84926 456.05829,163.85910 456.83199,142.49059 C 457.17439,133.03365 459.43249,127.14930 464.76569,121.81607 C 468.86599,117.71578 473.17999,111.33901 474.35219,107.64547 L 476.48359,100.92996 L 467.30359,107.46674 C 451.37129,118.81156 445.39149,147.08901 453.29719,173.70042 C 456.31749,183.86701 457.39799,195.49498 456.30629,206.08281 L 454.60299,222.60264 L 461.79799,215.84320 C 465.75539,212.12551 469.59079,205.01191 470.32119,200.03520 z M 546.73069,177.25282 C 544.48279,137.06559 540.29339,124.76653 521.60129,103.47739 C 510.29399,90.599072 495.13299,88.651012 485.00849,98.775512 C 473.76559,110.01841 477.85829,120.47011 495.11939,124.59621 C 500.43329,125.86647 504.84579,129.68149 506.72859,134.63347 C 508.39899,139.02696 513.19709,145.32082 517.39109,148.61982 C 524.28149,154.03977 525.01659,156.81724 525.01659,177.43138 L 525.01659,200.24477 L 536.55729,207.62217 C 542.90479,211.67973 548.25529,214.81590 548.44729,214.59144 C 548.63939,214.36697 547.86689,197.56460 546.73069,177.25282 z M 521.93899,183.22628 C 521.93899,175.50947 520.83469,169.87821 519.48499,170.71237 C 517.35379,172.02952 517.02149,179.42090 518.46459,193.40992 C 519.46219,203.07965 521.93899,195.81980 521.93899,183.22628 z M 500.39619,182.16751 C 505.25499,178.64433 508.24859,173.30884 508.52029,167.68807 C 508.75689,162.79280 509.94379,156.36401 511.15769,153.40187 C 512.37879,150.42245 512.00959,148.01618 510.33149,148.01618 C 508.66309,148.01618 505.57709,143.86150 503.47379,138.78355 C 501.29219,133.51676 497.34429,129.55093 494.28279,129.55093 C 491.33109,129.55093 485.46019,126.83253 481.23639,123.51005 C 473.56089,117.47249 473.55309,117.47302 466.97239,124.47779 C 460.01699,131.88153 458.12999,141.86109 463.68559,141.86109 C 464.96714,141.86109 473.09681,142.09055 472.94612,145.39286 C 472.81710,148.22020 463.08877,146.72205 462.67237,148.51469 C 461.88751,151.89354 473.87467,149.71349 474.60765,151.33203 C 475.34063,152.95057 475.77589,154.59581 475.77589,156.10571 C 475.77589,160.34588 473.47074,160.31383 472.80125,156.78663 C 466.92295,153.61866 456.44439,159.25270 463.86119,173.60822 C 473.54809,192.35766 483.21869,194.62325 500.39619,182.16751 z M 469.62079,175.09608 C 469.62079,173.74332 474.46789,172.63651 480.39219,172.63651 C 486.31649,172.63651 491.16359,173.17744 491.16359,173.83858 C 491.16359,174.49972 486.31649,175.60652 480.39219,176.29815 C 474.46789,176.98977 469.62079,176.44884 469.62079,175.09608 z M 469.23089,166.24045 C 466.19069,164.36151 466.71639,163.74974 471.19839,163.95102 C 474.56229,164.10209 479.96539,163.11299 483.20519,161.75302 C 487.06859,160.13128 488.40899,160.39158 487.10009,162.50941 C 484.24369,167.13122 474.09939,169.24932 469.23089,166.24045 z M 483.46979,151.09372 C 484.51589,149.40107 488.14159,148.01618 491.52679,148.01618 C 494.91209,148.01618 496.82599,149.40107 495.77989,151.09372 C 494.73379,152.78637 491.10809,154.17126 487.72279,154.17126 C 484.33749,154.17126 482.42359,152.78637 483.46979,151.09372 z M 486.37509,141.15749 C 489.88459,139.19351 492.80459,139.19351 494.76859,141.15749 C 496.73249,143.12148 494.86029,144.16925 489.38679,144.16925 C 482.29889,144.16925 481.83049,143.70078 486.37509,141.15749 z M 521.93899,161.68349 C 521.93899,160.93706 520.55409,160.32634 518.86149,160.32634 C 517.16879,160.32634 515.78389,161.79297 515.78389,163.58551 C 515.78389,165.37805 517.16879,165.98877 518.86149,164.94266 C 520.55409,163.89654 521.93899,162.42992 521.93899,161.68349 z "
+         style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero"
+         id="woman" />
+      <path
+         d="M 261.11729,826.18663 C 259.00149,825.29333 257.27039,823.29293 257.27039,821.74133 C 257.27039,820.18973 254.50059,816.15043 251.11529,812.76513 C 247.72999,809.37983 244.96019,803.36243 244.96019,799.39323 C 244.96019,795.42392 242.30789,789.77602 239.06619,786.84229 C 233.83659,782.10953 233.34349,778.32621 234.69259,753.28173 C 236.15909,726.05789 230.78109,685.25821 220.22169,643.50037 C 218.29559,635.88346 217.45889,622.14162 218.36229,612.96298 C 219.27679,603.67166 218.16069,587.98432 215.84429,577.57125 C 213.55589,567.28444 210.75169,545.98268 209.61259,530.23401 C 208.47349,514.48531 205.07579,494.40435 202.06209,485.60966 L 196.58269,469.61927 L 194.33209,488.66513 C 193.09429,499.14035 193.03799,517.91870 194.20709,530.39478 C 195.44769,543.63323 195.01189,557.86258 193.16049,564.56771 C 190.67829,573.55761 191.03249,578.53873 194.78899,587.46644 C 198.76939,596.92606 199.14759,604.92465 197.00219,634.26775 C 193.63269,680.35095 193.56209,716.01329 196.77889,747.02380 L 199.37689,772.06988 L 183.62269,777.30259 C 170.65449,781.60995 166.78249,784.66401 161.72739,794.57271 C 158.34987,801.19323 153.53722,806.78323 151.03265,806.99473 C 142.38977,807.72493 140.82832,808.15723 138.52857,810.45703 C 134.50171,814.48393 119.68594,812.94743 115.65003,808.08443 C 105.89309,796.32808 112.04343,775.11541 126.24223,771.55174 C 130.16772,770.56650 138.40419,764.19866 144.54550,757.40096 C 157.87026,742.65206 158.50915,734.56828 149.41260,695.81858 C 139.57188,653.89883 137.07431,637.28208 136.92327,612.72496 C 136.83861,598.96130 133.70478,577.21952 129.16038,558.86798 C 122.21704,530.82884 119.21110,507.71952 113.71401,440.11778 C 112.57610,426.12419 113.16805,412.56230 115.19160,406.26482 C 117.04842,400.48621 118.75807,387.44891 118.99082,377.29303 C 119.22357,367.13714 121.53132,350.86501 124.11914,341.13271 C 126.94744,330.49605 128.03027,318.83377 126.83375,311.89607 C 119.24528,267.89642 116.72993,257.73459 114.37166,261.55035 C 109.71009,269.09291 66.909702,286.50555 53.031572,286.50555 C 33.410806,286.50555 30.302336,282.54454 26.464986,252.65259 C 23.786266,231.78608 24.047936,219.40983 27.758296,191.48189 C 30.937476,167.55213 31.442116,154.66224 29.352616,150.75798 C 25.132466,142.87256 17.260486,97.446652 21.765836,87.197732 C 24.051916,81.997282 25.026846,80.419052 29.634816,81.881562 C 33.809766,83.206652 34.754006,81.909412 34.754006,78.737582 C 34.754006,71.924142 52.712962,66.221792 59.230042,68.382772 C 62.604352,69.501642 64.821992,68.538662 66.462802,71.077632 C 68.103612,73.616602 69.467292,85.041982 69.493212,96.467352 C 69.519132,107.89273 70.232792,117.24076 71.079112,117.24076 C 71.925432,117.24076 75.387672,114.47097 78.772962,111.08568 C 90.235932,99.622712 103.37684,107.42232 92.631092,119.31096 C 89.835422,122.40397 83.179472,131.79418 77.840082,140.17810 C 69.962962,152.54681 67.909422,159.36277 66.951282,176.31960 C 66.301812,187.81351 66.664412,201.98290 67.757042,207.80714 L 69.743652,218.39668 L 78.608602,213.30889 C 83.484322,210.51061 89.709592,204.43580 92.442532,199.80930 C 98.915612,188.85125 111.21386,180.26212 126.50308,176.02133 C 133.25815,174.14767 145.36328,168.46236 153.40335,163.38731 C 166.63229,155.03694 168.02169,153.05560 168.02169,142.54021 C 168.02169,136.14935 166.23949,128.18876 164.06139,124.85000 C 161.88319,121.51124 156.98496,111.01263 153.17646,101.51976 C 147.47689,87.313312 146.75488,82.021432 149.09510,71.605862 C 152.06919,58.369162 166.39949,40.302222 173.92449,40.302222 C 176.33559,40.302222 180.58569,38.241322 183.36899,35.722462 C 186.15229,33.203592 192.49339,30.350032 197.46029,29.381232 C 210.02859,26.929752 229.64849,41.950572 240.17589,62.083932 C 249.20549,79.352582 248.67929,83.673832 233.66709,115.53686 C 229.72239,123.90928 226.49499,133.92951 226.49499,137.80404 C 226.49499,147.04526 257.13499,171.35741 272.33479,174.17686 C 299.52439,179.22034 305.37929,194.27830 312.42109,277.27292 C 313.78539,293.35308 316.69849,315.04698 318.89459,325.48160 C 322.57719,342.97899 322.24409,347.64362 314.60939,385.49366 C 310.05649,408.06567 305.16469,437.04402 303.73869,449.88996 C 301.34329,471.46986 295.57869,486.00137 286.14519,494.23961 C 284.20699,495.93225 281.73509,505.42592 280.65219,515.33665 C 279.56939,525.24735 277.32769,535.88924 275.67079,538.98528 C 270.97809,547.75362 272.12439,583.78280 277.70719,602.98672 C 283.66739,623.48918 281.92369,678.99683 274.35599,709.66752 C 267.04549,739.29557 268.24559,749.86901 282.21319,778.89279 L 294.79279,805.03243 L 289.39589,815.05393 C 286.42769,820.56573 282.48599,825.09423 280.63669,825.11733 C 278.78749,825.14043 274.50459,825.75593 271.11929,826.48513 C 267.73399,827.21423 263.23309,827.07993 261.11729,826.18663 z M 278.43159,800.74283 L 285.58529,795.34677 L 276.14659,776.64867 C 270.95529,766.36473 264.93059,757.35261 262.75849,756.62169 C 259.68419,755.58724 259.62019,754.30957 262.46959,750.85484 C 264.48279,748.41395 266.04539,742.30294 265.94199,737.27482 C 265.83859,732.24670 268.78959,710.35427 272.49969,688.62498 C 279.72909,646.28475 279.14649,618.22123 270.60539,597.37800 C 267.78699,590.50003 266.93379,582.35245 268.22919,574.68501 C 269.63739,566.35028 269.03519,561.97171 266.24349,560.24632 C 262.95569,558.21437 262.96309,556.21175 266.28499,549.08635 C 269.84229,541.45580 278.40459,510.53667 278.70359,504.24162 C 278.76389,502.97213 275.30749,501.93346 271.02279,501.93346 C 260.61749,501.93346 258.64909,495.27637 264.63259,480.32213 C 272.12269,461.60249 271.41559,458.68988 260.39089,462.85124 C 253.41029,465.48614 250.30809,465.42674 247.48549,462.60420 C 244.58289,459.70156 245.58369,456.99517 252.05889,450.23652 C 256.61789,445.47796 260.34789,440.11602 260.34789,438.32111 C 260.34789,436.52619 262.87069,431.75483 265.95419,427.71811 C 271.12989,420.94223 271.24989,418.48798 267.51719,395.75828 C 259.59989,347.54729 258.70289,328.88105 262.08439,282.70934 L 264.05289,255.83159 L 254.36719,259.20805 C 248.59469,261.22035 236.34499,261.80389 224.04749,260.65238 C 212.69869,259.58971 200.64359,258.88939 197.25829,259.09612 C 193.87299,259.30285 178.43569,259.66874 162.95299,259.90922 C 138.75976,260.28499 133.84073,259.48125 127.95855,254.19136 L 121.11431,248.03628 L 123.19539,264.96276 C 124.33999,274.27232 127.35745,290.60693 129.90086,301.26190 C 134.06380,318.70150 134.03596,322.31758 129.62180,337.50174 C 126.39086,348.61579 125.69060,356.10621 127.56878,359.46233 C 129.52513,362.95814 129.02616,365.94875 125.97796,368.99696 C 123.25765,371.71726 122.19562,376.57002 123.23715,381.52068 C 124.17238,385.96606 122.88213,397.22011 120.36993,406.52967 C 116.32208,421.52998 116.33429,428.70930 120.47717,469.61927 C 126.50217,529.11465 129.76347,544.69279 138.11854,553.88627 C 143.61195,559.93093 143.89152,561.01561 139.55442,559.45736 C 132.75346,557.01392 132.81073,558.57364 140.32380,580.41077 C 147.25104,600.54516 147.84454,604.69962 143.40134,601.95356 C 138.28969,598.79437 139.91602,627.36122 146.64267,658.88808 C 163.77299,739.17536 163.54879,737.24669 157.34781,750.99807 C 154.24106,757.88761 150.62063,763.52450 149.30243,763.52450 C 143.79693,763.52450 125.27318,777.66205 126.41121,780.99536 C 127.09132,782.98739 125.59406,786.32169 123.08396,788.40491 C 119.91771,791.03264 119.50252,793.17489 121.72812,795.40050 C 123.95372,797.62609 126.11413,797.42171 128.78302,794.73308 C 131.86748,791.62581 131.56249,791.26410 127.24425,792.90806 C 119.68301,795.78667 120.51757,792.15659 128.38502,787.94608 C 132.97202,785.49119 134.28988,785.45900 132.81971,787.83778 C 131.66922,789.69930 132.54077,791.26613 134.75648,791.31962 C 136.97218,791.37311 134.97657,794.76893 130.32179,798.86593 C 125.66701,802.96283 121.85855,807.07373 121.85855,808.00123 C 121.85855,810.98743 133.73976,809.79393 135.70749,806.61013 C 136.75360,804.91743 140.31037,803.53253 143.61142,803.53253 C 147.48376,803.53253 152.90761,798.17866 158.89785,788.44326 C 168.59729,772.67963 174.10349,768.66365 181.90979,771.65924 C 190.60539,774.99603 195.82549,766.94552 193.90309,753.16315 C 191.01149,732.43197 188.47289,730.22224 186.36089,746.59802 L 184.37639,761.98573 L 183.89289,744.28986 C 183.62699,734.55714 184.58039,726.59400 186.01169,726.59400 C 187.44289,726.59400 188.48159,713.78373 188.31979,698.12674 C 188.15809,682.46975 189.29979,660.65767 190.85709,649.65546 C 194.57109,623.41572 194.19659,596.43627 190.01849,589.24476 C 187.11049,584.23936 186.66189,584.79328 186.58049,593.49032 C 186.52909,598.99143 185.10209,603.49233 183.40939,603.49233 C 179.23549,603.49233 179.52509,598.12039 184.96299,574.67270 C 187.94919,561.79632 189.38939,541.77978 189.01789,518.31660 C 188.70099,498.30365 189.47979,478.81451 190.74849,475.00737 C 192.61229,469.41471 191.61859,467.53904 185.57449,465.24110 C 176.73019,461.87849 174.17679,456.33248 174.17679,440.48486 C 174.17679,431.51162 172.44549,427.64598 166.75759,423.91910 C 162.67699,421.24543 157.67778,413.81544 155.64820,407.40806 C 153.61863,401.00068 149.38706,391.25737 146.24472,385.75627 C 143.10238,380.25516 141.94619,375.75426 143.67540,375.75426 C 145.40460,375.75426 150.38972,383.71739 154.75343,393.45012 C 159.11719,403.18284 166.84739,415.56259 171.93179,420.96066 C 179.46739,428.96119 180.82919,432.51037 179.29889,440.16166 C 176.94379,451.93701 179.49859,458.91955 186.04679,458.60491 C 189.23989,458.45149 189.68559,457.78991 187.25629,456.80968 C 182.57879,454.92226 181.98439,428.07246 186.62009,428.07246 C 188.42719,428.07246 189.43629,432.97600 188.92829,439.28896 C 188.33859,446.61724 189.47179,451.01101 192.19729,451.96382 C 195.38899,453.07961 195.87979,451.19563 194.28669,443.94239 C 193.14159,438.72854 193.64579,431.98617 195.40729,428.95941 C 197.93519,424.61561 198.62969,426.73056 198.70349,438.99774 C 198.75499,447.54561 197.06599,456.37430 194.95019,458.61706 C 191.84559,461.90797 191.99399,462.42543 195.71959,461.29883 C 198.91659,460.33202 200.62659,454.77334 201.28159,443.21828 C 201.80169,434.04175 203.28729,425.46354 204.58289,424.15561 C 208.32849,420.37436 208.23299,456.43355 204.48549,460.94904 C 201.99509,463.94970 202.77669,471.27662 207.46289,488.86130 C 210.95769,501.97525 215.09939,527.95734 216.66669,546.59924 C 219.07479,575.24238 221.03769,583.50746 229.33629,599.94688 C 234.73729,610.64617 238.65439,621.70670 238.04099,624.52579 C 237.32079,627.83553 234.62479,624.74510 230.43089,615.80250 L 223.93609,601.95356 L 223.67679,620.98785 C 223.53409,631.45672 224.92969,643.92077 226.77799,648.68572 C 228.62639,653.45071 231.33709,665.63901 232.80189,675.77083 C 234.26679,685.90268 236.90919,694.67368 238.67399,695.26195 C 240.61019,695.90734 241.92589,708.74007 241.99179,727.61984 C 242.06599,748.92603 243.50399,761.36280 246.49899,766.60204 C 248.91799,770.83366 250.94629,781.44893 251.00629,790.19155 C 251.08869,802.20173 252.80789,808.00033 258.03979,813.91383 L 264.96429,821.74053 L 269.38106,807.94893 C 269.38106,807.94893 271.28249,806.13543 278.43159,800.74283 z M 236.22029,605.83151 C 234.25669,603.86792 232.65009,599.15780 232.65009,595.36461 C 232.65009,591.57142 231.26519,587.61197 229.57249,586.56586 C 225.95419,584.32959 225.39079,572.71692 228.90069,572.71692 C 230.22379,572.71692 233.22029,579.29516 235.55949,587.33524 C 237.89879,595.37532 241.11879,602.81912 242.71499,603.87703 C 244.53109,605.08056 244.52689,606.47444 242.70389,607.60110 C 241.10149,608.59145 238.18389,607.79514 236.22029,605.83151 z M 254.23999,604.44336 C 254.21409,600.73480 255.57779,596.84460 257.27039,595.79848 C 261.18869,593.37685 261.18869,600.50675 257.27039,606.56988 C 254.84499,610.32288 254.27829,609.92517 254.23999,604.44336 z M 151.65153,574.64924 C 148.80657,568.09510 146.47889,562.27371 146.47889,561.71283 C 146.47889,561.15195 150.62481,563.05218 155.69205,565.93559 C 164.70429,571.06385 167.77539,575.79446 162.09229,575.79446 C 160.52369,575.79446 158.69673,578.21802 158.03227,581.18016 C 157.17887,584.98461 155.30550,583.06715 151.65153,574.64924 z M 256.18829,582.68837 C 253.84999,578.90499 257.35339,566.56183 260.76549,566.56183 C 262.29299,566.56183 262.62909,570.37029 261.51239,575.02507 C 259.05589,585.26482 258.38099,586.23625 256.18829,582.68837 z M 211.10729,423.04776 C 211.10729,421.97681 213.88289,418.69332 217.27529,415.75109 C 220.66769,412.80890 227.60589,401.22110 232.69359,390.00041 C 244.23039,364.55647 250.50379,362.81596 239.60129,388.08393 C 230.28109,409.68440 211.10729,433.21186 211.10729,423.04776 z M 185.24529,357.76981 C 184.18029,356.04663 184.80859,353.70995 186.64149,352.57717 C 191.37319,349.65286 194.42599,353.65846 190.47609,357.60845 C 188.26579,359.81868 186.54439,359.87177 185.24529,357.76981 z M 155.71151,327.09885 C 155.71151,325.60898 158.40280,321.95443 161.69219,318.97761 C 164.98149,316.00077 168.61059,309.20790 169.75669,303.88230 C 172.97149,288.94435 179.45389,278.22038 186.36059,276.41423 C 189.81199,275.51168 193.32019,275.88037 194.15649,277.23356 C 194.99279,278.58673 192.33799,280.53192 188.25689,281.55622 C 182.38409,283.03020 179.44619,287.59728 174.16779,303.45893 C 170.31579,315.03433 165.00939,324.83165 161.60519,326.65349 C 158.36365,328.38830 155.71151,328.58871 155.71151,327.09885 z M 220.30619,316.51158 C 216.95209,311.01047 214.20269,304.97172 214.19629,303.09211 C 214.18999,301.21250 210.67529,294.50309 206.38589,288.18229 C 202.09649,281.86151 200.36539,277.21448 202.53899,277.85559 C 204.71259,278.49668 210.66159,287.43607 215.75909,297.72091 C 220.85659,308.00575 226.91199,318.69153 229.21549,321.46710 C 232.00929,324.83347 232.23859,326.51359 229.90409,326.51359 C 227.97929,326.51359 223.66029,322.01268 220.30619,316.51158 z M 244.96019,779.16392 C 244.96019,777.60970 244.07509,774.03135 242.99319,771.21201 C 241.52729,767.39207 240.42369,767.06078 238.66159,769.91184 C 237.36109,772.01608 237.00959,775.59443 237.88039,777.86375 C 239.66739,782.52065 244.96019,783.49266 244.96019,779.16392 z M 43.344246,107.81468 C 42.305936,104.35827 42.533566,94.386382 42.060806,86.468772 C 41.609746,78.914432 39.907626,75.768812 37.252826,79.376872 C 35.384666,81.915852 34.488216,91.994012 34.880436,99.491182 C 35.325316,107.99486 35.590296,112.65681 33.262966,113.43259 C 30.740706,114.27334 30.621236,108.68006 30.621236,100.06114 C 30.621236,91.568132 27.513636,88.356322 25.256796,89.751122 C 23.215186,91.012912 22.508896,97.319542 23.715136,103.12253 C 24.815956,108.41835 27.224176,118.96269 27.791366,126.70943 C 28.358566,134.45617 31.010146,145.02461 33.683786,150.19484 C 37.150016,156.89780 37.798096,162.19933 35.942276,168.67020 C 28.964986,192.99860 28.426936,265.71036 35.145736,276.31350 C 36.289966,278.11925 42.792426,280.52647 49.595656,281.66288 C 60.608092,283.50242 64.113152,282.34077 81.544062,271.07463 C 92.525242,263.97716 100.33885,260.46360 99.337332,263.07350 C 96.111402,271.48016 105.99742,264.91650 112.56365,254.29213 C 120.07998,242.13044 121.04829,219.47650 114.16470,216.83501 C 108.27905,214.57648 108.15386,209.56701 113.98307,209.56701 C 119.98875,209.56701 122.06395,213.60357 123.50497,228.08844 C 124.17603,234.83383 126.17374,243.05964 127.94434,246.36802 C 134.26963,258.18693 169.74189,262.66131 188.08989,253.95461 C 195.83349,250.28004 199.82079,249.90637 204.50979,252.41584 C 207.91589,254.23870 220.27329,255.73013 231.97079,255.73013 C 256.72039,255.73013 260.22569,253.17137 267.80699,229.57103 L 272.74999,214.18332 L 270.66189,228.03226 C 265.17439,264.42713 272.39969,313.60041 284.89679,324.91010 C 291.23509,330.64617 293.46279,341.90130 288.25989,341.90130 C 286.68489,341.90130 284.84039,338.78529 284.16099,334.97683 C 283.48149,331.16837 283.02769,348.26141 283.15259,372.96132 L 283.37959,417.87032 L 274.17189,429.01333 C 259.79119,446.41673 251.11529,458.11567 251.11529,460.10401 C 251.11529,464.13540 257.41099,461.50121 265.34129,454.15167 C 269.95469,449.87611 274.84579,447.49437 276.21029,448.85892 C 277.57489,450.22347 275.28569,460.99234 271.12329,472.78976 C 266.96089,484.58717 263.55689,494.93205 263.55879,495.77838 C 263.56919,500.32338 275.79279,480.64355 277.39549,473.50150 C 278.43569,468.86611 280.71349,464.19178 282.45719,463.11409 C 284.48359,461.86175 284.90039,463.79253 283.61229,468.46449 C 281.90729,474.64841 282.11709,474.94478 284.97429,470.38866 C 289.72079,462.81969 295.27539,463.63927 293.19329,471.60136 C 292.03129,476.04469 292.48309,477.18436 294.57659,475.09087 C 297.88209,471.78537 298.85289,466.18224 301.71339,433.89653 C 302.70429,422.71228 306.38049,400.55398 309.88259,384.65586 C 314.30969,364.55893 315.72629,350.12313 314.53119,337.28499 C 313.58569,327.12910 311.48199,303.58590 309.85629,284.96678 C 308.23049,266.34765 306.79159,250.42137 306.65859,249.57505 C 306.52559,248.72873 304.95989,250.11362 303.17929,252.65259 C 300.85209,255.97085 300.49629,251.47631 301.91409,236.66840 C 303.45159,220.60974 302.73769,213.64710 298.67599,205.08783 C 291.32299,189.59254 277.46439,178.79159 264.93549,178.79159 C 257.81329,178.79159 254.06809,177.11992 252.86939,173.40589 C 251.91339,170.44376 246.62669,165.28403 241.12119,161.93983 C 227.43599,153.62693 225.28869,152.80724 227.78699,156.84955 C 228.96879,158.76179 228.46919,160.32634 226.67659,160.32634 C 224.88409,160.32634 223.41739,154.52767 223.41739,147.44040 L 223.41739,134.55445 L 214.03489,143.54350 C 208.87449,148.48747 206.11319,153.01948 207.89859,153.61463 C 212.15579,155.03368 201.86329,172.63651 196.77639,172.63651 C 194.70229,172.63651 192.03829,171.07195 190.85649,169.15971 C 189.55099,167.04736 190.38549,166.24755 192.98299,167.12167 C 196.98759,168.46934 204.63669,161.61221 204.85429,156.47942 C 204.90809,155.20993 200.20399,154.17126 194.40059,154.17126 C 188.59729,154.17126 181.83769,152.15987 179.37929,149.70150 C 174.31939,144.64164 171.09919,146.48089 171.09919,154.43072 C 171.09919,157.57456 166.36129,162.16862 159.72609,165.45858 C 141.01997,174.73360 142.46657,180.00211 163.01439,177.43482 C 175.06639,175.92902 180.33189,176.32313 180.33189,178.73100 C 180.33189,181.11142 171.38639,181.90063 151.65927,181.26061 C 124.62803,180.38361 122.23869,180.82463 109.91976,188.96478 C 101.66222,194.42124 97.216642,199.48832 97.841292,202.73187 C 98.496192,206.13244 94.666632,209.96926 86.493202,214.10146 C 73.285802,220.77867 73.025002,221.65383 76.609442,247.26689 C 77.854152,256.16112 77.473202,261.88522 75.636552,261.88522 C 73.976282,261.88522 72.617882,258.37286 72.617882,254.07999 C 72.617882,249.78712 69.679772,234.56015 66.088752,220.24229 C 60.400442,197.56232 59.977522,191.39413 62.804702,172.34578 C 64.953212,157.87004 68.719482,146.62939 73.950152,139.08153 C 78.295352,132.81141 81.850512,126.47991 81.850512,125.01152 C 81.850512,123.54313 84.142492,119.80912 86.943802,116.71370 C 93.537682,109.42754 86.837912,109.21116 79.440822,116.47137 C 76.422842,119.43351 68.805922,125.73601 62.514342,130.47693 C 56.222752,135.21785 51.075096,141.38063 51.075096,144.17199 C 51.075096,148.25510 50.323096,148.48679 47.228166,145.35725 C 44.142696,142.23727 45.665626,139.36597 54.922012,130.85138 C 66.325622,120.36165 66.457762,119.97075 66.039022,97.964712 C 66.039022,97.964712 65.966722,73.453272 61.966362,72.653202 C 58.925622,72.045052 58.621472,107.35675 58.621472,107.35675 C 56.393882,107.95857 54.474152,108.10293 54.493252,105.90125 C 54.631042,88.894032 56.925082,71.717512 51.061156,71.760112 C 46.753226,71.791412 46.023516,96.346342 47.467176,107.15503 M 140.32380,249.57505 C 140.32380,247.88240 142.40114,246.49751 144.94011,246.49751 C 147.47909,246.49751 149.55643,247.88240 149.55643,249.57505 C 149.55643,251.26770 147.47909,252.65259 144.94011,252.65259 C 142.40114,252.65259 140.32380,251.26770 140.32380,249.57505 z M 244.01809,250.68456 C 240.74109,247.40756 244.84819,243.57017 249.65739,245.41563 C 252.13249,246.36539 253.39129,248.38224 252.45479,249.89753 C 250.45989,253.12529 246.80019,253.46670 244.01809,250.68456 z M 105.23928,239.11282 C 107.22594,233.93567 115.70347,229.93584 115.70347,234.17565 C 115.70347,235.75562 112.96485,238.51399 109.61764,240.30536 C 104.73583,242.91802 103.86962,242.68209 105.23928,239.11282 z M 198.79709,228.21389 C 198.79709,226.42134 200.18199,224.95472 201.87469,224.95472 C 203.56729,224.95472 204.95219,225.56543 204.95219,226.31186 C 204.95219,227.05829 203.56729,228.52491 201.87469,229.57103 C 200.18199,230.61714 198.79709,230.00643 198.79709,228.21389 z M 198.79709,214.36495 C 198.79709,211.72608 200.18199,209.56701 201.87469,209.56701 C 203.56729,209.56701 204.95219,210.87017 204.95219,212.46292 C 204.95219,214.05568 203.56729,216.21475 201.87469,217.26086 C 200.18199,218.30698 198.79709,217.00381 198.79709,214.36495 z M 140.38552,189.48862 C 142.52663,186.90874 144.91222,185.43171 145.68684,186.20632 C 147.82111,188.34059 143.48472,194.17930 139.76534,194.17930 C 137.72465,194.17930 137.95812,192.41346 140.38552,189.48862 z M 252.17729,189.43026 C 249.40749,182.21226 252.39729,181.36474 256.64359,188.16418 C 259.02119,191.97132 259.22539,194.17930 257.19989,194.17930 C 255.43979,194.17930 253.17959,192.04223 252.17729,189.43026 z M 192.64199,181.86913 C 192.64199,180.17649 194.71939,178.79159 197.25829,178.79159 C 199.79729,178.79159 201.87469,180.17649 201.87469,181.86913 C 201.87469,183.56178 199.79729,184.94668 197.25829,184.94668 C 194.71939,184.94668 192.64199,183.56178 192.64199,181.86913 z M 214.18479,178.73992 C 208.85479,176.99715 212.87309,176.38225 227.26359,176.73853 C 238.68849,177.02139 248.03649,178.29149 248.03699,179.56098 C 248.03799,182.56425 224.10579,181.98379 214.18479,178.73992 z M 281.36219,480.34386 C 280.67859,478.29299 278.34199,480.58055 276.16989,485.42731 C 272.47279,493.67660 272.55219,493.91483 277.41279,489.15615 C 280.26859,486.36027 282.04579,482.39473 281.36219,480.34386 z M 277.64579,368.82979 C 276.49209,343.01691 273.67669,316.45945 271.38939,309.81319 L 267.23069,297.72913 L 265.21589,306.90251 C 264.10779,311.94786 264.80719,330.54218 266.77009,348.22321 C 268.73299,365.90428 270.98379,388.33371 271.77189,398.06643 C 272.55999,407.79916 274.67599,415.76230 276.47409,415.76230 C 278.73029,415.76230 279.09339,401.21814 277.64579,368.82979 z M 213.41539,137.96695 C 223.07119,128.67665 227.84899,114.14645 219.57049,119.24826 C 217.45469,120.55218 218.14719,117.91285 221.10929,113.38308 C 228.20359,102.53432 227.92879,93.604332 220.37619,89.562332 C 217.01089,87.761282 213.47669,83.176562 212.52229,79.374072 C 211.04709,73.496452 208.80739,72.497672 197.57579,72.708772 C 188.85389,72.872712 181.39739,75.291042 175.63279,79.825472 C 170.83039,83.603092 165.07589,85.993462 162.84509,85.137422 C 158.12831,83.327432 157.31495,88.268582 161.86659,91.081662 C 163.55929,92.127772 164.94419,96.443372 164.94419,100.67188 C 164.94419,115.18963 171.60029,134.77046 179.39149,143.17302 C 189.01869,153.55546 198.76339,152.06440 213.41539,137.96695 z M 187.32039,140.00174 C 188.34309,138.97910 190.99749,138.86977 193.21909,139.75878 C 195.67409,140.74121 194.94489,141.47046 191.35969,141.61813 C 188.11549,141.75176 186.29779,141.02439 187.32039,140.00174 z M 177.25429,133.14825 C 177.25429,132.37922 178.87002,131.68010 181.47311,131.17324 C 184.07622,130.66638 186.46542,131.35284 190.41492,131.35284 C 194.36442,131.35284 198.91937,130.58855 201.14098,130.97003 C 203.36259,131.35150 204.45214,131.87767 203.87339,132.45646 C 202.25104,134.07877 195.59627,135.04179 189.34708,135.20419 C 183.09789,135.36660 177.25429,134.72839 177.25429,133.14825 z M 178.92449,120.53095 C 177.95069,118.95526 178.56139,116.79619 180.28169,115.73301 C 182.00189,114.66984 183.40939,115.26659 183.40939,117.05913 C 183.40939,118.85167 186.87159,120.31830 191.10329,120.31830 C 195.33489,120.31830 198.79709,118.85167 198.79709,117.05913 C 198.79709,115.26659 200.18199,114.65587 201.87469,115.70199 C 203.56729,116.74810 204.95219,118.90718 204.95219,120.49993 C 204.95219,124.25838 181.24569,124.28663 178.92449,120.53095 z M 186.70319,111.85506 C 186.53989,106.62438 184.64939,104.93059 178.97469,104.93059 C 168.28399,104.93059 165.78936,99.247552 176.30329,98.468742 C 181.70899,98.068322 182.10229,99.662422 183.30356,96.058622 L 176.05302,95.757182 C 168.32561,95.811332 169.29509,92.307112 178.46109,93.155162 C 188.62814,92.001092 193.29829,102.68548 189.35909,112.62445 C 187.04709,118.45768 186.90819,118.41745 186.70319,111.85506 z M 200.33589,101.85305 C 201.38199,100.16040 204.92599,98.775512 208.21139,98.775512 C 211.49679,98.775512 214.18479,100.16040 214.18479,101.85305 C 214.18479,103.54570 210.64089,104.93059 206.30929,104.93059 C 201.84269,104.93059 199.25709,103.59850 200.33589,101.85305 z M 202.64399,93.576542 C 205.60619,92.802452 210.45329,92.802452 213.41539,93.576542 C 216.37759,94.350632 213.95399,94.983972 208.02969,94.983972 C 202.10549,94.983972 199.68189,94.350632 202.64399,93.576542 z M 235.72759,103.39182 C 237.93589,100.73100 238.23499,98.775512 236.43369,98.775512 C 234.71489,98.775512 232.51139,100.85285 231.53719,103.39182 C 230.56289,105.93079 230.24509,108.00814 230.83109,108.00814 C 231.41699,108.00814 233.62049,105.93079 235.72759,103.39182 z M 235.70639,77.232712 C 237.16249,77.232712 238.98719,79.656272 239.76129,82.618412 C 240.61699,85.893122 241.30859,84.648992 241.52569,79.444282 C 241.73549,74.413732 239.97939,70.154072 237.26639,69.113002 C 234.72739,68.138722 232.65009,64.304482 232.65009,60.592492 C 232.65009,49.215012 220.71069,40.972862 219.97579,51.843002 C 219.77549,54.805142 218.72849,53.104442 217.64909,48.063672 C 214.91999,35.318642 201.83859,30.750312 189.06489,38.081382 C 183.98739,40.995492 178.45389,43.379762 176.76819,43.379762 C 171.76599,43.379762 155.71151,60.951922 155.71151,66.426912 C 155.71151,69.207362 154.42325,73.889412 152.84870,76.831472 C 151.11188,80.076752 151.09335,83.931122 152.80158,86.631172 C 154.96921,90.057342 155.62811,89.411152 155.66438,83.823562 C 155.70379,77.754252 156.89329,76.862062 162.92669,78.376342 C 168.15139,79.687672 172.11989,78.081702 177.31209,72.554892 C 184.99329,64.378692 192.41229,62.846282 197.87379,68.307852 C 200.33589,70.769872 203.02169,69.930542 207.72199,65.230312 C 216.25869,56.693642 217.44939,57.062962 215.34319,67.594132 C 213.93609,74.629152 215.35729,78.078902 222.34459,84.589722 L 231.11129,92.758662 L 232.08509,84.995692 C 232.62069,80.726052 234.25029,77.232712 235.70639,77.232712 z "
+         style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero"
+         id="man" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/Important2.svg b/data/map-icons/svg/incomming/Important2.svg
new file mode 100644
index 0000000..f10f54a
--- /dev/null
+++ b/data/map-icons/svg/incomming/Important2.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="600"
+   height="500"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="Nuvola_apps_important_2.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="C:\Documents and Settings\Administrator\Desktop">
+  <metadata
+     id="metadata48">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="573"
+     inkscape:window-width="744"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.5"
+     inkscape:cx="35.420635"
+     inkscape:cy="344.13461"
+     inkscape:window-x="48"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="g1"
+       x1="41.1948738"
+       y1="616.477173"
+       x2="118.931351"
+       y2="527.555115"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.556763,0,0,-4.315033,37.49756,2758.519)">
+      <stop
+         offset="0"
+         stop-color="#b00"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-color="#5f0000"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="g2"
+       x1="530.809509"
+       y1="486.631012"
+       x2="174.805481"
+       y2="211.22995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960006,0,0,0.960006,11.68071,9.787565)">
+      <stop
+         offset="0"
+         stop-color="#9a0000"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-color="#f22803"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="g3"
+       x1="187.873566"
+       y1="224.598923"
+       x2="581.837463"
+       y2="483.100006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960006,0,0,0.960006,-390.66305,345.66328)">
+      <stop
+         offset="0"
+         stop-color="#ec6c60"
+         id="stop17" />
+      <stop
+         offset="1"
+         stop-color="#d11412"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="g4"
+       x1="250.398453"
+       y1="101.536331"
+       x2="412.094299"
+       y2="264.54187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.960006,0,0,0.960006,11.68071,9.787565)">
+      <stop
+         offset="0"
+         stop-color="#ffd9d9"
+         id="stop22" />
+      <stop
+         offset="1"
+         stop-color="#ff2727"
+         id="stop24" />
+    </linearGradient>
+    <radialGradient
+       id="g5"
+       cx="295.471252"
+       cy="186.096344"
+       r="179.550003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.14292e-8,1.531256,-0.876504,-2.165967e-5,462.7486,-245.0023)">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop27" />
+      <stop
+         offset="0.5"
+         stop-color="#fff"
+         id="stop29" />
+      <stop
+         offset="1"
+         stop-color="#d5d5d5"
+         id="stop31" />
+    </radialGradient>
+  </defs>
+  <path
+     d="M 287.0439 30.68461 C 287.0439 30.68461 26.88238 457.8871 26.88238 457.8871 C 21.89034 466.0472 21.89034 476.1272 26.88238 484.2873 C 31.77841 492.3513 40.99446 497.4394 50.97852 497.4394 L 571.3016 497.4394 C 581.1896 497.4394 590.4057 492.3513 595.3977 484.2873 C 600.2937 476.1272 600.2937 466.0472 595.3977 457.8871 L 335.2362 30.68461 C 330.2442 22.52457 321.0281 17.43654 311.14 17.43654 C 301.252 17.43654 292.0359 22.52457 287.0439 30.68461z"
+     style="fill-opacity:0.178571"
+     id="path33" />
+  <path
+     d="M 275.5863 23.03565 C 275.5863 23.03565 15.42473 450.2381 15.42473 450.2381 C 10.4327 458.3982 10.4327 468.4783 15.42473 476.6383 C 20.32076 484.7024 29.53681 489.7904 39.52087 489.7904 L 559.8439 489.7904 C 569.732 489.7904 578.948 484.7024 583.9401 476.6383 C 588.8361 468.4783 588.8361 458.3982 583.9401 450.2381 L 323.7785 23.03565 C 318.7865 14.8756 309.5705 9.787568 299.6824 9.787568 C 289.7943 9.787568 280.5783 14.8756 275.5863 23.03565z"
+     style="fill:#ffcc00"
+     id="path35" />
+  <path
+     d="M 299.6824 31.7717 C 298.0504 31.7717 296.5144 32.6357 295.6504 33.97971 L 165.5696 247.581 L 35.48885 461.1822 C 34.62484 462.5262 34.62484 464.2542 35.48885 465.5982 C 36.35285 466.9422 37.88886 467.8062 39.52087 467.8062 L 559.8439 467.8062 C 561.4759 467.8062 563.0119 466.9422 563.876 465.5982 C 564.74 464.2542 564.74 462.5262 563.876 461.1822 L 303.7144 33.97971 C 302.8504 32.6357 301.3144 31.7717 299.6824 31.7717z"
+     style="fill:#504416"
+     id="path37" />
+  <path
+     d="M 299.7514 39.46512 C 298.2057 39.54152 296.7649 40.40413 295.9414 41.68514 L 165.8606 255.2864 L 147.7405 285.0466 C 191.8747 311.5396 243.5133 326.8068 298.7014 326.8068 C 354.6732 326.8068 407.0086 311.1293 451.5523 283.9366 L 304.0114 41.68514 C 303.1474 40.34112 301.6234 39.46512 299.9914 39.46512 C 299.9149 39.46512 299.8274 39.46136 299.7514 39.46512z"
+     style="fill:#806600;stroke-width:10;stroke-linejoin:round"
+     id="path41" />
+  <path
+     d="M 286.4344 145.7244 L 129.2814 403.678 C 126.5934 408.1901 126.5934 413.7581 129.2814 418.1741 C 131.9695 422.6861 137.0575 425.4702 142.5295 425.4702 L 456.7395 425.4702 C 462.2115 425.4702 467.2996 422.6861 469.9876 418.1741 C 472.6756 413.6621 472.6756 408.1901 469.9876 403.678 L 312.9306 145.7244 C 310.2426 141.2124 305.1545 138.4284 299.6825 138.4284 C 294.2105 138.4284 289.1224 141.2124 286.4344 145.7244z"
+     style="fill:url(#g5)"
+     id="path43" />
+  <path
+     d="M 291.3968 416.3174 C 282.3931 412.0051 275.5362 401.6362 275.5362 392.3333 C 275.5362 375.0116 293.6366 361.9634 310.762 366.9398 C 322.3151 370.2971 330.1674 380.7229 330.0712 392.5774 C 329.9891 402.6474 325.6306 410.0656 316.7341 415.2773 C 309.9242 419.2665 298.5306 419.7341 291.3968 416.3174 z M 293.4432 347.9194 C 292.3177 347.3009 289.6669 345.1473 287.5529 343.1337 C 280.1664 336.0983 280.1756 336.1602 275.3607 260.8815 C 271.0805 193.9641 271.0451 192.9243 272.8817 188.1175 C 277.0134 177.3028 286.2196 172.5672 301.5485 173.3714 C 311.2922 173.8827 318.7963 177.3045 323.674 183.4607 C 327.8404 188.719 328.7462 191.6916 328.7424 200.0923 C 328.7383 209.2211 322.9068 321.1701 322.0779 328.0305 C 320.9926 337.0156 315.7466 344.3072 308.0575 347.5177 C 303.6637 349.3525 296.4136 349.5518 293.4432 347.9194z"
+     id="path45"
+     style="fill:#2b2200" />
+</svg>
diff --git a/data/map-icons/svg/incomming/Laser-symbol.svg b/data/map-icons/svg/incomming/Laser-symbol.svg
new file mode 100644
index 0000000..872a37d
--- /dev/null
+++ b/data/map-icons/svg/incomming/Laser-symbol.svg
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 11.0, SVG Export Plug-In . SVG Version: 6.0.0 Build 78)  -->
+<!-- Created by Cary Bass http://commons.wikipedia.com/wiki/User:Bastique on January 20, 2006 -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="600"
+   height="525"
+   id="radioactive"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docname="Laser.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="C:\Documents and Settings\Laurent\Bureau\Nouveau dossier"
+   sodipodi:modified="true">
+  <metadata
+     id="metadata2314">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2312">
+    <marker
+       inkscape:stockid="Torso"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Torso"
+       style="overflow:visible">
+      <g
+         id="g3468"
+         transform="scale(0.7,0.7)">
+        <path
+           id="path3470"
+           d="M -4.7792281,-3.239542 C -2.4288541,-2.8736027 0.52103922,-1.3019943 0.25792722,0.38794346 C -0.0051877922,2.0778819 -2.2126741,2.6176539 -4.5630471,2.2517169 C -6.9134221,1.8857769 -8.521035,0.75201414 -8.257922,-0.93792336 C -7.994809,-2.6278615 -7.1296041,-3.6054813 -4.7792281,-3.239542 z "
+           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.25;marker-start:none;marker-mid:none;marker-end:none" />
+        <path
+           id="path3472"
+           d="M 4.4598789,0.088665736 C -2.5564571,-4.378332 5.2248769,-3.9061806 -0.84829578,-8.7197331"
+           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-end:none" />
+        <path
+           id="path3474"
+           d="M 4.9298719,0.057520736 C -1.3872731,1.7494689 1.8027579,5.4782079 -4.9448731,7.5462725"
+           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none" />
+        <rect
+           id="rect3476"
+           transform="matrix(0.527536,-0.849533,0.887668,0.460484,0,0)"
+           y="-1.7408575"
+           x="-10.391706"
+           height="2.7608147"
+           width="2.6366582"
+           style="fill-rule:evenodd;stroke-width:1pt;marker-end:none" />
+        <rect
+           id="rect3478"
+           transform="matrix(0.671205,-0.741272,0.790802,0.612072,0,0)"
+           y="-7.9629307"
+           x="4.9587269"
+           height="2.8614161"
+           width="2.7327356"
+           style="fill-rule:evenodd;stroke-width:1pt;marker-end:none" />
+        <path
+           id="path3480"
+           transform="matrix(0,-1.109517,1.109517,0,25.96648,19.71619)"
+           d="M 16.779951 -28.685045 A 0.60731727 0.60731727 0 1 1  15.565317,-28.685045 A 0.60731727 0.60731727 0 1 1  16.779951 -28.685045 z"
+           sodipodi:ry="0.60731727"
+           sodipodi:rx="0.60731727"
+           sodipodi:cy="-28.685045"
+           sodipodi:cx="16.172634"
+           style="fill:#ff0000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+           sodipodi:type="arc" />
+        <path
+           id="path3482"
+           transform="matrix(0,-1.109517,1.109517,0,26.8245,16.99126)"
+           d="M 16.779951 -28.685045 A 0.60731727 0.60731727 0 1 1  15.565317,-28.685045 A 0.60731727 0.60731727 0 1 1  16.779951 -28.685045 z"
+           sodipodi:ry="0.60731727"
+           sodipodi:rx="0.60731727"
+           sodipodi:cy="-28.685045"
+           sodipodi:cx="16.172634"
+           style="fill:#ff0000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+           sodipodi:type="arc" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="SemiCircleOut"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="SemiCircleOut"
+       style="overflow:visible">
+      <path
+         id="path3513"
+         d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.74,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.74,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineEnd"
+       id="InfiniteLineEnd"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <g
+         id="g3453">
+        <circle
+           id="circle3455"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           sodipodi:cx="3"
+           sodipodi:cy="0"
+           sodipodi:rx="0.80000001"
+           sodipodi:ry="0.80000001" />
+        <circle
+           id="circle3457"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           sodipodi:cx="6.5"
+           sodipodi:cy="0"
+           sodipodi:rx="0.80000001"
+           sodipodi:ry="0.80000001" />
+        <circle
+           id="circle3459"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           sodipodi:cx="10"
+           sodipodi:cy="0"
+           sodipodi:rx="0.80000001"
+           sodipodi:ry="0.80000001" />
+      </g>
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="938"
+     inkscape:window-width="1280"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.94753235"
+     inkscape:cx="192.34035"
+     inkscape:cy="166.11685"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:current-layer="layer2" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Fond"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="laser"
+     style="display:inline">
+    <g
+       id="g2292">
+      <g
+         id="g2258"
+         style="opacity:1;display:inline">
+        <g
+           id="g2206">
+          <path
+             d="M 597.6,499.6 L 313.8,8 C 310.9,3 305.6,0 299.9,0 C 294.2,0 288.9,3.1 286,8 L 2.2,499.6 C -0.7,504.6 -0.7,510.7 2.2,515.6 C 5.1,520.6 10.4,523.6 16.1,523.6 L 583.7,523.6 C 589.4,523.6 594.7,520.5 597.6,515.6 C 600.5,510.6 600.5,504.5 597.6,499.6 z "
+             id="sign_border" />
+          <polygon
+             style="fill:#f7f619"
+             points="43.9,491.5 299.9,48.2 555.9,491.5 43.9,491.5 "
+             id="sign_bg" />
+        </g>
+      </g>
+      <g
+         id="g2231">
+        <g
+           style="opacity:1;fill:#000000;fill-opacity:1"
+           id="g2262"
+           transform="matrix(0.5865309,0,0,0.5865309,121.34613,144.34813)">
+          <circle
+             sodipodi:ry="74"
+             sodipodi:rx="74"
+             sodipodi:cy="343.70001"
+             sodipodi:cx="299.79999"
+             r="74"
+             cy="343.70001"
+             cx="299.79999"
+             id="inner_circle"
+             style="fill:#000000;fill-opacity:1" />
+          <circle
+             style="fill:#000000;fill-opacity:1"
+             sodipodi:ry="57"
+             sodipodi:rx="57"
+             sodipodi:cy="343.70001"
+             sodipodi:cx="299.79999"
+             r="57"
+             cy="343.70001"
+             cx="299.79999"
+             id="inner_circle_cutout" />
+        </g>
+        <path
+           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:11.60000038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 326.86247,343.65849 L 477.60727,343.65849"
+           id="path3437" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 299.62394,345.15101 C 300.65005,311.38268 303.72838,210.0777 303.72838,210.0777 L 291.41506,210.0777 C 291.41506,210.0777 294.21354,311.38268 295.14637,345.15101"
+           id="path6145"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 303.72838,342.72566 C 269.96005,341.69956 168.65507,338.62123 168.65507,338.62123 L 168.65507,350.93455 C 168.65507,350.93455 269.96005,348.13607 303.72838,347.20324"
+           id="path7118"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 299.31844,344.88006 C 300.34454,378.64839 303.42287,479.95337 303.42287,479.95337 L 291.10956,479.95337 C 291.10956,479.95337 293.90803,378.64839 294.84087,344.88006"
+           id="path7120"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 302.31291,345.60764 C 286.29159,315.86423 238.22764,226.63401 238.22764,226.63401 L 227.56934,232.79991 C 227.56934,232.79991 280.7202,319.08731 298.43715,347.84978"
+           id="path7122"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 303.83764,346.37853 C 275.41545,328.11566 190.1489,273.32706 190.1489,273.32706 L 183.81029,283.88356 C 183.81029,283.88356 272.10208,333.63383 301.53267,350.21725"
+           id="path7124"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 297.54761,348.0763 C 314.98153,319.13822 367.28327,232.32404 367.28327,232.32404 L 356.54801,226.29313 C 356.54801,226.29313 309.36991,315.9857 293.64388,345.88322"
+           id="path7126"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 294.41287,348.48981 C 323.94253,332.07785 412.53149,282.84194 412.53149,282.84194 L 406.22562,272.26584 C 406.22562,272.26584 320.64629,326.54941 292.11984,344.64394"
+           id="path7128"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 294.52217,344.68842 C 310.16926,374.63041 357.11051,464.45631 357.11051,464.45631 L 367.8453,458.42455 C 367.8453,458.42455 315.78063,371.47744 298.42575,342.49506"
+           id="path7130"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 292.8154,344.40814 C 321.30832,362.56045 406.78709,417.01736 406.78709,417.01736 L 413.08464,406.43631 C 413.08464,406.43631 324.60024,357.02943 295.10542,340.56048"
+           id="path7132"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 301.69068,340.10522 C 272.08867,356.3863 183.28263,405.22955 183.28263,405.22955 L 189.5416,415.83347 C 189.5416,415.83347 275.3604,361.92926 303.96667,343.9612"
+           id="path7134"
+           sodipodi:nodetypes="cccs" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 298.38626,342.86953 C 280.76609,371.69455 227.90555,458.16963 227.90555,458.16963 L 238.6017,464.26965 C 238.6017,464.26965 286.35725,374.8832 302.27578,345.08772"
+           id="path7136"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-x="-3.1660611"
+           inkscape:transform-center-y="-3.5908511" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 296.8554,338.14878 C 290.31119,361.48023 270.67847,431.47463 270.67847,431.47463 L 279.25067,433.60044 C 279.25067,433.60044 294.79211,362.59148 299.97259,338.92181"
+           id="path7140"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-x="-1.1072055"
+           inkscape:transform-center-y="-3.7591264" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 302.18877,337.8262 C 284.90183,354.80692 233.04091,405.7491 233.04091,405.7491 L 239.41843,411.85884 C 239.41843,411.85884 288.23552,358.00068 304.50789,340.04794"
+           id="path7142"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="-30.037221"
+           inkscape:transform-center-x="-35.64818" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 307.72839,342.69648 C 284.03908,347.79546 212.97105,363.09238 212.97105,363.09238 L 215.09087,371.66606 C 215.09087,371.66606 285.14714,352.27718 308.49924,345.8142"
+           id="path7144"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="-10.171218"
+           inkscape:transform-center-x="-46.385769" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 308.29475,348.31797 C 285.36214,340.48992 216.56422,317.00573 216.56422,317.00573 L 213.96629,325.44684 C 213.96629,325.44684 284.00409,344.90233 307.35005,351.38748"
+           id="path7146"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="12.829267"
+           inkscape:transform-center-x="-45.578544" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 304.7973,350.04777 C 288.55393,332.06623 239.82379,278.1215 239.82379,278.1215 L 233.45284,284.23809 C 233.45284,284.23809 285.22363,335.26352 302.48058,352.272"
+           id="path7148"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="33.754392"
+           inkscape:transform-center-x="-32.304644" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 300.75434,352.20619 C 295.44083,328.56408 279.50032,257.63763 279.50032,257.63763 L 270.94621,259.83508 C 270.94621,259.83508 290.96934,329.71272 297.64374,353.00527"
+           id="path7150"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="46.266932"
+           inkscape:transform-center-x="-10.597389" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 297.60617,352.79675 C 304.12813,329.45908 323.69407,259.44598 323.69407,259.44598 L 315.11985,257.32834 C 315.11985,257.32834 299.64614,328.3521 294.48825,352.0267"
+           id="path7152"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="46.381167"
+           inkscape:transform-center-x="10.191146" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 293.61624,352.18522 C 310.66349,334.96389 361.80532,283.29985 361.80532,283.29985 L 355.3428,277.28009 C 355.3428,277.28009 307.28536,331.81717 291.26622,349.99621"
+           id="path7154"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="34.246207"
+           inkscape:transform-center-x="31.786296" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 288.3418,349.33889 C 311.80897,343.29944 382.21057,325.1811 382.21057,325.1811 L 379.7506,316.69876 C 379.7506,316.69876 310.52309,338.86547 287.44726,346.25438"
+           id="path7156"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="12.039487"
+           inkscape:transform-center-x="45.834571" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 289.07669,344.38565 C 312.28871,351.34158 381.92486,372.20942 381.92486,372.20942 L 384.20199,363.67618 C 384.20199,363.67618 313.47905,346.88101 289.90474,341.28263"
+           id="path7158"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="-11.066653"
+           inkscape:transform-center-x="46.132236" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 291.14439,341.78605 C 307.60119,359.57247 356.97162,412.93182 356.97162,412.93182 L 363.26912,406.73965 C 363.26912,406.73965 310.89309,356.33565 293.43441,339.53433"
+           id="path7160"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="-33.342283"
+           inkscape:transform-center-x="32.728381" />
+        <path
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.71726096;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:13.80000019;stroke-dasharray:none;stroke-opacity:1"
+           d="M 295.1342,339.11594 C 300.38366,362.77235 316.13203,433.74171 316.13203,433.74171 L 324.69206,431.56744 C 324.69206,431.56744 304.85824,361.63582 298.24696,338.32529"
+           id="path7162"
+           sodipodi:nodetypes="cccs"
+           inkscape:transform-center-y="-46.302828"
+           inkscape:transform-center-x="10.470156" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/Music_Note.svg b/data/map-icons/svg/incomming/Music_Note.svg
new file mode 100644
index 0000000..ae7aede
--- /dev/null
+++ b/data/map-icons/svg/incomming/Music_Note.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="24.886"
+   height="41.75"
+   id="svg1533">
+  <defs
+     id="defs1536" />
+  <g
+     transform="translate(-427.1495,-34.28441)"
+     id="g12994">
+    <path
+       d="M 431.56955,65.847427 C 428.17371,67.667397 426.36427,70.961977 427.47733,73.440387 C 428.66459,76.084027 432.74434,76.830107 436.58391,75.105757 C 440.42347,73.381397 442.57607,69.836357 441.38881,67.192727 C 440.20154,64.549087 436.1218,63.803007 432.28223,65.527357 C 432.04226,65.635127 431.79595,65.726097 431.56955,65.847427 z "
+       style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       id="path12112" />
+    <path
+       d="M 441.18705,68.62194 L 441.18705,35.03437"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path12114" />
+    <path
+       d="M 441.1824,35.99421 C 440.6199,42.30671 446.02495,44.56795 448.6824,47.49421 C 451.20836,50.27568 452.13107,53.48393 452.02788,56.48981 C 452.00033,57.29238 451.78245,60.76992 449.41343,64.25653 C 452.58135,55.50942 449.6319,51.99847 446.75047,49.20495 C 443.26053,45.82149 440.66435,42.63277 441.1824,35.99421 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path12116" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/No_Shoes.svg b/data/map-icons/svg/incomming/No_Shoes.svg
new file mode 100644
index 0000000..8b79a58
--- /dev/null
+++ b/data/map-icons/svg/incomming/No_Shoes.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="708.66138"
+   height="708.66138"
+   id="svg1395"
+   sodipodi:version="0.32"
+   inkscape:version="0.43+devel"
+   sodipodi:docbase="/home/yug/Desktop"
+   sodipodi:docname="No Shoes.svg"
+   inkscape:export-filename="/home/yug/Desktop/No Shoes.png"
+   inkscape:export-xdpi="76.834999"
+   inkscape:export-ydpi="76.834999"
+   version="1.0"
+   inkscape:r_cx="true"
+   inkscape:r_cy="true">
+  <defs
+     id="defs1397" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.88"
+     inkscape:cx="214.375"
+     inkscape:cy="192.47129"
+     inkscape:document-units="pt"
+     inkscape:current-layer="g5798"
+     id="namedview1399"
+     inkscape:window-width="1018"
+     inkscape:window-height="736"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     width="20cm"
+     height="20cm"
+     units="cm" />
+  <metadata
+     id="metadata1401">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:r_cx="true"
+     inkscape:r_cy="true">
+    <g
+       id="g5798"
+       transform="matrix(0.993312,0,0,0.993312,19.48268,14.56237)"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true">
+      <path
+         transform="matrix(-1.048534,-1.048534,1.048534,-1.048534,356.7624,981.7171)"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         d="M 518.75 308.125 A 191.875 191.875 0 1 1  135,308.125 A 191.875 191.875 0 1 1  518.75 308.125 z"
+         sodipodi:ry="191.875"
+         sodipodi:rx="191.875"
+         sodipodi:cy="308.125"
+         sodipodi:cx="326.875"
+         id="path1404"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:36.25;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="rect4033"
+         d="M 269.47004,88.156203 C 258.79963,87.269724 249.1449,89.247434 242.03049,95.303592 C 219.8197,114.21056 230.17342,160.76921 243.98682,189.93223 C 258.36333,220.28413 322.2879,263.49825 322.28792,263.49825 L 388.17989,206.67086 C 388.17989,206.67086 361.73164,143.76747 336.7732,120.8093 C 319.37393,104.80452 292.11214,90.037272 269.47004,88.156203 z M 410.36933,231.00388 L 346.41078,290.00068 C 346.41078,290.00068 394.57434,357.82109 432.79425,324.28182 C 470.1684,291.48474 410.36933,231.00388 410.36933,231.00388 z "
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:36.25;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path4917"
+         d="M 230.24239,352.27338 C 219.95058,355.22683 211.6238,360.49843 207.11813,368.68317 C 193.05151,394.23559 219.23668,434.10093 242.49057,456.47383 C 266.69248,479.75883 341.78441,497.50745 341.78441,497.50745 L 383.2541,421.01323 C 383.2541,421.01323 336.22573,371.56951 304.7499,358.94916 C 282.80722,350.15115 252.08102,346.00632 230.24239,352.27338 z M 412.62804,435.90066 L 373.73521,513.73811 C 373.73521,513.73811 442.81177,560.0821 466.66124,515.17275 C 489.98293,471.25721 412.62804,435.90066 412.62804,435.90066 z "
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:36.25;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         sodipodi:linespacing="100%"
+         id="text5792"
+         y="681.22736"
+         x="200.10074"
+         style="font-size:35.58840561px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:San GunguSue Medium"
+         xml:space="preserve"><tspan
+           style="font-size:53.38261414px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:San GunguSue Medium"
+           y="681.22736"
+           x="200.10074"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="tspan5794"
+           sodipodi:role="line">~ No Shoes ~</tspan></text>
+      <rect
+         transform="matrix(-0.707107,-0.707107,0.707107,-0.707107,0,0)"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         y="-267.17841"
+         x="-489.97473"
+         height="567.1911"
+         width="59.314095"
+         id="rect3154"
+         style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:29;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/WRDK.svg b/data/map-icons/svg/incomming/WRDK.svg
new file mode 100644
index 0000000..0f16ec6
--- /dev/null
+++ b/data/map-icons/svg/incomming/WRDK.svg
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1306"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   width="762.89001pt"
+   height="301.28pt"
+   sodipodi:docbase="C:\Dokumente und Einstellungen\User\Eigene Dateien\Eigene Bilder\0-wiki\Uploader"
+   sodipodi:docname="WRDK.svg"
+   version="1.0">
+  <metadata
+     id="metadata1311">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs1309" />
+  <sodipodi:namedview
+     inkscape:window-height="975"
+     inkscape:window-width="1280"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.50259871"
+     inkscape:cx="947.45281"
+     inkscape:cy="489.02236"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:current-layer="svg1306" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 58.12786,188.97903 C 58.12786,188.97903 60.225972,173.20375 67.272732,170.68932 C 80.274562,166.04997 116.2513,161.06617 155.90751,157.32375 C 232.83395,150.06408 420.40495,154.50995 420.40495,154.50995 C 420.40495,154.50995 467.53197,127.50397 471.75685,126.37192 C 488.94162,121.76727 479.67067,121.97535 498.48798,123.55812 C 517.30528,125.14088 497.4328,121.79949 547.02607,132.70298 C 596.61934,143.60646 696.86106,167.17206 696.86106,167.17206 C 696.86106,167.17206 708.81972,167.87551 717.96458,158.0272 C 752.82827,120.4817 843.1788,23.668131 843.1788,23.668131 C 843.1788,23.668131 858.30298,12.061201 871.31682,11.006021 C 884.33066,9.9508411 892.27409,15.866141 895.23415,19.447421 C 905.39167,31.736701 909.47902,40.023361 914.22731,52.509611 C 926.17212,83.920031 930.09703,127.1857 932.51703,155.2134 C 935.7631,192.80831 937.44119,205.86185 937.44119,205.86185 L 940.95844,205.86185 L 940.95844,262.84135 C 940.95844,262.84135 883.80308,276.7345 829.10979,286.05522 C 774.4165,295.37594 770.37166,294.14491 722.18529,298.01389 C 673.99892,301.88287 714.09561,299.94838 636.36431,301.53114 C 558.63301,303.1139 523.8122,304.16908 411.26009,304.34494 C 298.70798,304.5208 258.57049,301.27567 186.15588,302.23459 C 166.08155,302.50042 142.01435,296.43112 110.18321,286.75867 C 78.352072,277.08622 58.83132,263.5448 58.83132,263.5448 L 58.83132,247.36544 L 53.90716,244.55163 L 52.50026,365.54515 L 48.27956,245.25509 C 48.27956,245.25509 31.220878,238.74816 21.54843,231.18607 C 11.875982,223.62397 10.056363,221.08906 9.5897686,215.00671 C 9.0280966,207.68496 9.1406466,207.80152 13.713077,202.87736 C 18.285506,197.95321 19.062003,198.43295 27.879486,195.31009 C 36.696969,192.18723 48.98301,190.38593 48.98301,190.38593 L 52.50026,67.985521 L 54.61061,191.08938 L 58.12786,188.97903 z "
+     id="path1315"
+     sodipodi:nodetypes="csscssscscsssscccsssssscccccsssscccc" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#c4b200;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 197.41109,166.46861 L 197.41109,174.91002 L 165.75582,174.91002 L 166.45927,179.13072 L 139.02469,179.83417 L 138.32124,184.05488 L 91.893502,184.05488 C 91.893502,184.05488 77.824482,188.27558 77.121032,196.71699 C 76.417582,205.1584 90.486592,217.82051 90.486592,217.82051 L 90.486592,259.3241 L 130.58328,275.50346 L 262.83201,276.91037 L 308.5563,262.84135 L 314.88735,222.74466 L 327.54947,220.63431 L 327.54947,204.45495 L 314.1839,204.45495 L 313.48045,179.13072 L 249.46644,179.13072 L 246.65264,165.76516 L 197.41109,166.46861 z "
+     id="path2190"
+     sodipodi:nodetypes="cccccccsccccccccccccc" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#006383;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 58.12786,247.36544 C 58.12786,247.36544 133.38084,277.16501 145.35575,282.53797 C 155.28397,286.99261 276.90102,286.05522 276.90102,286.05522 C 276.90102,286.05522 331.89731,288.00106 370.45996,279.02072 C 408.97388,270.05172 447.13608,256.51029 447.13608,256.51029 L 475.2741,255.80685 L 475.97756,263.5448 L 460.50164,264.9517 C 460.50164,264.9517 444.7158,264.76911 445.02572,278.31726 C 445.33752,291.94779 459.79819,293.79318 459.79819,293.79318 L 474.57065,294.49663 L 474.57065,303.64149 L 449.24643,302.93804 L 430.95671,290.27593 C 430.95671,290.27593 384.52897,298.54148 365.5358,299.42079 C 300.84726,302.41563 231.25309,297.41898 172.08687,299.42078 C 164.86136,299.66525 128.47293,288.86902 128.47293,288.86902 L 94.707302,276.91036 L 58.12786,256.5103 L 58.12786,256.5103 L 58.12786,256.5103"
+     id="path2192"
+     sodipodi:nodetypes="cscsccccscccccssccccc" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#008f00;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 478.79136,255.10339 L 478.79136,267.06206 L 454.87404,268.46896 C 454.87404,268.46896 447.13608,272.86553 447.13608,278.31727 C 447.13608,283.76901 454.87404,290.27593 454.87404,290.27593 L 476.68101,290.97938 L 477.38446,302.93804 L 495.67417,302.93804 L 495.67417,295.90353 L 523.8122,295.20008 L 547.72952,280.42762 L 524.51565,266.35861 L 499.19143,266.3586 L 499.19143,255.80684 L 478.79136,255.10339 z "
+     id="path2194"
+     sodipodi:nodetypes="cccsccccccccccc" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#008c00;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 310.66665,246.66199 L 498.48798,248.06889 L 499.19143,252.99304 L 309.9632,253.69649"
+     id="path2196" />
+  <g
+     id="g2236"
+     style="stroke:#ff8000;stroke-opacity:1"
+     transform="translate(-53.72079,-149.2245)">
+    <path
+       id="path2198"
+       d="M 555.72602,404.32781 L 622.55383,404.32781 L 622.55383,364.23113 L 722.44383,362.82423 L 721.74037,362.82423"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ff8000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       id="path2200"
+       d="M 552.20877,450.75556 L 705.56101,447.94176 L 705.56101,415.58303 L 723.14728,415.58303 L 723.14728,415.58303"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ff8000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 617.37114,222.74466 L 607.52283,235.40678"
+     id="path2202" />
+  <path
+     id="path2204"
+     d="M 617.37114,222.74466 L 607.52283,235.40678"
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <g
+     id="g2214"
+     transform="translate(-53.72079,-149.2245)">
+    <path
+       id="path2206"
+       d="M 671.09193,371.96908 L 661.24362,384.6312"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 676.01609,380.41049 L 666.16778,393.07261"
+       id="path2208" />
+    <path
+       id="path2210"
+       d="M 681.6437,388.14845 L 671.79539,400.81057"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 687.27131,396.58986 L 677.423,409.25198"
+       id="path2212" />
+  </g>
+  <g
+     id="g2220"
+     transform="translate(-64.976,-112.645)">
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 671.09193,371.96908 L 661.24362,384.6312"
+       id="path2222" />
+    <path
+       id="path2224"
+       d="M 676.01609,380.41049 L 666.16778,393.07261"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 681.6437,388.14845 L 671.79539,400.81057"
+       id="path2226" />
+    <path
+       id="path2228"
+       d="M 687.27131,396.58986 L 677.423,409.25198"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#dc0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 939.55154,220.63431 L 924.07562,220.63431 L 829.81324,200.93769 L 700.37831,214.30326 C 700.37831,214.30326 692.64035,201.46528 687.01275,201.64114 C 681.38514,201.817 677.86789,215.00671 677.86789,215.00671 L 668.72304,215.00671 L 668.72304,223.44812 L 651.13677,223.44812 L 651.13677,235.40678 L 670.12994,234.70333 L 684.9024,241.73783 L 668.01958,249.47579 L 651.84022,250.17924 L 651.84022,260.02755 L 669.42649,260.02755 L 669.42649,266.35861 L 678.57134,265.65515 C 678.57134,265.65515 684.90239,280.0759 690.53,279.72417 C 696.15761,279.37245 701.08177,264.24825 701.08177,264.24825 L 831.92359,273.39311 L 924.07562,254.39994 L 939.55154,253.69649"
+     id="path2230"
+     sodipodi:nodetypes="ccccscccccccccccccscccc" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 669.42649,225.55847 L 669.42649,235.40678"
+     id="path2232" />
+  <path
+     style="fill:#5b5b5b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 668.01958,248.77234 L 669.42649,261.43445"
+     id="path2234" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 425.68083,157.32375 L 469.6465,133.40643 L 470.34995,165.76516 L 464.72234,167.87551 L 425.68083,157.32375 z "
+     id="path2240" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 480.54998,138.33059 L 480.19826,163.65481 L 530.49498,163.65481 L 530.49499,138.33059 L 480.54998,138.33059 z "
+     id="path2242"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 479.84653,127.77883 L 494.97072,126.72365 L 531.90188,131.29608 L 480.19826,131.99953 L 479.84653,127.77883 z "
+     id="path2244" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 536.12259,137.97886 L 536.12259,164.35826 L 565.31579,144.30992 L 536.12259,137.97886 z "
+     id="path2246" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 415.4808,156.26858 L 415.4808,160.13756 L 467.88787,174.91002 L 475.2741,170.33759 L 532.60533,171.04104 L 576.92272,138.68231"
+     id="path2248" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 873.42718,12.412921 L 873.7789,192.84801 L 936.03429,193.55146 L 936.03429,193.55146 L 936.73774,193.90319"
+     id="path2250" />
+  <path
+     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 931.46186,146.06854 L 924.42735,146.42027 L 924.77908,193.55146"
+     id="path2252" />
+</svg>
diff --git a/data/map-icons/svg/incomming/biohazard.svg b/data/map-icons/svg/incomming/biohazard.svg
new file mode 100644
index 0000000..217472b
--- /dev/null
+++ b/data/map-icons/svg/incomming/biohazard.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 11.0, SVG Export Plug-In . SVG Version: 6.0.0 Build 78)  -->
+<!-- Created by Cary Bass http://commons.wikipedia.com/wiki/User:Bastique on January 20, 2006 -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="600" height="525"
+   id="radioactive">
+	<g id="radiation_sign">
+<g>
+				<path id="sign_border" d="M597.6,499.6L313.8,8c-2.9-5-8.2-8-13.9-8c-5.7,0-11,3.1-13.9,8L2.2,499.6c-2.9,5-2.9,11.1,0,16
+					c2.9,5,8.2,8,13.9,8h567.6c5.7,0,11-3.1,13.9-8C600.5,510.6,600.5,504.5,597.6,499.6z"/>
+				<polygon id="sign_bg" fill="#F7F619" points="43.9,491.5 299.9,48.2 555.9,491.5 "/>
+			</g>
+			<g>
+				<circle id="inner_circle" cx="299.8" cy="343.7" r="74"/> 
+				<circle id="inner_circle_cutout" fill="#F7F619" cx="299.8" cy="343.7" r="57"/> 
+			</g>
+			<g>
+				<g id="claws">
+					<g>
+						<g>
+							<path d="M327.1,166.9c27.4,10.9,46.7,37.6,46.7,68.8c0,40.9-33.1,74-74,74s-74-33.1-74-74c0-31.2,19.4-57.9,46.7-68.8
+								c-36.4,11.6-62.7,45.6-62.7,85.8c0,49.7,40.3,90,90,90c49.7,0,90-40.3,90-90C389.8,212.5,363.5,178.5,327.1,166.9z"/>
+						</g>
+					</g>
+					<g>
+						<g>
+							<path d="M439.4,455.6c-23.1,18.3-55.9,21.7-82.9,6.1c-35.4-20.4-47.5-65.7-27.1-101.1c20.4-35.4,65.7-47.5,101.1-27.1
+								c27,15.6,40.5,45.7,36.2,74.9c8.2-37.3-8.1-77.1-42.9-97.2c-43-24.9-98.1-10.1-122.9,32.9c-24.9,43-10.1,98.1,32.9,122.9
+								C368.5,487.1,411.2,481.3,439.4,455.6z"/>
+						</g>
+					</g>
+					<g>
+						<g>
+							<path d="M133.2,408.5c-4.3-29.1,9.2-59.2,36.2-74.9c35.4-20.4,80.7-8.3,101.1,27.1c20.4,35.4,8.3,80.7-27.1,101.1
+								c-27,15.6-59.8,12.2-82.9-6.1c28.2,25.7,70.8,31.5,105.7,11.4c43-24.9,57.8-79.9,32.9-122.9c-24.9-43-79.9-57.8-122.9-32.9
+								C141.3,331.4,125,371.2,133.2,408.5z"/>
+						</g>
+					</g>
+				</g>
+				<g id="claw_borders">
+					<g>
+						<g>
+							<path fill="#F7F619" d="M299.8,161.7c-40.9,0-74,33.1-74,74s33.1,74,74,74s74-33.1,74-74S340.7,161.7,299.8,161.7z
+								 M299.8,297.2c-34,0-61.5-27.5-61.5-61.5c0-34,27.5-61.5,61.5-61.5s61.5,27.5,61.5,61.5C361.3,269.7,333.8,297.2,299.8,297.2
+								z"/>
+						</g>
+					</g>
+					<g>
+						<g>
+							<path fill="#F7F619" d="M142.3,434.7c20.4,35.4,65.7,47.5,101.1,27.1c35.4-20.4,47.5-65.7,27.1-101.1
+								c-20.4-35.4-65.7-47.5-101.1-27.1C134,354.1,121.9,399.3,142.3,434.7z M259.7,367c17,29.4,6.9,67-22.5,84
+								c-29.4,17-67,6.9-84-22.5c-17-29.4-6.9-67,22.5-84C205.1,327.5,242.7,337.6,259.7,367z"/>
+						</g>
+					</g>
+					<g>
+						<g>
+							<path fill="#F7F619" d="M457.5,434.6c20.4-35.4,8.3-80.7-27.1-101.1c-35.4-20.4-80.7-8.3-101.1,27.1
+								c-20.4,35.4-8.3,80.7,27.1,101.1C391.8,482.1,437.1,470,457.5,434.6z M340.2,366.8c17-29.4,54.6-39.5,84-22.5
+								s39.5,54.6,22.5,84c-17,29.4-54.6,39.5-84,22.5S323.2,396.3,340.2,366.8z"/>
+						</g>
+					</g>
+				</g>
+				<g id="inner_joins">
+					
+					<rect id="rectangle_lower_left" x="271.8" y="347.1" transform="matrix(-0.5 -0.866 0.866 -0.5 105.8923 775.3241)" fill="#F7F619" width="10" height="20"/> 
+					<rect id="rectangle_lower_right" x="318.1" y="347" transform="matrix(-0.5 0.866 -0.866 -0.5 793.7543 255.6409)" fill="#F7F619" width="10" height="20"/> 
+					<rect id="rectangle_top" x="294.8" y="307" fill="#F7F619" width="10" height="20"/> 
+					<circle id="front_circle" fill="#F7F619" cx="299.8" cy="343.7" r="19"/> 
+				</g>
+			</g>
+		</g>
+</svg>
diff --git a/data/map-icons/svg/incomming/monument.svg b/data/map-icons/svg/incomming/monument.svg
new file mode 100644
index 0000000..67687ee
--- /dev/null
+++ b/data/map-icons/svg/incomming/monument.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   width="128"
+   height="128"
+   version="1.0"
+   sodipodi:docbase="/home/fvayssie"
+   sodipodi:docname="unesco.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:cy="95.963017"
+     inkscape:cx="52.474843"
+     inkscape:zoom="4"
+     inkscape:window-height="988"
+     inkscape:window-width="1270"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     width="128px"
+     height="128px" />
+  <g
+     id="g8203"
+     transform="matrix(4.0000054,0,0,4.0000054,0.1509649,-1.0903954)">
+    <path
+       d="M 1.9817404,28.500836 L 29.996701,28.501237 M 2.964319,26.496811 L 29.000067,26.498295 M 3.9664993,24.502012 L 27.998063,24.498642"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999865;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+       id="path2161" />
+    <path
+       d="M 3.9743118,12.002012 L 28.005876,11.998642 M 6.0087263,12.294455 L 6.01046,24.657578 M 10.008726,12.294455 L 10.01046,24.657578 M 14.008726,12.294455 L 14.01046,24.657578 M 18.008726,12.294455 L 18.01046,24.657578 M 22.008726,12.294455 L 22.01046,24.657578 M 26.008726,12.294455 L 26.01046,24.657578"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.9999973;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+       id="path3157" />
+    <path
+       d="M 3.9864087,10.037711 L 3.9864087,8.2087038 L 15.870765,3.1690558 L 27.878103,8.0979936 L 27.878103,9.927073 L 15.761361,5.2477951 L 3.9864087,10.037711 z M 7.2364359,9.9534568 L 15.96291,6.4628168 L 24.450628,10.047206 L 21.01278,10.031582 L 15.934209,8.2334918 L 10.8701,9.9175759 L 7.2364359,9.9534568 z "
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd"
+       id="polygon6239" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/incomming/symbols.svg b/data/map-icons/svg/incomming/symbols.svg
new file mode 100644
index 0000000..c87d049
--- /dev/null
+++ b/data/map-icons/svg/incomming/symbols.svg
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="150.5625"
+   height="82.0625"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/incomming"
+   sodipodi:docname="symbols.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="0.7483652"
+     inkscape:cy="-7.1002524"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1282"
+     inkscape:window-height="1016"
+     inkscape:window-x="110"
+     inkscape:window-y="0"
+     showgrid="true"
+     showguides="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(6.25e-2,6.25e-2)">
+    <g
+       id="g2193"
+       style="stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none">
+      <rect
+         transform="scale(1,-1)"
+         y="-22"
+         x="40"
+         height="5"
+         width="5.000001"
+         id="rect2157"
+         style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="matrix(0.617175,0,0,-0.6079724,15.667961,33.026791)"
+         d="M 44.285716 22.267857 A 0.71428573 0.8035714 0 1 1  42.857144,22.267857 A 0.71428573 0.8035714 0 1 1  44.285716 22.267857 z"
+         sodipodi:ry="0.8035714"
+         sodipodi:rx="0.71428573"
+         sodipodi:cy="22.267857"
+         sodipodi:cx="43.57143"
+         id="path2159"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.81625134;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g2197"
+       style="stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none">
+      <rect
+         y="17"
+         x="50"
+         height="4.999999"
+         width="5"
+         id="rect2161"
+         style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="matrix(0.6999998,0,0,0.5937234,21.000009,7.3019533)"
+         d="M 44.285716 22.267857 A 0.71428573 0.8035714 0 1 1  42.857144,22.267857 A 0.71428573 0.8035714 0 1 1  44.285716 22.267857 z"
+         sodipodi:ry="0.8035714"
+         sodipodi:rx="0.71428573"
+         sodipodi:cy="22.267857"
+         sodipodi:cx="43.57143"
+         id="path2163"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.77558422;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40,12 L 45,7 L 50,12 L 40,12 z "
+       id="path2173" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 55,12 L 60,2 L 65,12 L 55,12 z "
+       id="path2175" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 70,22 L 70,2 L 75,7 L 70,12"
+       id="path2177" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 80,22 L 80,2 L 90,7 L 80,12"
+       id="path2179" />
+    <g
+       id="g2189"
+       style="stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         d="M 45.204328 29.600887 A 2.6516504 2.5253813 0 1 1  39.901027,29.600887 A 2.6516504 2.5253813 0 1 1  45.204328 29.600887 z"
+         sodipodi:ry="2.5253813"
+         sodipodi:rx="2.6516504"
+         sodipodi:cy="29.600887"
+         sodipodi:cx="42.552677"
+         id="path2181"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.3199326,0,0,1,-13.613989,-0.4419422)"
+         d="M 42.931484 30.04283 A 0.37880722 0.44194174 0 1 1  42.17387,30.04283 A 0.37880722 0.44194174 0 1 1  42.931484 30.04283 z"
+         sodipodi:ry="0.44194174"
+         sodipodi:rx="0.37880722"
+         sodipodi:cy="30.04283"
+         sodipodi:cx="42.552677"
+         id="path2183"
+         style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.43520525;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 50,27 L 60,27 L 60,37 L 55,42 L 50,37 L 50,27"
+       id="path2201" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 65.061321,27.048491 L 74.935052,27.048491 L 74.935052,37.111625 C 74.935052,37.111625 74.985812,41.881163 69.998187,41.813131 C 64.947424,41.749996 64.998187,36.985356 64.998187,36.985356 L 64.998187,27.048491"
+       id="path2203"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 85.088493,27.063722 L 94.999208,27.153008 L 95.036191,37.005075 C 95.036191,37.005075 95.123934,41.905368 90.029846,46.550761 C 84.81583,41.993473 84.999208,37.042058 84.999208,37.042058 L 85.088493,27.01142"
+       id="path3176"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 49.75,47.25 L 54.939405,52.048224 L 59.75,47.25 L 59.75,57.25 L 54.75,62.25 L 49.75,57.25 L 49.75,47.25"
+       id="path3178"
+       sodipodi:nodetypes="ccccccc" />
+    <a
+       id="a3189"
+       transform="translate(5,0)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3180"
+         d="M 65.5,81.5 L 65.5,51.857143 L 70.5,56.857143 L 75.5,51.857143 L 80.5,56.857143"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </a>
+    <g
+       id="g3198">
+      <path
+         sodipodi:end="4.7480881"
+         sodipodi:start="0"
+         d="M 110,7 A 5,5 0 1 1 105.17846,2.0031857 L 105,7 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3194"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.5,0,0,0.5,52.5,3.5)"
+         sodipodi:end="4.7480881"
+         sodipodi:start="0"
+         d="M 110,7 A 5,5 0 1 1 105.17846,2.0031857 L 105,7 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3196"
+         style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3222"
+       transform="translate(-5.0000009,0)">
+      <path
+         transform="translate(20,0)"
+         sodipodi:end="4.7480881"
+         sodipodi:start="0"
+         d="M 110,7 A 5,5 0 1 1 105.17846,2.0031857 L 105,7 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3204"
+         style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-0.4998894,1.0516011e-2,-1.0516011e-2,-0.4998894,177.562,9.3950446)"
+         sodipodi:end="4.7480881"
+         sodipodi:start="0"
+         d="M 110,7 A 5,5 0 1 1 105.17846,2.0031857 L 105,7 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3206"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3218"
+       transform="translate(-5,0)">
+      <path
+         transform="translate(35,0)"
+         sodipodi:end="4.7480881"
+         sodipodi:start="0"
+         d="M 110,7 A 5,5 0 1 1 105.17846,2.0031857 L 105,7 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3210"
+         style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-0.4998894,1.0516011e-2,-1.0516011e-2,-0.4998894,192.562,9.3950446)"
+         sodipodi:end="3.1444733"
+         sodipodi:start="1.6160048"
+         d="M 104.77403,11.994891 A 5,5 0 0 1 100.00002,6.9855968 L 105,7 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3212"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3244">
+      <path
+         sodipodi:open="true"
+         transform="translate(0,15)"
+         sodipodi:end="4.7213002"
+         sodipodi:start="1.5663129"
+         d="M 105.02242,11.99995 A 5,5 0 1 1 105.04456,2.0001985"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3228"
+         style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:open="true"
+         transform="matrix(0.5,0,0,0.5,52.5,18.5)"
+         sodipodi:end="7.8231793"
+         sodipodi:start="4.7177546"
+         d="M 105.02683,2.000072 A 5,5 0 0 1 105.15399,11.997628"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3230"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3248">
+      <path
+         sodipodi:open="true"
+         transform="translate(15.000001,14.999999)"
+         sodipodi:end="4.7213002"
+         sodipodi:start="1.5663129"
+         d="M 105.02242,11.99995 A 5,5 0 1 1 105.04456,2.0001985"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3234"
+         style="fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:open="true"
+         transform="matrix(-0.605934,0,0,0.5,183.65274,18.499999)"
+         sodipodi:end="7.8231793"
+         sodipodi:start="4.7177546"
+         d="M 105.02683,2.000072 A 5,5 0 0 1 105.15399,11.997628"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="7"
+         sodipodi:cx="105"
+         id="path3236"
+         style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3258">
+      <path
+         id="path3252"
+         d="M 120,77 L 125,67 L 130,77 L 120,77 z "
+         style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <a
+         transform="matrix(0.3225806,0,0,0.4976303,104.03226,26.443131)"
+         id="a3254">
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 65.5,81.5 L 65.5,51.857143 L 70.5,56.857143 L 75.5,51.857143 L 80.5,56.857143"
+           id="path3256"
+           sodipodi:nodetypes="ccccc" />
+      </a>
+    </g>
+    <g
+       id="g4236">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path3263"
+         d="M 145.55843,67.066203 L 145.55843,52 L 150,54.693377 L 145.66544,57.480249"
+         style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.12811279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path4234"
+         d="M 140.25,76.75 L 145.25,66.75 L 150.25,76.75 L 140.25,76.75 z "
+         style="fill:#00ffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2198"
+       width="32"
+       height="32"
+       x="2"
+       y="2"
+       ry="4.6501541"
+       rx="0" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark.svg b/data/map-icons/svg/misc/landmark.svg
new file mode 100644
index 0000000..c041572
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc"
+   sodipodi:docname="landmark.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="9.1839918"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="420" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#f2d31d;fill-opacity:1;stroke:#9a9a9a;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect2180"
+       width="20"
+       height="18.571428"
+       x="5.5357146"
+       y="6.1071424" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/barn.svg b/data/map-icons/svg/misc/landmark/barn.svg
new file mode 100644
index 0000000..84bcf78
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/barn.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="barn.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="58.749958"
+     inkscape:cy="3.1979138"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="924"
+     inkscape:window-x="485"
+     inkscape:window-y="92" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ff003c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.59707558px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.4516183,6.8972164 L 29.438096,6.7985353 L 29.438096,5.1491976 L 23.72002,1.8277704 L 10.941247,1.7854097 L 4.9572446,5.3273348 L 4.4516183,6.8972164 z "
+       id="path2165"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect2167"
+       width="8.3795834"
+       height="5.5875826"
+       x="7.9491305"
+       y="23.015583" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3139"
+       width="8.3795834"
+       height="5.5875826"
+       x="18.177147"
+       y="15.957586" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3141"
+       width="8.3795834"
+       height="5.5875826"
+       x="6.2239213"
+       y="15.663502" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3143"
+       width="8.3795834"
+       height="5.5875826"
+       x="18.546833"
+       y="23.897823" />
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#130d0d;stroke-width:1.63125515;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3145"
+       width="23.906448"
+       height="23.085512"
+       x="5.114862"
+       y="6.8410187" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/farm.svg b/data/map-icons/svg/misc/landmark/farm.svg
new file mode 100644
index 0000000..ad3e530
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/farm.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="farm.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="9.6593118"
+     inkscape:cy="16.371316"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#bc9149;fill-opacity:1;stroke:#130d0d;stroke-width:1.26430166;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3145"
+       width="18.928532"
+       height="17.514397"
+       x="4.9109201"
+       y="13.308115" />
+    <path
+       style="fill:#ff003c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.8185212px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.8093986,13.262499 L 26.055717,13.267001 L 22.139015,9.2131613 L 22.111445,2.4789058 L 19.909816,2.4287635 L 19.92001,6.8456474 L 14.548133,0.83834478 L 2.8093986,13.262499 z "
+       id="path2165"
+       sodipodi:nodetypes="cccccccc" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3141"
+       width="3.6822174"
+       height="3.6866164"
+       x="6.758945"
+       y="16.15098" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3166"
+       width="3.4942081"
+       height="3.6866164"
+       x="17.546982"
+       y="16.090813" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3168"
+       width="3.6822174"
+       height="3.5110669"
+       x="6.7499771"
+       y="22.728619" />
+    <rect
+       style="fill:#f9f62a;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3170"
+       width="3.4942081"
+       height="3.5110669"
+       x="17.603521"
+       y="22.67103" />
+    <rect
+       style="fill:#21f203;fill-opacity:1;stroke:none;stroke-width:1.08200002;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3172"
+       width="4.4358172"
+       height="8.1222258"
+       x="11.53209"
+       y="22.135315" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/gasometer.svg b/data/map-icons/svg/misc/landmark/gasometer.svg
new file mode 100644
index 0000000..f8864ae
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/gasometer.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="gasometer.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="8.3341337"
+     inkscape:cy="13.880344"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#b9bcbc;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.82117516px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.6499263,16.258026 L 1.6499263,28.598033 C 4.5612496,31.281019 26.536512,31.414608 30.177358,28.608545 C 30.332217,26.750607 30.281867,16.103129 30.281867,16.103129 L 1.6499263,16.258026 z "
+       id="path3366"
+       sodipodi:nodetypes="ccccc"
+       inkscape:transform-center-x="-1.2019493"
+       inkscape:transform-center-y="0.54105447" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#b9bcbc;fill-opacity:1;stroke:#130d0d;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="path3176"
+       sodipodi:cx="15.357142"
+       sodipodi:cy="0.9285714"
+       sodipodi:rx="12.232142"
+       sodipodi:ry="4.7321429"
+       d="M 15.265641,-3.8034391 A 12.232142,4.7321429 0 1 1 15.225707,-3.8032983"
+       sodipodi:start="4.7049085"
+       sodipodi:end="10.984829"
+       sodipodi:open="true"
+       transform="matrix(1.2047809,0,0,0.3103041,-2.4841358,15.943555)"
+       inkscape:transform-center-y="-6.609834"
+       inkscape:transform-center-x="-1.25" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78833109px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.93949,19.333618 L 5.1258178,19.333618 L 5.1258178,22.070172 L 8.0224794,22.070172 L 8.0224794,25.080377 L 11.643306,25.080377 L 11.643306,27.816926 L 15.339627,27.803493 L 15.339627,30.509196"
+       id="path3368"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:transform-center-x="6.1282977"
+       inkscape:transform-center-y="2.0798785" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/lighthouse.svg b/data/map-icons/svg/misc/landmark/lighthouse.svg
new file mode 100644
index 0000000..1f4ded0
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/lighthouse.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="lighthouse.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="25.861931"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#db1313;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.73966032;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.4504417,29.438672 L 17.799558,29.438673 L 17.057565,20.313041 L 9.1924352,20.313042 L 8.4504417,29.438672 z "
+       id="path3370"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69615084;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.1724488,20.33714 L 17.07755,20.337141 L 16.450162,11.521177 L 9.7998375,11.521178 L 9.1724488,20.33714 z "
+       id="path3372"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#db1313;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.66020828;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.7865733,11.544621 L 16.463425,11.544622 L 15.933516,2.8676384 L 13.125,1.7940352 L 10.316483,2.8676394 L 9.7865733,11.544621 z "
+       id="path3374"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 19.107144,4.2321428 L 29.732144,2.1785714"
+       id="path3134"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 19.107143,6.0178572 L 29.732143,5.9285715"
+       id="path3138" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 19.107143,7.7142858 L 29.375,9.3214282"
+       id="path3140"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/peak.svg b/data/map-icons/svg/misc/landmark/peak.svg
new file mode 100644
index 0000000..a4ae2a5
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/peak.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="peak.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="485"
+     inkscape:window-y="112" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#f19dd7;fill-opacity:1;fill-rule:evenodd;stroke:#1f151d;stroke-width:1.38507378px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.7461083,29.262107 L 15.016741,2.2818227 L 25.075321,29.218177 L 4.7461083,29.262107 z "
+       id="path3382"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/peak_small.svg b/data/map-icons/svg/misc/landmark/peak_small.svg
new file mode 100644
index 0000000..e46d764
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/peak_small.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="peak_small.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#d1adc6;fill-opacity:1;fill-rule:evenodd;stroke:#1f151d;stroke-width:1.31793761px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.5518259,29.295675 L 16.843992,17.962541 L 25.108889,29.246839 L 8.5518259,29.295675 z "
+       id="path3382"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/power.svg b/data/map-icons/svg/misc/landmark/power.svg
new file mode 100644
index 0000000..6de9e60
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/power.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="power.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#010101;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52399784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 20.523715,0.8512847 L 10.22281,18.367628 L 15.189318,15.892491 L 9.1191414,29.220143 L 18.684267,12.846171 L 13.165925,15.321307 L 20.523715,0.8512847 z "
+       id="path3443"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/power/fossil.svg b/data/map-icons/svg/misc/landmark/power/fossil.svg
new file mode 100644
index 0000000..fd5ea15
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/power/fossil.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark/power"
+   sodipodi:docname="fosil.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#010101;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52399784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 13.291572,2.1905704 L 2.9906671,19.706914 L 7.9571751,17.231777 L 1.8869985,30.559429 L 11.452124,14.185457 L 5.9337821,16.660593 L 13.291572,2.1905704 z "
+       id="path3443"
+       sodipodi:nodetypes="ccccccc" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2158"
+       width="3.5714285"
+       height="18.928572"
+       x="14.107142"
+       y="10.928572" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2160"
+       sodipodi:cx="23.526785"
+       sodipodi:cy="3.0714285"
+       sodipodi:rx="3.9732144"
+       sodipodi:ry="1.4285715"
+       d="M 19.733248,2.6466848 A 3.9732144,1.4285715 0 1 1 19.571715,2.9350584"
+       sodipodi:start="3.4434778"
+       sodipodi:end="9.5203826"
+       sodipodi:open="true"
+       transform="matrix(0.4916674,-0.6015844,0.5796937,0.510234,5.4905724,19.98948)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2162"
+       sodipodi:cx="23.526785"
+       sodipodi:cy="3.0714285"
+       sodipodi:rx="3.9732144"
+       sodipodi:ry="1.4285715"
+       d="M 19.733248,2.6466848 A 3.9732144,1.4285715 0 1 1 19.571715,2.9350584"
+       sodipodi:start="3.4434778"
+       sodipodi:end="9.5203826"
+       sodipodi:open="true"
+       transform="matrix(0.6218524,-0.2813011,-7.872588e-2,0.8155694,11.858106,9.3349124)"
+       inkscape:transform-center-y="2.1223243"
+       inkscape:transform-center-x="1.0752326" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2164"
+       width="12.232142"
+       height="7.8571434"
+       x="17.410711"
+       y="22" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/power/hydro.svg b/data/map-icons/svg/misc/landmark/power/hydro.svg
new file mode 100644
index 0000000..b495bdc
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/power/hydro.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark/power"
+   sodipodi:docname="hydro.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#010101;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52399784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 13.291572,2.1905704 L 2.9906671,19.706914 L 7.9571751,17.231777 L 1.8869985,30.559429 L 11.452124,14.185457 L 5.9337821,16.660593 L 13.291572,2.1905704 z "
+       id="path3443"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="font-size:12px;fill:#0000ff;fill-rule:evenodd;stroke-width:10.30560017"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       id="path624"
+       d="M 22.046665,29.656927 C 21.338507,30.41146 19.693503,30.422801 19.061811,29.674656 C 18.718886,29.268119 17.787529,29.251532 17.399521,29.626795 C 16.789968,30.392563 15.10732,30.404164 14.475068,29.651604 C 14.117673,29.23183 13.138001,29.227201 12.783056,29.656927 C 12.582597,29.539325 12.382147,29.421724 12.181697,29.304122 C 12.493874,28.933741 13.073511,28.751976 13.629059,28.754517 C 14.1862,28.753371 14.780596,28.933394 15.08329,29.312978 C 15.431966,29.719063 16.372179,29.731485 16.747862,29.334255 C 17.363488,28.579106 19.048375,28.59312 19.672306,29.334255 C 20.02597,29.75026 20.96698,29.748948 21.395676,29.328931 C 21.7575,28.933741 22.337137,28.751976 22.892675,28.754517 C 23.449825,28.753371 24.044229,28.933394 24.346898,29.312978 C 24.695582,29.719063 25.635795,29.731485 26.011487,29.334255 C 26.627113,28.579106 28.312,28.59312 28.935922,29.334255 C 29.289594,29.75026 28.957119,30.422801 28.325419,29.674656 C 27.982503,29.268119 27.051154,29.251532 26.663145,29.626795 C 26.053593,30.392563 24.370928,30.404164 23.738694,29.651604 C 23.381281,29.23183 22.401609,29.227201 22.046665,29.656927 z "
+       inkscape:transform-center-y="-0.73742916"
+       inkscape:transform-center-x="6.513084" />
+    <path
+       style="font-size:12px;fill:#0000ff;fill-rule:evenodd;stroke-width:10.30560017"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       id="path625"
+       d="M 21.856277,26.548082 C 21.14812,27.302625 19.503116,27.313966 18.871424,26.565816 C 18.528499,26.159284 17.597141,26.142691 17.209133,26.517943 C 16.599581,27.283717 14.916932,27.295317 14.284681,26.542769 C 13.927285,26.122984 12.947614,26.11836 12.592669,26.548082 C 12.39221,26.43048 12.19176,26.312878 11.99131,26.19527 C 12.303487,25.824912 12.883124,25.643135 13.438671,25.645676 C 13.995813,25.64453 14.590209,25.824542 14.892903,26.204148 C 15.241579,26.610222 16.181792,26.622644 16.557475,26.22542 C 17.173101,25.470265 18.857988,25.484284 19.481919,26.22542 C 19.835582,26.641414 20.776593,26.640113 21.205289,26.220097 C 21.567113,25.824912 22.146749,25.643135 22.702288,25.645676 C 23.259438,25.64453 23.853842,25.824542 24.156511,26.204148 C 24.505195,26.610222 25.445408,26.622644 25.8211,26.22542 C 26.436726,25.470265 28.121613,25.484284 28.745535,26.22542 C 29.099207,26.641414 28.766732,27.313966 28.135032,26.565816 C 27.792115,26.159284 26.860766,26.142691 26.472758,26.517943 C 25.863206,27.283717 24.180541,27.295317 23.548307,26.542769 C 23.190894,26.122984 22.211222,26.11836 21.856277,26.548082 z "
+       inkscape:transform-center-y="-2.1330176"
+       inkscape:transform-center-x="6.5130836" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/power/nuclear.svg b/data/map-icons/svg/misc/landmark/power/nuclear.svg
new file mode 100644
index 0000000..d9f0cda
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/power/nuclear.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark/power"
+   sodipodi:docname="nuclear.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="27.212978"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#010101;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52399784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 13.291572,2.1905704 L 2.9906671,19.706914 L 7.9571751,17.231777 L 1.8869985,30.559429 L 11.452124,14.185457 L 5.9337821,16.660593 L 13.291572,2.1905704 z "
+       id="path3443"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2242"
+       sodipodi:cx="19.330357"
+       sodipodi:cy="13.607142"
+       sodipodi:rx="9.4196424"
+       sodipodi:ry="9.4642859"
+       d="M 10.336692,10.793215 A 9.4196424,9.4642859 0 1 1 9.9537303,12.703691"
+       sodipodi:start="3.4434778"
+       sodipodi:end="9.5203826"
+       sodipodi:open="true"
+       transform="matrix(1.0947661,0,0,1.0754557,-0.1354296,5.1339779)" />
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.594207,19.383765 L 16.383809,12.278076 L 21.173411,19.287743 L 11.594207,19.383765 z "
+       id="path2248"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.075663,19.383765 L 25.865265,12.278076 L 30.654867,19.287743 L 21.075663,19.383765 z "
+       id="path3223"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 16.383809,26.297408 L 21.173411,19.19172 L 25.963012,26.201386 L 16.383809,26.297408 z "
+       id="path3225"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/power/tower.svg b/data/map-icons/svg/misc/landmark/power/tower.svg
new file mode 100644
index 0000000..068c9a6
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/power/tower.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark/power"
+   sodipodi:docname="tower.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="20.891323"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#010101;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52399784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12.488001,2.9048561 L 2.1870957,20.421199 L 7.1536037,17.946062 L 1.0834271,31.273714 L 10.648553,14.899742 L 5.1302107,17.374878 L 12.488001,2.9048561 z "
+       id="path3443"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 20.625,31.464286 L 24.196429,1.5535714 L 28.303571,31.375"
+       id="path2158" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 18.571429,4.5892857 L 29.910714,4.5892857"
+       id="path2160"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 20,7.625 L 28.660715,7.625"
+       id="path2162"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.19748697;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.453815,17 L 26.206897,17"
+       id="path3134"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.17750704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 22.79199,13.026786 L 25.824082,13.026786"
+       id="path3136"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22755696;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.905818,21.598214 L 26.888825,21.598214"
+       id="path3138"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25672871;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 21.270717,26.151786 L 27.613211,26.151786"
+       id="path3140"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/power/wind.svg b/data/map-icons/svg/misc/landmark/power/wind.svg
new file mode 100644
index 0000000..d01c366
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/power/wind.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark/power"
+   sodipodi:docname="wind.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.265294"
+     inkscape:cy="15.452645"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#010101;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.52399784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 13.291572,2.1905704 L 2.9906671,19.706914 L 7.9571751,17.231777 L 1.8869985,30.559429 L 11.452124,14.185457 L 5.9337821,16.660593 L 13.291572,2.1905704 z "
+       id="path3443"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#006100;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44238055;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 24.05823,10.807987 L 23.254698,31.158061 L 25.232623,31.158061 L 24.05823,10.807987 z "
+       id="path3229"
+       sodipodi:nodetypes="cccc" />
+    <g
+       id="g3224"
+       transform="matrix(0.2461576,-0.9692298,0.9692298,0.2461576,3.772427,27.766599)">
+      <path
+         transform="matrix(1,0,0,0.9220024,0,1.2146388)"
+         sodipodi:open="true"
+         sodipodi:end="9.5203826"
+         sodipodi:start="3.4434778"
+         d="M 20.65932,7.4052587 A 0.7589286,6.2946429 0 1 1 20.628465,8.6759051"
+         sodipodi:ry="6.2946429"
+         sodipodi:rx="0.7589286"
+         sodipodi:cy="9.2767859"
+         sodipodi:cx="21.383928"
+         id="path3216"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-0.436222,0.8226311,-0.8811851,-0.4072355,44.193716,4.1350865)"
+         sodipodi:open="true"
+         sodipodi:end="9.5203826"
+         sodipodi:start="3.4434778"
+         d="M 20.65932,7.5124358 A 0.7589286,5.9341664 0 1 1 20.628465,8.7103159"
+         sodipodi:ry="5.9341664"
+         sodipodi:rx="0.7589286"
+         sodipodi:cy="9.2767859"
+         sodipodi:cx="21.383928"
+         id="path3218"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         inkscape:transform-center-y="1.5758508"
+         inkscape:transform-center-x="-4.1118968"
+         transform="matrix(0.6136414,0.660896,-0.6916019,0.5863968,10.356475,-0.344682)"
+         sodipodi:open="true"
+         sodipodi:end="9.5203826"
+         sodipodi:start="3.4434778"
+         d="M 20.65932,7.4052587 A 0.7589286,6.2946429 0 1 1 20.628465,8.6759051"
+         sodipodi:ry="6.2946429"
+         sodipodi:rx="0.7589286"
+         sodipodi:cy="9.2767859"
+         sodipodi:cx="21.383928"
+         id="path3220"
+         style="opacity:1;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/reservoir_covered.svg b/data/map-icons/svg/misc/landmark/reservoir_covered.svg
new file mode 100644
index 0000000..eb11bb9
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/reservoir_covered.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="reservoir_covered.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.14551103px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 1.2333996,23.087898 L 7.7833699,10.209146 L 24.314247,10.108531 L 30.552315,22.987281"
+       id="path3447"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#08f7f7;fill-opacity:1;stroke:#1f151d;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="path3449"
+       sodipodi:cx="13.035714"
+       sodipodi:cy="26.285715"
+       sodipodi:rx="4.1071429"
+       sodipodi:ry="3.0357144"
+       d="M 17.127482,26.023286 A 4.1071429,3.0357144 0 1 1 8.9473271,25.995929"
+       sodipodi:start="6.1966302"
+       sodipodi:end="9.5203826"
+       transform="matrix(1.7737124,0,0,2.4333162,-7.1200837,-49.124962)"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/spring.svg b/data/map-icons/svg/misc/landmark/spring.svg
new file mode 100644
index 0000000..a305f50
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/spring.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="spring.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="9.1839918"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="486"
+     inkscape:window-y="21" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#3ab6e7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1,1;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 15.535714,15.75 C 15.238375,7.3588193 23.75,2.7142857 26.25,16.107143"
+       id="path2157"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#3ab6e7;stroke-width:1.0499022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.0499022,1.0499022;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 15.722389,15.855391 C 16.050144,7.4642103 6.6678266,2.8196769 3.9120901,16.212534"
+       id="path3129"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#00ffff;fill-rule:evenodd;stroke:#3ab6e7;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1,1;stroke-dashoffset:0"
+       d="M 15.714286,15.392857 L 15.714286,26.464286"
+       id="path3131" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/tower.svg b/data/map-icons/svg/misc/landmark/tower.svg
new file mode 100644
index 0000000..f8b159c
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/tower.svg
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="303.59335"
+   id="svg1"
+   inkscape:export-filename="/home/corey/tower-wireless.png"
+   inkscape:export-xdpi="72.000000"
+   inkscape:export-ydpi="72.000000"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg"
+   sodipodi:docname="wlan.svg"
+   sodipodi:version="0.32"
+   width="177.85829"
+   version="1.0">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Radio/Wireless Tower</dc:title>
+        <dc:description />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>wireless</rdf:li>
+            <rdf:li>tower</rdf:li>
+            <rdf:li>radio</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Corey Burger</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Corey Burger</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     id="base"
+     inkscape:current-layer="layer1"
+     inkscape:cx="273.29793"
+     inkscape:cy="498.38753"
+     inkscape:grid-bbox="false"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="926"
+     inkscape:window-width="1149"
+     inkscape:window-x="1614"
+     inkscape:window-y="0"
+     inkscape:zoom="0.43415836"
+     pagecolor="#ffffff"
+     showgrid="false" />
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(-19.56857,-188.3279)">
+    <path
+       d="M 358.45099,388.88488 A 11.516535,11.516535 0 1 1 358.45208,388.75969"
+       id="path1061"
+       sodipodi:cx="346.93561"
+       sodipodi:cy="388.72183"
+       sodipodi:end="6.2864724"
+       sodipodi:open="true"
+       sodipodi:rx="11.516535"
+       sodipodi:ry="11.516535"
+       sodipodi:start="0.014158001"
+       sodipodi:type="arc"
+       style="fill:black;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.25;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       transform="matrix(1.18265,0,0,1.060409,-302.8232,-162.8958)" />
+    <path
+       d="M 67.300907,454.64112 C 142.98481,454.64112 142.98481,454.64112 142.98481,454.64112"
+       id="path2935"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:9.17551804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 80.696247,422.54226 C 156.38019,422.54226 121.88199,422.54226 132.93827,422.54226"
+       id="path3557"
+       sodipodi:nodetypes="cc"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:9.17551804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 107.15217,259.83437 C 107.15217,260.01884 107.15217,260.20332 107.15217,260.38779 C 107.15217,275.03108 109.21518,402.56676 51.226413,486.18652"
+       id="path1686"
+       sodipodi:nodetypes="ccc"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:11.4693985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 106.98927,259.55768 C 106.98927,259.74215 106.98927,259.92663 106.98927,260.1111 C 106.98927,274.75435 104.92626,402.29007 162.915,485.90988"
+       id="path2308"
+       sodipodi:nodetypes="ccc"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:11.4693985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 659.80826,385.01245 A 377.16653,377.16653 0 0 1 621.99133,977.71708"
+       id="path4190"
+       sodipodi:cx="408.83701"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.2533709"
+       sodipodi:open="true"
+       sodipodi:rx="377.16653"
+       sodipodi:ry="377.16653"
+       sodipodi:start="5.440435"
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       transform="matrix(0.23406,0,0,0.209868,12.08194,108.9113)" />
+    <path
+       d="M 559.42058,478.0061 A 240.40767,240.40767 0 0 1 534.50785,872.37959"
+       id="path4196"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="240.40767"
+       sodipodi:ry="240.40767"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(0.23406,0,0,0.209868,11.78843,109.1178)" />
+    <path
+       d="M 485.29511,571.71763 A 120.92362,120.92362 0 0 1 472.76415,770.08514"
+       id="path4198"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="120.92362"
+       sodipodi:ry="120.92362"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(0.23406,0,0,0.209868,11.78843,109.1178)" />
+    <path
+       d="M 659.80826,385.01245 A 377.16653,377.16653 0 0 1 621.99133,977.71708"
+       id="path4209"
+       sodipodi:cx="408.83701"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.2533709"
+       sodipodi:open="true"
+       sodipodi:rx="377.16653"
+       sodipodi:ry="377.16653"
+       sodipodi:start="5.440435"
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       transform="matrix(-0.23406,0,0,0.209868,204.9135,109.0317)" />
+    <path
+       d="M 559.42058,478.0061 A 240.40767,240.40767 0 0 1 534.50785,872.37959"
+       id="path4210"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="240.40767"
+       sodipodi:ry="240.40767"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(-0.23406,0,0,0.209868,205.2077,109.2382)" />
+    <path
+       d="M 485.29511,571.71763 A 120.92362,120.92362 0 0 1 472.76415,770.08514"
+       id="path4212"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="120.92362"
+       sodipodi:ry="120.92362"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(-0.23406,0,0,0.209868,205.2077,109.2382)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/water_tower.svg b/data/map-icons/svg/misc/landmark/water_tower.svg
new file mode 100644
index 0000000..43234b5
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/water_tower.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="water_tower.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="42.017637"
+     inkscape:cy="19.285517"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="953"
+     inkscape:window-height="761"
+     inkscape:window-x="439"
+     inkscape:window-y="21" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:#000303;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3151"
+       width="6.5294595"
+       height="18.392857"
+       x="12.512691"
+       y="9.1608047" />
+    <path
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.81130314px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.5949297,12.651626 L 23.207364,12.668107 L 23.919856,3.4082903 L 6.7727666,3.3918105 L 7.5949297,12.651626 z "
+       id="path3155"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/windmill.svg b/data/map-icons/svg/misc/landmark/windmill.svg
new file mode 100644
index 0000000..131c8be
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/windmill.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="windmill.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="18.519178"
+     inkscape:cy="21.935487"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#7c6f49;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.86544949px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.7032947,30.378335 L 12.263972,9.3395748 L 15.616604,7.3228706 L 18.896136,9.3933618 C 18.896136,9.3933618 21.898744,30.720429 21.549658,30.549381 C 21.200572,30.378335 8.773112,30.634906 8.7032947,30.378335 z "
+       id="path3457"
+       sodipodi:nodetypes="ccccsc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.13726127px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.7477044,1.7109877 L 23.591582,17.003923"
+       id="path3459"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.13726127px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.815125,17.003924 L 23.321899,1.8639171"
+       id="path3461"
+       sodipodi:nodetypes="cc" />
+    <rect
+       style="opacity:1;fill:#fcf8eb;fill-opacity:1;stroke:#000000;stroke-width:0.46843246;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3463"
+       width="3.0242128"
+       height="2.4987874"
+       x="14.199539"
+       y="12.272707" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/misc/landmark/works.svg b/data/map-icons/svg/misc/landmark/works.svg
new file mode 100644
index 0000000..84793c7
--- /dev/null
+++ b/data/map-icons/svg/misc/landmark/works.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/misc/landmark"
+   sodipodi:docname="works.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.2627332"
+     inkscape:cy="12.927264"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="897"
+     inkscape:window-x="486"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#87743d;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.27901745px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 3.8926478,2.4966516 L 9.183524,2.4966516 L 9.266183,22.44438 L 15.770437,16.747518 L 15.86635,22.601836 L 22.493024,16.632298 L 22.493024,22.958979 L 28.967634,16.632298 L 28.967634,30.253349 L 3.8895087,30.253349 L 3.8926478,2.4966516 z "
+       id="path3453"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/boy.svg b/data/map-icons/svg/people/boy.svg
new file mode 100644
index 0000000..0f6ad47
--- /dev/null
+++ b/data/map-icons/svg/people/boy.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="boy.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="21.189992"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="420" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="fill:#00ffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2167"
+       sodipodi:cx="12.678572"
+       sodipodi:cy="24.142857"
+       sodipodi:rx="7.1428571"
+       sodipodi:ry="6.4285712"
+       d="M 19.821429 24.142857 A 7.1428571 6.4285712 0 1 1  5.5357146,24.142857 A 7.1428571 6.4285712 0 1 1  19.821429 24.142857 z"
+       transform="matrix(1.3011389,0,0,1.3484877,-4.4430116,-11.270632)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 18.214286,14.678571 L 26.964286,3.7857143 L 16.785714,3.7857143"
+       id="path3139" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 27.5,3.25 L 27.5,12.535715"
+       id="path3141" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/girl.svg b/data/map-icons/svg/people/girl.svg
new file mode 100644
index 0000000..aa134cc
--- /dev/null
+++ b/data/map-icons/svg/people/girl.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="girl.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="9.6926975"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="980"
+     inkscape:window-height="729"
+     inkscape:window-x="328"
+     inkscape:window-y="203" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.714286,16.464286 L 15.535714,30.571428"
+       id="path2159" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff00ff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2157"
+       sodipodi:cx="14.107142"
+       sodipodi:cy="11.375"
+       sodipodi:rx="6.4285712"
+       sodipodi:ry="6.5178571"
+       d="M 20.535714 11.375 A 6.4285712 6.5178571 0 1 1  7.6785712,11.375 A 6.4285712 6.5178571 0 1 1  20.535714 11.375 z"
+       transform="matrix(1.2674483,0,0,1.2637846,-2.1657885,-3.8934073)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 8.7499996,22 L 21.785714,22"
+       id="path2161" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_a.svg b/data/map-icons/svg/people/people_a.svg
new file mode 100644
index 0000000..d7ea812
--- /dev/null
+++ b/data/map-icons/svg/people/people_a.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_a.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">A</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_b.svg b/data/map-icons/svg/people/people_b.svg
new file mode 100644
index 0000000..2640bd4
--- /dev/null
+++ b/data/map-icons/svg/people/people_b.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_b.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">B</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_c.svg b/data/map-icons/svg/people/people_c.svg
new file mode 100644
index 0000000..2ed544a
--- /dev/null
+++ b/data/map-icons/svg/people/people_c.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_c.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">C</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_d.svg b/data/map-icons/svg/people/people_d.svg
new file mode 100644
index 0000000..6ad8249
--- /dev/null
+++ b/data/map-icons/svg/people/people_d.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_d.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">D</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_e.svg b/data/map-icons/svg/people/people_e.svg
new file mode 100644
index 0000000..e560bb7
--- /dev/null
+++ b/data/map-icons/svg/people/people_e.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_e.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">E</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_f.svg b/data/map-icons/svg/people/people_f.svg
new file mode 100644
index 0000000..65eafc6
--- /dev/null
+++ b/data/map-icons/svg/people/people_f.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_f.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">F</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_g.svg b/data/map-icons/svg/people/people_g.svg
new file mode 100644
index 0000000..6ec8a02
--- /dev/null
+++ b/data/map-icons/svg/people/people_g.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_g.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">G</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_h.svg b/data/map-icons/svg/people/people_h.svg
new file mode 100644
index 0000000..1e0e580
--- /dev/null
+++ b/data/map-icons/svg/people/people_h.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_h.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">H</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_i.svg b/data/map-icons/svg/people/people_i.svg
new file mode 100644
index 0000000..319c7c7
--- /dev/null
+++ b/data/map-icons/svg/people/people_i.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_i.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="312.04916"
+       y="348.99335"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="312.04916"
+         y="348.99335">I</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_j.svg b/data/map-icons/svg/people/people_j.svg
new file mode 100644
index 0000000..5d6883c
--- /dev/null
+++ b/data/map-icons/svg/people/people_j.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_j.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="317.47183"
+       y="335.48663"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="317.47183"
+         y="335.48663">J</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_k.svg b/data/map-icons/svg/people/people_k.svg
new file mode 100644
index 0000000..fed5873
--- /dev/null
+++ b/data/map-icons/svg/people/people_k.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_k.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">K</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_l.svg b/data/map-icons/svg/people/people_l.svg
new file mode 100644
index 0000000..db21e9a
--- /dev/null
+++ b/data/map-icons/svg/people/people_l.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_l.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">L</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_m.svg b/data/map-icons/svg/people/people_m.svg
new file mode 100644
index 0000000..18f83f3
--- /dev/null
+++ b/data/map-icons/svg/people/people_m.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_m.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">M</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_n.svg b/data/map-icons/svg/people/people_n.svg
new file mode 100644
index 0000000..b6dfa5d
--- /dev/null
+++ b/data/map-icons/svg/people/people_n.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_n.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">N</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_o.svg b/data/map-icons/svg/people/people_o.svg
new file mode 100644
index 0000000..3002c81
--- /dev/null
+++ b/data/map-icons/svg/people/people_o.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_o.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">O</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_p.svg b/data/map-icons/svg/people/people_p.svg
new file mode 100644
index 0000000..ec5be2a
--- /dev/null
+++ b/data/map-icons/svg/people/people_p.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_p.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">P</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_q.svg b/data/map-icons/svg/people/people_q.svg
new file mode 100644
index 0000000..065a6a9
--- /dev/null
+++ b/data/map-icons/svg/people/people_q.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_q.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">Q</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_r.svg b/data/map-icons/svg/people/people_r.svg
new file mode 100644
index 0000000..cbe6917
--- /dev/null
+++ b/data/map-icons/svg/people/people_r.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_r.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">R</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_s.svg b/data/map-icons/svg/people/people_s.svg
new file mode 100644
index 0000000..bb6d987
--- /dev/null
+++ b/data/map-icons/svg/people/people_s.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_s.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">S</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_t.svg b/data/map-icons/svg/people/people_t.svg
new file mode 100644
index 0000000..0b0c1e6
--- /dev/null
+++ b/data/map-icons/svg/people/people_t.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_t.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">T</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_u.svg b/data/map-icons/svg/people/people_u.svg
new file mode 100644
index 0000000..d0830fa
--- /dev/null
+++ b/data/map-icons/svg/people/people_u.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_u.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">U</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_v.svg b/data/map-icons/svg/people/people_v.svg
new file mode 100644
index 0000000..0a794f4
--- /dev/null
+++ b/data/map-icons/svg/people/people_v.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_v.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="284.93588"
+       y="347.64267"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="284.93588"
+         y="347.64267">V</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_w.svg b/data/map-icons/svg/people/people_w.svg
new file mode 100644
index 0000000..16671a5
--- /dev/null
+++ b/data/map-icons/svg/people/people_w.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_w.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="257.8226"
+       y="353.04535"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="257.8226"
+         y="353.04535">W</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_x.svg b/data/map-icons/svg/people/people_x.svg
new file mode 100644
index 0000000..4df9229
--- /dev/null
+++ b/data/map-icons/svg/people/people_x.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_x.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="283.12833"
+       y="350.34399"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="283.12833"
+         y="350.34399">X</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_y.svg b/data/map-icons/svg/people/people_y.svg
new file mode 100644
index 0000000..31a2fa4
--- /dev/null
+++ b/data/map-icons/svg/people/people_y.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_y.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="283.12833"
+       y="350.34399"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="283.12833"
+         y="350.34399">Y</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/people_z.svg b/data/map-icons/svg/people/people_z.svg
new file mode 100644
index 0000000..45565f8
--- /dev/null
+++ b/data/map-icons/svg/people/people_z.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="230.18546"
+   height="249.68225"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="people_z.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="211.80361"
+     inkscape:cy="93.310367"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="997"
+     inkscape:window-height="937"
+     inkscape:window-x="394"
+     inkscape:window-y="79" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-170.6215,-255.6071)">
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1872"
+       sodipodi:cx="285.71429"
+       sodipodi:cy="438.07648"
+       sodipodi:rx="134.28572"
+       sodipodi:ry="94.285713"
+       d="M 420.00002,438.07648 A 134.28572,94.285713 0 1 1 151.44372,436.66047"
+       sodipodi:start="0"
+       sodipodi:end="3.1566115"
+       transform="matrix(0.848885,0,0,-1.424343,43.17569,1126.144)"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1878"
+       sodipodi:cx="266.42856"
+       sodipodi:cy="148.07646"
+       sodipodi:rx="52.938351"
+       sodipodi:ry="48.57143"
+       d="M 266.37358,99.505058 A 52.938351,48.57143 0 1 1 264.55047,99.535607"
+       sodipodi:start="4.7113504"
+       sodipodi:end="10.96009"
+       transform="matrix(-1.636275,-0.102448,9.280258e-2,-1.80634,710.0656,640.0071)"
+       sodipodi:open="true" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.23655021px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-171.30945"
+       y="-1289.7626"
+       id="text2766"
+       transform="scale(-2.510507,-0.398326)"><tspan
+         sodipodi:role="line"
+         id="tspan2768"
+         x="-171.30945"
+         y="-1289.7626">A</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2788"
+       sodipodi:cx="541.42859"
+       sodipodi:cy="538.07648"
+       sodipodi:rx="2.8571429"
+       sodipodi:ry="0"
+       d="M 541.3987,538.07648 A 2.8571429,0 0 0 0 541.10202,538.07648 L 541.42859,538.07648 z"
+       sodipodi:start="4.7019287"
+       sodipodi:end="4.5978397" />
+    <text
+       xml:space="preserve"
+       style="font-size:143.77206421px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="283.12833"
+       y="350.34399"
+       id="text2790"
+       transform="scale(0.864429,1.156833)"><tspan
+         sodipodi:role="line"
+         id="tspan2792"
+         x="283.12833"
+         y="350.34399">Z</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/people/work.svg b/data/map-icons/svg/people/work.svg
new file mode 100644
index 0000000..3fc3ca5
--- /dev/null
+++ b/data/map-icons/svg/people/work.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/people"
+   sodipodi:docname="work.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="42.017637"
+     inkscape:cy="9.1839918"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="420" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.9520275px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2159"
+       width="11.297972"
+       height="8.0836868"
+       x="10.154585"
+       y="9.6545858"
+       ry="2.425106" />
+    <rect
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2157"
+       width="25.892857"
+       height="15.535714"
+       x="3.0357144"
+       y="13.964286"
+       ry="2.6785717" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/public/firebrigade.svg b/data/map-icons/svg/public/firebrigade.svg
new file mode 100644
index 0000000..7c9fa68
--- /dev/null
+++ b/data/map-icons/svg/public/firebrigade.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2167"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/public"
+   sodipodi:docname="firebrigade.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs2169" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="38.001264"
+     inkscape:cy="13.605357"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="974"
+     inkscape:window-height="835"
+     inkscape:window-x="418"
+     inkscape:window-y="136"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata2172">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-54.457718,-496.22758)">
+    <path
+       d="M 62.547077,497.22945 C 62.572429,497.25572 62.707651,497.22945 62.741455,497.22945 C 62.918931,498.27352 62.859772,499.70498 63.130212,500.63083 C 63.159786,500.73588 63.480932,501.82589 63.616151,502.21989 C 63.658408,502.34466 63.818982,502.5482 63.861237,502.67298 C 63.890824,502.76491 64.131677,503.42154 64.152812,503.50689 C 64.186617,503.65135 64.448605,504.08475 64.49508,504.26204 C 64.511983,504.34083 64.693692,504.62316 64.735947,504.71511 C 64.795106,504.83987 64.828911,505.16818 64.883838,505.31922 L 65.02751,505.24698 C 64.981034,504.68228 64.985252,504.22264 64.883838,503.73014 C 64.82046,503.4281 64.731716,503.11948 64.689458,502.67298 C 64.740166,502.7058 64.828911,502.64013 64.883838,502.67298 C 64.913423,502.69266 65.112021,502.91592 65.175413,502.97502 C 65.204985,503.0013 65.373968,503.15232 65.420486,503.20483 C 65.526092,503.32304 65.796534,503.82865 65.809241,503.88118 C 65.826145,503.95999 65.906464,504.111 65.906464,504.111 C 65.906464,504.111 66.240324,504.85301 66.244514,504.86614 C 66.396635,505.33891 66.624754,506.62592 66.637461,506.68501 C 66.709265,507.17093 66.831908,508.12306 66.831908,508.12306 C 66.94171,509.33126 66.831908,510.25712 66.831908,511.52443 C 66.874098,511.4719 66.924803,511.56383 66.975512,511.52443 C 67.005125,511.49815 67.191053,511.2158 67.220666,511.14358 C 67.250146,511.06479 67.317756,510.84152 67.317756,510.84152 C 67.503681,510.09295 67.461494,508.98981 67.461494,507.96546 C 67.533294,508.05738 67.748838,508.17559 67.803734,508.27406 C 67.824829,508.31348 67.964379,508.66149 67.99818,508.72716 C 68.061463,508.83879 68.365709,509.60047 68.38694,509.70553 C 68.42074,509.87627 68.484024,510.46723 68.484024,510.46723 C 68.657378,511.78708 68.416414,513.50747 68.243201,514.55151 C 68.285523,514.53181 68.33623,514.65657 68.437644,514.62374 C 68.458738,514.61718 68.847497,514.17066 68.923491,514.09845 C 68.961623,514.49242 68.932009,514.90609 68.9742,515.37886 C 69.046134,516.31129 69.265868,517.4342 69.168646,518.63567 C 69.058711,519.92268 68.67428,521.78753 68.243201,522.56899 C 68.179781,522.68056 68.01508,522.96296 67.99818,523.02201 C 67.99818,523.02201 67.807927,523.32417 67.75722,523.40296 C 67.584002,523.62611 67.005125,524.23695 66.928997,524.309 C 66.823391,524.40756 66.413541,524.77529 66.341736,524.83433 C 66.2149,524.94611 65.813435,525.23502 65.758537,525.29406 C 66.054395,525.32685 66.928997,525.24154 67.123444,525.51722 C 67.123444,525.51722 67.102348,526.00977 67.123444,526.42348 C 64.296483,526.42348 61.47377,526.42348 58.651054,526.42348 C 58.651054,525.76685 58.613017,525.15623 58.896141,524.9854 C 58.929946,524.96566 59.014458,525.02491 59.039811,524.9854 C 59.082067,524.92635 59.052481,524.67022 59.090518,524.61118 C 58.980653,524.35503 58.879238,524.08587 58.701762,523.92828 L 58.313005,523.32417 C 58.2792,523.25189 58.215808,523.02201 58.215808,523.02201 C 58.186236,522.93669 58.084822,522.68728 58.06792,522.64126 C 57.958052,522.3721 57.666478,521.48559 57.628455,521.20318 C 57.620003,521.12439 57.484784,515.88449 57.484784,514.85356 C 57.484784,514.85356 57.493235,514.69597 57.484784,514.62374 L 57.290404,513.86861 C 57.252367,513.81607 57.172087,513.64535 57.142501,513.56656 C 57.142501,513.56656 57.06644,513.4221 57.045319,513.33675 C 57.045319,513.33017 56.78333,512.79172 56.753745,512.73264 C 56.656561,512.54221 56.369219,512.3518 56.31428,512.12853 C 56.293159,512.04316 56.348085,511.97749 56.31428,511.90528 C 56.973476,511.60322 57.497453,511.92497 57.970723,512.35835 C 58.012979,512.39774 58.346811,512.68666 58.507384,512.81144 C 58.617249,512.03002 58.735568,510.82182 58.604567,509.85657 C 58.549639,509.48228 58.410187,509.00951 58.313005,508.57613 C 58.249613,508.30692 57.674929,507.32852 57.628455,507.13811 C 57.598869,507.00676 57.658027,506.88858 57.628455,506.75724 C 57.704515,506.7244 57.717185,506.82947 57.725637,506.68501 C 58.000309,506.7638 58.232711,506.70473 58.507384,506.83604 C 58.579212,506.86887 58.959517,507.17093 59.039811,507.21032 C 59.039811,507.21032 59.737032,508.03768 59.965216,508.34631 C 59.999021,508.39227 60.218753,508.66149 60.307498,508.72716 C 60.501876,507.68968 60.430034,505.06968 60.210302,504.26204 C 60.197632,504.2292 60.130021,504.0125 60.113119,503.95999 C 60.100435,503.95999 59.965216,503.6251 59.918741,503.57912 C 59.918741,503.57912 59.817326,503.20483 59.770837,502.97502 C 59.715912,502.69924 59.534202,502.17393 59.432788,501.91783 C 59.593362,501.85875 59.732813,501.77996 59.868033,501.83904 C 60.011704,501.89814 60.522997,502.30525 60.649766,502.44971 C 60.670901,502.46941 60.8864,502.87652 60.890634,502.90279 C 60.890634,502.90279 61.051206,503.1129 61.135718,503.20483 C 61.317415,503.40183 61.376573,503.76954 61.524475,504.03221 C 61.583635,504.14384 61.697719,504.17011 61.769562,504.26204 C 62.149868,503.42154 61.938588,503.03411 61.816038,502.06886 C 61.651246,500.77529 61.545598,498.73972 62.061123,497.75475 C 62.175222,497.53151 62.394954,497.39362 62.547077,497.22945 z M 64.055615,514.62374 C 63.759823,515.89763 63.497835,517.15178 63.180921,518.33373 C 63.138663,518.48482 63.155565,518.58316 63.130212,518.78676 C 62.982307,518.81302 62.965406,518.78025 62.889344,518.70797 C 62.842869,518.66867 62.56398,518.2417 62.547077,518.18266 C 62.525941,518.09735 62.420308,517.93323 62.399173,517.88071 C 62.3696,517.79518 62.306209,517.57854 62.301991,517.57854 C 62.175222,517.26988 62.065355,516.75128 61.96816,516.42294 C 61.925903,516.46237 61.84139,516.81685 61.816038,516.81685 C 61.663915,518.9246 62.061123,520.04099 62.352699,521.58413 C 61.993513,521.55114 61.507574,521.20969 61.207547,520.88801 C 61.186427,520.86824 60.700474,519.8899 60.552583,519.01013 C 60.471831,518.52978 60.472291,518.11709 60.358205,517.65084 L 60.25679,517.57854 C 60.079315,518.5241 59.91029,519.84389 60.062412,521.1309 C 60.075082,521.21641 60.239888,521.95186 60.307498,522.18823 C 60.349754,522.3391 60.958243,523.65909 60.987816,523.70491 C 61.14417,523.90201 61.47377,524.309 61.47377,524.309 C 61.744209,524.50611 62.690748,524.5849 63.083723,524.4601 C 63.083723,524.4601 63.692212,524.15815 63.907726,523.92828 C 63.920397,523.91503 64.376763,523.53429 64.49508,523.40296 C 64.575374,523.30442 65.166958,522.39163 65.272595,522.11595 C 65.319085,521.98463 65.686732,521.28197 65.758537,521.1309 C 65.800856,521.03907 65.906464,520.75015 65.906464,520.75015 C 66.058585,520.38244 66.109294,519.92942 66.197999,519.46966 C 65.783954,519.7258 65.682542,519.97521 65.124703,520.07377 C 65.314851,519.50916 65.923365,517.88071 65.855759,517.10576 L 65.758537,516.81685 C 65.521899,517.41443 65.268376,517.89375 64.930326,518.33373 C 64.837362,518.45183 64.69791,518.7212 64.592277,518.78676 C 64.533118,518.81953 64.380995,518.99037 64.347191,519.01013 C 64.292251,519.0429 64.254227,518.97061 64.203519,519.01013 C 64.292251,518.06456 64.520434,517.09275 64.397898,515.91076 C 64.397898,515.91076 64.304935,515.14249 64.249994,514.9258 C 64.220422,514.80761 64.207738,514.84701 64.152812,514.62374 L 64.055615,514.62374 z "
+       id="path11"
+       style="fill:#ff9900;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#05163e;stroke-width:2.53206968;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 79.75932,511.6353 L 78.764489,509.1589"
+       id="path2421"
+       inkscape:transform-center-y="-1.525048"
+       inkscape:transform-center-x="-0.15333103"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#05163e;stroke-width:1.40203679;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 79.485097,510.93534 C 84.296665,519.93209 70.736788,525.45285 86.04633,525.45285"
+       id="path3428"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#007bb8;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:3;stroke-dasharray:4,1;stroke-dashoffset:0"
+       d="M 11.517857,21.732143 C 11.517857,21.732143 19.642858,3.1607143 24.464286,12.892857"
+       id="path2165"
+       transform="translate(54.457718,496.22758)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#007bb8;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 58.118432,521.51414 C 58.118432,521.51414 66.689861,501.69271 72.225575,515.17485"
+       id="path4107"
+       sodipodi:nodetypes="cc"
+       transform="translate(54.457718,496.22758)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#007bb8;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 64.011289,513.92486 C 64.011289,513.92486 73.118434,497.04986 78.832719,509.01414"
+       id="path4109"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#007bb8;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
+       d="M 63.475575,509.99629 C 63.475575,509.99629 74.904147,494.63914 78.832718,509.01414"
+       id="path4111"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/public/police.svg b/data/map-icons/svg/public/police.svg
new file mode 100644
index 0000000..eaa53f6
--- /dev/null
+++ b/data/map-icons/svg/public/police.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2226"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/public"
+   sodipodi:docname="police.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2228">
+    <radialGradient
+       cx="-41.2598"
+       cy="-47.871601"
+       fx="-41.2598"
+       fy="-47.871601"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_15_"
+       r="599.07233">
+      <stop
+         offset="0"
+         style="stop-color:#E8D776"
+         id="stop2960" />
+      <stop
+         offset="0.4141"
+         style="stop-color:#B39949"
+         id="stop2962" />
+      <stop
+         offset="0.8085"
+         style="stop-color:#856422"
+         id="stop2964" />
+      <stop
+         offset="1"
+         style="stop-color:#734F13"
+         id="stop2966" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="0.4551"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#734F13" />
+    </radialGradient>
+    <radialGradient
+       cx="-41.2598"
+       cy="-47.871601"
+       fx="-41.2598"
+       fy="-47.871601"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2241"
+       r="599.07233">
+      <stop
+         offset="0"
+         style="stop-color:#E8D776"
+         id="stop2243" />
+      <stop
+         offset="0.4141"
+         style="stop-color:#B39949"
+         id="stop2245" />
+      <stop
+         offset="0.8085"
+         style="stop-color:#856422"
+         id="stop2247" />
+      <stop
+         offset="1"
+         style="stop-color:#734F13"
+         id="stop2249" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="0.4551"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#734F13" />
+    </radialGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="31.275442"
+     inkscape:cy="13.752989"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="820"
+     inkscape:window-x="486"
+     inkscape:window-y="151" />
+  <metadata
+     id="metadata2231">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-250.37109,-512.48852)">
+    <path
+       style="fill:#f2d31d;fill-opacity:1;stroke:#000000;stroke-width:0.44368026"
+       d="M 263.17507,543.69503 C 263.77153,541.23975 275.58725,542.8766 273.76122,538.78448 C 268.17262,526.26047 273.76122,524.05284 273.76122,524.05284 C 271.99409,523.43902 271.64868,521.59756 271.64067,521.59756 C 266.34859,524.05284 263.17507,519.14229 263.17507,519.14229 L 263.17507,519.14229 C 263.17507,519.14229 260.04578,524.05284 254.69285,521.59756 C 254.6892,521.59756 254.33943,523.43902 252.5723,524.05284 C 252.5723,524.05284 258.1609,526.26047 252.5723,538.78448 C 250.74627,542.8766 262.57866,541.23975 263.17507,543.69503 z "
+       id="path2968" />
+    <path
+       id="path3435"
+       d="M 263.7698,525.4633 L 267.55654,536.86883 L 257.64271,529.81983 L 269.89689,529.81983 L 259.98304,536.86883 L 263.7698,525.4633 z "
+       style="fill:#0000ff;stroke:#000000;stroke-width:0.0159331" />
+    <g
+       id="g2258"
+       transform="matrix(0.4603125,0,0,0.4583512,242.49948,509.18919)">
+      <path
+         sodipodi:nodetypes="cssscc"
+         id="path3515"
+         d="M 67.642811,27.822227 C 67.642811,27.822227 67.495397,21.453519 67.524881,20.381564 C 67.556758,19.222502 70.369263,18.163669 72.271615,18.216622 C 74.548148,18.280985 76.778209,19.41091 76.69403,20.381564 C 76.61026,21.347498 76.69403,27.843246 76.69403,27.843246 L 67.642811,27.822227 z "
+         style="fill:#0000ff;fill-rule:evenodd;stroke:#000af5;stroke-width:0.27880892px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3517"
+         d="M 68.849935,18.029894 L 65.370737,13.083363"
+         style="fill:none;fill-rule:evenodd;stroke:#000af5;stroke-width:0.45554224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3519"
+         d="M 72.194018,17.295256 C 72.295352,17.001408 72.194018,11.320243 72.194018,11.320243"
+         style="fill:none;fill-rule:evenodd;stroke:#000af5;stroke-width:0.45554224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3521"
+         d="M 75.673217,18.127843 L 78.578181,13.083363"
+         style="fill:none;fill-rule:evenodd;stroke:#000af5;stroke-width:0.45554224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3523"
+         d="M 66.958326,21.898964 L 61.486193,20.135841"
+         style="fill:none;fill-rule:evenodd;stroke:#000af5;stroke-width:0.45554224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3525"
+         d="M 77.280234,21.996913 L 83.118867,20.23379"
+         style="fill:none;fill-rule:evenodd;stroke:#000af5;stroke-width:0.47055009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/public/post_box.svg b/data/map-icons/svg/public/post_box.svg
new file mode 100644
index 0000000..b5cd46b
--- /dev/null
+++ b/data/map-icons/svg/public/post_box.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-post_box" viewBox="7 4 16 14">
+            <path
+                fill="none"
+                stroke="red"
+                stroke-width="1.5"
+                d="M 0,0 L 14,0 L 14,8 L 0,8 L 0,0 z M 0,0 L 7,4 L 14,0" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/public/post_office.svg b/data/map-icons/svg/public/post_office.svg
new file mode 100644
index 0000000..a13e470
--- /dev/null
+++ b/data/map-icons/svg/public/post_office.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-post_office" viewBox="18 18 36 36">
+            <ellipse style="fill:#ff0000" cx="18" cy="18" rx="18" ry="18"/>
+            <path style="fill:#ffffff" d="M26 25.44 L26 35.44 L2 35.44 L2 25.44 L14 31.44 L26 25.44 Z M2 23.44 L26 23.44 L14 29.44 L2 23.44 Z M0 37.44 L28 37.44 L28 21.44 L0 21.44 L0 37.44 Z" transform="translate(4,-11.44)"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/public/recycling.svg b/data/map-icons/svg/public/recycling.svg
new file mode 100644
index 0000000..f195cd5
--- /dev/null
+++ b/data/map-icons/svg/public/recycling.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-recycling" viewBox="40 40 80 80">
+            <g stroke='none' fill='#00ba00'>
+                <path d="M 55.0,37.3 L 72.1,27.0 L 79.8,41.9 C 81.6,50.0 71.5,52.9 63.3,52.4 L 55.0,37.3 z" />
+                <path d="M 51.1,47.9 L 42.1,63.8 L 51.1,80.0 L 51.3,73.5 L 59.5,73.5 C 62.5,73.8 66.4,71.8 67.9,69.0 L 78.4,49.5 C 75.0,53.0 70.5,53.9 65.3,53.9 L 51.4,53.9 L 51.1,47.9 z " />
+                <path d="M 31.0,28.2 L 13.7,18.2 L 22.9,4.2 C 29.0,-1.3 36.6,6.1 40.1,13.5 L 30.9,28.2 z " />
+                <path d="M 42.1,26.5 L 60.4,26.6 L 70.1,10.9 L 64.3,13.8 L 60.3,6.6 C 59.1,3.9 55.5,1.4 52.3,1.5 L 30.2,1.7 C 34.9,3.1 37.9,6.6 40.4,11.1 L 47.2,23.3 L 42.1,26.5 z " />
+                <path d="M 0.4,27.4 L 5.8,31.5 L 0.8,40.5 C -1.8,45.3 2.6,49.6 5.3,51.0 C 8.0,52.5 12.2,52.7 16.2,52.7 L 23.3,41.3 L 28.6,44.1 L 19.3,27.2 L 0.4,27.4 z " />
+                <path d="M 1.2,49.3 L 12.7,70.1 C 15.0,73.0 19.4,73.7 23.9,73.6 L 36.0,73.6 L 36.0,53.9 L 13.0,53.7 C 9.5,53.9 4.8,53.2 1.2,49.3 z " />
+            </g>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/public/recycling/trash-bin.svg b/data/map-icons/svg/public/recycling/trash-bin.svg
new file mode 100644
index 0000000..69619e3
--- /dev/null
+++ b/data/map-icons/svg/public/recycling/trash-bin.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Created with Inkscape (http://www.inkscape.org/) --><svg height="60.0000000" id="svg1" inkscape:version="0.38.1" sodipodi:docbase="/home/danny/flat/scalable/filesystems" sodipodi:docname="trashcan_full.svg" sodipodi:version="0.32" version="1.0" width="60.0000000" x="0" xmlns="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" y="0">
+  <metadata>
+    <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <cc:Work rdf:about="">
+        <dc:title>Part of the Flat Icon Collection (Wed Aug 25 23:31:12 2004)</dc:title>
+        <dc:description></dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>hash</rdf:li>
+            <rdf:li></rdf:li>
+            <rdf:li>filesystem</rdf:li>
+            <rdf:li>computer</rdf:li>
+            <rdf:li>icons</rdf:li>
+            <rdf:li>theme</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://www.openclipart.org">
+            <dc:title>Danny Allen</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Danny Allen</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Danny Allen</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date></dc:date>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview bordercolor="#666666" borderopacity="1.0" id="base" inkscape:cx="33.307957" inkscape:cy="23.184732" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-height="685" inkscape:window-width="1016" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="6.9465338" pagecolor="#ffffff"/>
+  <defs id="defs3">
+    <linearGradient id="linearGradient772">
+      <stop id="stop773" offset="0" style="stop-color:#000;stop-opacity:1;"/>
+      <stop id="stop774" offset="1" style="stop-color:#fff;stop-opacity:1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient775" xlink:href="#linearGradient772"/>
+  </defs>
+  <rect height="19.899481" id="rect646" sodipodi:stroke-cmyk="(0 0 0 0.8)" style="font-size:12.000000;fill:#b3b3b3;fill-rule:evenodd;stroke:#333333;stroke-width:1.8750001;stroke-linecap:round;stroke-linejoin:round;" transform="matrix(0.917519,0.397693,-0.397693,0.917519,0.000000,0.000000)" width="14.701855" x="35.971217" y="10.998206"/>
+  <rect height="19.899466" id="rect647" sodipodi:stroke-cmyk="(0 0 0 0.8)" style="font-size:12.000000;fill:#b3b3b3;fill-rule:evenodd;stroke:#333333;stroke-width:1.8750000;stroke-linecap:round;stroke-linejoin:round;" transform="matrix(0.977946,0.208858,-0.208858,0.977946,0.000000,0.000000)" width="14.701844" x="32.782162" y="2.6537308"/>
+  <rect height="19.899476" id="rect645" sodipodi:stroke-cmyk="(0 0 0 0.8)" style="font-size:12.000000;fill:#b3b3b3;fill-rule:evenodd;stroke:#333333;stroke-width:1.8750000;stroke-linecap:round;stroke-linejoin:round;" transform="matrix(0.999471,3.253735e-2,-3.253735e-2,0.999471,0.000000,0.000000)" width="14.701852" x="21.810237" y="16.060027"/>
+  <rect height="19.899477" id="rect644" sodipodi:stroke-cmyk="(0 0 0 0.8)" style="font-size:12.000000;fill:#b3b3b3;fill-rule:evenodd;stroke:#333333;stroke-width:1.8750001;stroke-linecap:round;stroke-linejoin:round;" transform="matrix(0.990297,-0.138971,0.138971,0.990297,0.000000,0.000000)" width="14.701852" x="13.637112" y="14.206057"/>
+  <path d="M 6.6531580,6.6471645 L 18.819797,55.151105 L 41.439900,55.151105 L 53.628710,6.1865441" id="path842" sodipodi:nodetypes="cccc" sodipodi:stroke-cmyk="(0 0 0 0.8)" style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#333333;stroke-width:3.1250000;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-dashoffset:0.0000000;"/>
+</svg>
diff --git a/data/map-icons/svg/public/telephone.svg b/data/map-icons/svg/public/telephone.svg
new file mode 100644
index 0000000..4bc9f0c
--- /dev/null
+++ b/data/map-icons/svg/public/telephone.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <!-- This image is in the public domain. Slightly changed from http://commons.wikimedia.org/wiki/Image:RWBA_Fernsprecher.svg -->
+        <symbol id="symbol-telephone" viewBox="75 75 150 150">
+            <path fill="black" fill-rule="evenodd" stroke="none" d="M55 44.7375L54.9999307530208 12.2539679065969A35 35 0 0 0 29.0045287463415 43.0858554215078L29.0045821324043 43.0858440614508A100 100 0 0 0 71.3337340951943 133.685197779405L71.333831933318 133.685229222792A35 35 0 0 0 111.661764248632 133.530024865785L86.7468 112.687L83.349415196279 114.274335371795A10 10 0 0 1 70.0565646282046 109.447315196279L46.7754646282046 59.617715196279A10 10 0 0 1 51.602484803721 46.3248646282046L55 44.7375Z M60 46.5801L60 10.1567L70 14.8288L70 41.908L60 46.5801Z M88.5418 107.6697L116.4786 131.0408L119.3115 120.3729L98.5418 102.9976L88.5418 107.6697Z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/public/toilets.svg b/data/map-icons/svg/public/toilets.svg
new file mode 100644
index 0000000..55d7b2e
--- /dev/null
+++ b/data/map-icons/svg/public/toilets.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="200"
+   height="200"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="toilets.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/public">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Bone Killian &lt;vitki@bonius.com&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="780"
+     inkscape:window-width="906"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="1.89"
+     inkscape:cx="100"
+     inkscape:cy="100"
+     inkscape:window-x="373"
+     inkscape:window-y="88"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4" />
+  <g
+     style="display:inline"
+     id="layer2"
+     transform="translate(2.6455026,3.7037037)">
+    <rect
+       width="11.428572"
+       height="141.07143"
+       x="97.5"
+       y="26.785713"
+       style="fill:#0000ff;stroke:#0000ff;stroke-width:5px;stroke-linejoin:round"
+       id="divider" />
+    <path
+       d="M 160.21428,38.035713 C 160.21428,44.66313 154.8417,50.035713 148.21428,50.035713 C 141.58686,50.035713 136.21428,44.66313 136.21428,38.035713 C 136.21428,31.408296 141.58686,26.035713 148.21428,26.035713 C 154.8417,26.035713 160.21428,31.408296 160.21428,38.035713 L 160.21428,38.035713 z "
+       style="fill:#0000ff;stroke:#0000ff"
+       id="manhead" />
+    <path
+       d="M 67,39.285713 C 67,45.91313 61.627417,51.285713 55,51.285713 C 48.372583,51.285713 43,45.91313 43,39.285713 C 43,32.658296 48.372583,27.285713 55,27.285713 C 61.627417,27.285713 67,32.658296 67,39.285713 z "
+       style="fill:#0000ff;stroke:#0000ff;stroke-linejoin:round"
+       id="womanhead" />
+    <path
+       d="M 52.275394,124.74364 L 56.821081,124.74364 L 57.578695,164.8972 L 64.902301,164.8972 L 65.659916,124.4911 L 77.781746,124.23856 L 64.649763,76.003775 L 68.185297,73.98347 L 78.791899,108.83373 L 86.620581,104.54058 L 70.710678,58.073567 L 38.638335,57.063415 L 22.223356,105.55074 L 29.294424,108.32866 L 40.911178,73.98347 L 44.194174,74.488546 L 31.062191,123.73348 L 42.173869,123.98602 L 43.689098,165.14974 L 51.012704,165.14974 L 52.275394,124.74364 z "
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#0000ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       id="womanbody" />
+    <path
+       d="M 131.31983,56.810877 L 162.12948,56.558338 L 172.23101,64.387021 L 173.99878,109.59135 L 165.15994,109.33881 L 164.14979,73.478394 L 159.6041,72.973317 L 159.73037,165.27601 L 151.27034,165.52854 L 149.50258,110.6015 L 145.20943,110.34896 L 144.19928,165.90735 L 136.37059,165.40228 L 135.86552,73.730932 L 131.06729,73.730932 L 131.57237,108.83373 L 122.98607,109.08627 L 122.22846,64.892097 L 131.31983,56.810877 z "
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#0000ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       id="manbody" />
+    <path
+       d="M 6.5659916,6.3032492 L 188.14091,6.5557874 L 187.88837,188.13071 L 6.3134534,187.62563 L 6.5659916,6.3032492 z "
+       style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:8px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       id="outline" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/recreation/cinema.svg b/data/map-icons/svg/recreation/cinema.svg
new file mode 100644
index 0000000..3d458b3
--- /dev/null
+++ b/data/map-icons/svg/recreation/cinema.svg
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/recreation"
+   sodipodi:docname="cinema.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="17.919726"
+     inkscape:cy="23.343845"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1058"
+     inkscape:window-height="1017"
+     inkscape:window-x="334"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g4636"
+       transform="matrix(0.8480352,-0.3682951,0.3735968,0.8360006,0.1122281,7.300399)">
+      <rect
+         y="11.284021"
+         x="5.4614668"
+         height="9.067503"
+         width="11.761078"
+         id="rect3589"
+         style="opacity:1;fill:#12abdb;fill-opacity:1;stroke:#150b0b;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+      <rect
+         y="21.087101"
+         x="5.4614668"
+         height="9.067503"
+         width="11.761078"
+         id="rect3591"
+         style="opacity:1;fill:#12abdb;fill-opacity:1;stroke:#150b0b;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+      <rect
+         y="1.4123586"
+         x="5.456027"
+         height="9.067503"
+         width="11.761078"
+         id="rect3593"
+         style="opacity:1;fill:#12abdb;fill-opacity:1;stroke:#150b0b;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+      <g
+         transform="translate(0,0.5357143)"
+         id="g4616">
+        <g
+           id="g4588"
+           transform="translate(0,-1.7812501)">
+          <rect
+             y="6.7388401"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4566"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="10.595982"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4570"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="14.453125"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4572"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="18.310268"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4574"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="22.167412"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4576"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="26.024553"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4578"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="29.881697"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4584"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="2.8816965"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4586"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+        </g>
+        <g
+           id="g4598"
+           transform="translate(11.517858,-1.7812501)">
+          <rect
+             y="6.7388401"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4600"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="10.595982"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4602"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="14.453125"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4604"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="18.310268"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4606"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="22.167412"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4608"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="26.024553"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4610"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="29.881697"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4612"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+          <rect
+             y="2.8816965"
+             x="5.0558033"
+             height="1.2276785"
+             width="0.95982146"
+             id="rect4614"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/recreation/music.svg b/data/map-icons/svg/recreation/music.svg
new file mode 100644
index 0000000..7ab669a
--- /dev/null
+++ b/data/map-icons/svg/recreation/music.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="160.83618"
+   id="svg1316"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/recreation"
+   sodipodi:docname="music.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="181.0162"
+   x="0.00000000"
+   y="0.00000000">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Musical Note 3</dc:title>
+        <dc:description>This work is hereby released into the Public Domain. To view a copy of the public domain dedication, visit http://creativecommons.org/licenses/publicdomain/ or send a letter to Creative Commons, 543 Howard Street, 5th Floor, San Francisco, California, 94105, USA.</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>music</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Dennis Bond</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     id="base"
+     inkscape:current-layer="svg1316"
+     inkscape:cx="197.25994"
+     inkscape:cy="104.41315"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="579"
+     inkscape:window-width="857"
+     inkscape:window-x="2105"
+     inkscape:window-y="456"
+     inkscape:zoom="1.3037337"
+     pagecolor="#ffffff" />
+  <defs
+     id="defs1318" />
+  <g
+     id="layer1"
+     transform="matrix(-0.219859,-4.957995e-2,-5.113941e-2,0.226774,241.3023,-20.17933)">
+    <path
+       d="M 374.44027,235.14714 C 346.34652,357.28055 314.64401,506.51481 286.55029,628.64829 C 181.90395,556.18869 108.91835,615.08334 119.4692,698.01492 C 126.23986,751.23315 219.58272,808.21199 308.65143,721.32985 C 325.20715,640.35087 355.01864,506.84742 377.59537,402.07762 L 542.58718,519.15719 C 525.749,595.05513 509.20447,670.45741 491.07618,749.26749 C 386.42991,676.80789 313.37171,735.68686 323.92257,818.61845 C 330.69325,871.83667 424.05163,928.7431 513.12035,841.86095 L 614.20931,403.76291 C 613.53748,403.59165 612.8653,403.4263 612.19348,403.25505 L 612.40077,402.99594 C 597.91963,391.58023 388.86286,238.8239 374.44027,235.14714 z M 394.14213,325.5694 L 559.26349,444.87731 C 556.75243,456.0059 554.31761,467.01872 551.85294,478.0426 L 386.6383,360.23232 C 388.77062,350.11748 392.34481,334.36068 394.14213,325.5694 z "
+       id="path5065"
+       style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     id="g1921"
+     transform="matrix(0.201312,-2.887594e-2,3.054284e-2,0.212933,-55.20232,-50.90483)">
+    <path
+       style="opacity:1;fill:black;fill-opacity:1;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2159"
+       d="M 362.59871,675.56622 C 246.49834,609.13916 175.35548,677.36914 193.88206,763.24717 C 205.77079,818.35621 308.61037,869.57948 394.0295,770.58031 C 406.46306,663.62865 422.76033,556.16183 435.19389,449.21017 C 566.48818,564.96343 524.55815,634.99642 497.41335,715.64179 C 553.21953,692.64399 640.63073,591.10925 545.13253,447.89837 C 499.94194,384.45756 504.18191,429.25273 460.40782,302.70428 C 444.97571,300.1555 429.54354,297.60668 414.11145,295.05793 C 395.71273,425.46582 380.99741,545.15833 362.59871,675.56622 z " />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/recreation/theater.svg b/data/map-icons/svg/recreation/theater.svg
new file mode 100644
index 0000000..db0cecd
--- /dev/null
+++ b/data/map-icons/svg/recreation/theater.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-theatre" viewBox="220 207 440 550">
+            <g stroke="none" fill-opacity="1" fill-rule="nonzero">
+                <path d="M192.4,22c0,0,50,26,112,20s94-39,98-42s17,32,17,32l4,33l-3,29l5,24l7,39l-5,32l-6,32l-19,55l-25,49l-59,21l-30-14l-22-22l-29-47l4-40l-20-28l-18-24l1-34l2-54l-8-35L192.4,22z"/>
+                <path fill="none" stroke="#FFFFFF" stroke-width="10" d="M210.4,44.5c0,0,43.8,22.8,98,17.5s82.3-34.1,85.8-36.8s14.9,28,14.9,28l3.5,28.9l-2.6,25.4l4.4,21l6.1,34.1l-4.4,28l-5.3,28l-16.6,48.1l-21.9,42.9L320.6,328l-26.3-12.3l-19.3-19.3l-25.4-41.1l3.5-35l-17.5-24.5l-15.8-21l0.9-29.8l1.8-47.3l-7-30.6L210.4,44.5z"/>
+                <path fill="#FFFFFF" d="M293.4,152c0,8.3-11.4,15-25.5,15s-25.5-6.7-25.5-15s11.4-15,25.5-15S293.4,143.7,293.4,152z"/>
+                <path fill="#FFFFFF" d="M406.4,140.5c0,8.6-13.2,15.5-29.5,15.5s-29.5-6.9-29.5-15.5s13.2-15.5,29.5-15.5S406.4,131.9,406.4,140.5z"/>
+                <path fill="none" stroke="#FFFFFF" stroke-width="10" d="M248.4,124l14-43l15,27"/>
+                <path fill="none" stroke="#FFFFFF" stroke-width="10" d="M336.4,110l7-32l35,23"/>
+                <path fill="none" stroke="#FFFFFF" stroke-width="10" d="M317.4,146l-7,72l22-1L317.4,146z"/>
+                <path fill="none" stroke="#FFFFFF" stroke-width="10" d="M305.4,297c0,0,2-55,27-57s37,16,41,30"/>
+                <path fill="#FFFFFF" stroke="#000000" stroke-width="10" d="M207.4,90c0,0-19,18-61,17s-42,5-83-33s-31-38-31-38l-9,105l-5,22l-13,15l26,128l37,82c0,0,3,9,38,9s30-10,40-20s15-35,34-49s41-47,41-47l17-21l3-34l-23-29l-12-32L207.4,90z"/>
+                <path fill="none" stroke="#000000" stroke-width="10" d="M51.4,150c0,0-2-15,25-15s31,17,31,17"/>
+                <path fill="none" stroke="#000000" stroke-width="10" d="M153.4,168c0,0,6-11,12-14s22,5,22,5"/>
+                <path d="M51.4,193l23-19c0,0,12-2,25,2s7,14,7,14L51.4,193z"/>
+                <path d="M164.4,199c0,0,14-13,27-10s16,19,16,19s-7,6-26,1S164.4,199,164.4,199z"/>
+                <path d="M125.4,188l-25,83h29L125.4,188z"/>
+                <path d="M61.4,258c0,0,0-4,14,16s10,36,44,34s38-45,55-42s13,8,7,20s-23,23-32,35s5,40-39,38s-43-44-49-48S61.4,258,61.4,258z"/>
+            </g>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/religion.svg b/data/map-icons/svg/religion.svg
new file mode 100644
index 0000000..e75f7f8
--- /dev/null
+++ b/data/map-icons/svg/religion.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3269"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg"
+   sodipodi:docname="religion.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3271" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="18.310809"
+     inkscape:cy="8.0067368"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="943"
+     inkscape:window-height="817"
+     inkscape:window-x="449"
+     inkscape:window-y="154"
+     borderlayer="false"
+     inkscape:showpageshadow="true" />
+  <metadata
+     id="metadata3274">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b2b2b2;fill-opacity:1;stroke:#000000;stroke-width:1.079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3277"
+       width="11.196519"
+       height="14.220005"
+       x="10.060809"
+       y="15.40766"
+       transform="matrix(0.9999999,-4.1822142e-4,4.1822142e-4,0.9999999,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3279"
+       width="2.6737955"
+       height="14.220005"
+       x="14.009363"
+       y="1.5477308"
+       transform="matrix(0.999933,-1.1572613e-2,1.1572613e-2,0.999933,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3281"
+       width="9.8616714"
+       height="2.3008447"
+       x="10.381236"
+       y="4.4746256"
+       transform="matrix(0.9999009,-1.408147e-2,9.5106522e-3,0.9999548,0,0)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/religion/cemetery.svg b/data/map-icons/svg/religion/cemetery.svg
new file mode 100644
index 0000000..1ec80aa
--- /dev/null
+++ b/data/map-icons/svg/religion/cemetery.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="31.51786"
+   height="41.237568"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/religion"
+   sodipodi:docname="cemetery.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="16.870145"
+     inkscape:cy="24.50767"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="978"
+     inkscape:window-height="856"
+     inkscape:window-x="413"
+     inkscape:window-y="38" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/LGPL/2.1/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/LGPL/2.1/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-292.23234,-931.10088)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#f2ecec;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect2180"
+       width="13.321891"
+       height="3.231303"
+       x="292.29483"
+       y="935.74554" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#f2ecec;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect2160"
+       width="2.8322647"
+       height="24.483139"
+       x="297.48636"
+       y="931.16339"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#f2ecec;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3163"
+       width="13.321891"
+       height="3.231303"
+       x="300.98071"
+       y="943.88367" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#f2ecec;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3161"
+       width="2.8322647"
+       height="24.483139"
+       x="306.17224"
+       y="939.30145"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#f2ecec;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3175"
+       width="13.321891"
+       height="3.231303"
+       x="310.36581"
+       y="952.375" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#f2ecec;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3173"
+       width="2.8322647"
+       height="24.483139"
+       x="315.55734"
+       y="947.79279"
+       rx="0"
+       ry="0" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/religion/chapel.svg b/data/map-icons/svg/religion/chapel.svg
new file mode 100644
index 0000000..1bb45d1
--- /dev/null
+++ b/data/map-icons/svg/religion/chapel.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/religion"
+   sodipodi:docname="chapel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="18.437339"
+     inkscape:cy="17.625598"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="981"
+     inkscape:window-height="1017"
+     inkscape:window-x="411"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b2b2b2;fill-opacity:1;stroke:#000000;stroke-width:1.079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3277"
+       width="11.196519"
+       height="14.220005"
+       x="4.9298964"
+       y="10.965831"
+       transform="matrix(0.9999999,-4.1822143e-4,4.1822143e-4,0.9999999,0,0)" />
+    <g
+       id="g2212"
+       transform="translate(-7.5,-1.4285714)">
+      <rect
+         transform="matrix(0.999933,-1.1572613e-2,1.1572613e-2,0.999933,0,0)"
+         y="13.291089"
+         x="30.11763"
+         height="14.220004"
+         width="2.6737955"
+         id="rect3279"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+      <rect
+         transform="matrix(0.9999009,-1.4081469e-2,9.5106519e-3,0.9999548,0,0)"
+         y="16.258488"
+         x="26.513855"
+         height="2.3008447"
+         width="9.8616724"
+         id="rect3281"
+         style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:#2f0404;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.04347432px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.7985228,10.859921 L 10.48693,5.50388 L 16.317548,10.951476"
+       id="path2216"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/religion/church.svg b/data/map-icons/svg/religion/church.svg
new file mode 100644
index 0000000..552bbf7
--- /dev/null
+++ b/data/map-icons/svg/religion/church.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3269"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/religion"
+   sodipodi:docname="church.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3271" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.919596"
+     inkscape:cx="18.310809"
+     inkscape:cy="8.0067368"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="486"
+     inkscape:window-y="375"
+     borderlayer="false"
+     inkscape:showpageshadow="true" />
+  <metadata
+     id="metadata3274">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#b2b2b2;fill-opacity:1;stroke:#000000;stroke-width:1.079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3277"
+       width="11.196519"
+       height="14.220005"
+       x="10.060809"
+       y="15.40766"
+       transform="matrix(0.9999999,-4.1822142e-4,4.1822142e-4,0.9999999,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3279"
+       width="2.6737955"
+       height="14.220005"
+       x="14.009363"
+       y="1.5477308"
+       transform="matrix(0.999933,-1.1572613e-2,1.1572613e-2,0.999933,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3281"
+       width="9.8616714"
+       height="2.3008447"
+       x="10.381236"
+       y="4.4746256"
+       transform="matrix(0.9999009,-1.408147e-2,9.5106522e-3,0.9999548,0,0)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/religion/church/catholic.svg b/data/map-icons/svg/religion/church/catholic.svg
new file mode 100644
index 0000000..2d22515
--- /dev/null
+++ b/data/map-icons/svg/religion/church/catholic.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3269"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/religion/church"
+   sodipodi:docname="catholic.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3271" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="15.710716"
+     inkscape:cy="7.0216354"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="669"
+     inkscape:window-x="485"
+     inkscape:window-y="90"
+     borderlayer="false"
+     inkscape:showpageshadow="true" />
+  <metadata
+     id="metadata3274">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#fffc00;fill-opacity:1;stroke:#000000;stroke-width:1.079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3277"
+       width="11.196519"
+       height="14.220005"
+       x="10.060809"
+       y="15.40766"
+       transform="matrix(0.9999999,-4.1822142e-4,4.1822142e-4,0.9999999,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3279"
+       width="2.6737955"
+       height="14.220005"
+       x="14.009363"
+       y="1.5477308"
+       transform="matrix(0.999933,-1.1572613e-2,1.1572613e-2,0.999933,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3281"
+       width="9.8616714"
+       height="2.3008447"
+       x="10.381236"
+       y="4.4746256"
+       transform="matrix(0.9999009,-1.408147e-2,9.5106522e-3,0.9999548,0,0)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/religion/church/mosque.svg b/data/map-icons/svg/religion/church/mosque.svg
new file mode 100644
index 0000000..49995ec
--- /dev/null
+++ b/data/map-icons/svg/religion/church/mosque.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-mosque" viewBox="60 60 120 120">
+            <path fill='#00ab00' d="M 4,60 C 11,75 60,107 84,73 C 103,40 76,22 50,7 C 76,6 130,35 103,84 C 72,124 8,97 4,60 z M 35,52 C 35,52 20,55 20,55 L 30,43 C 30,43 21,30 21,30 L 35,35 L 45,23 L 45,38 L 60,45 L 45,50 L 45,65 L 35,52 z"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/religion/church/protestant.svg b/data/map-icons/svg/religion/church/protestant.svg
new file mode 100644
index 0000000..0235287
--- /dev/null
+++ b/data/map-icons/svg/religion/church/protestant.svg
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3269"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/religion/church"
+   sodipodi:docname="protestant.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs3271" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="16.966315"
+     inkscape:cy="1.9539889"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="420"
+     borderlayer="false"
+     inkscape:showpageshadow="true" />
+  <metadata
+     id="metadata3274">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#1f48ed;fill-opacity:1;stroke:#000000;stroke-width:1.079;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3277"
+       width="11.196519"
+       height="14.220005"
+       x="10.031717"
+       y="15.427862"
+       transform="matrix(0.9999985,-1.7096011e-3,1.7096011e-3,0.9999985,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3279"
+       width="2.6737955"
+       height="14.220005"
+       x="14.366482"
+       y="1.5518639"
+       transform="matrix(0.999933,-1.1572613e-2,1.1572613e-2,0.999933,0,0)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect3281"
+       width="9.1490421"
+       height="2.3008301"
+       x="11.098649"
+       y="4.4968739"
+       transform="matrix(0.9998848,-1.5178291e-2,8.8233038e-3,0.9999611,0,0)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/religion/church/synagogue.svg b/data/map-icons/svg/religion/church/synagogue.svg
new file mode 100644
index 0000000..e2adf26
--- /dev/null
+++ b/data/map-icons/svg/religion/church/synagogue.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-synagogue" viewBox="10 10 22 22">
+            <path
+                stroke='#0000d0' 
+                fill='none'
+                stroke-width="1.5"
+                stroke-linecap="butt"
+                stroke-linejoin="miter"
+                d="M 10,0 L 20,15 L 0,15 L 10,0 z M 10,20 L 0,5 L 20,5 L 10,20 z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/shopping.svg b/data/map-icons/svg/shopping.svg
new file mode 100644
index 0000000..9f9be7b
--- /dev/null
+++ b/data/map-icons/svg/shopping.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-supermarket" viewBox="14.5 13.5 29 27">
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.158;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.9801324" d="M 13.711,19.263 C 13.711,19.754 13.319,20.153 12.836,20.153 C 12.353,20.153 11.962,19.754 11.962,19.263 C 11.962,18.771793 12.353,18.373 12.836,18.373 C 13.319,18.373 13.711,18.771 13.711,19.263 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 1.496,6.889 L 16.443,2.987 L 25.387,6.367 L 7.7960,10.054 L 1.496,6.889 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 1.540,16.974 L 7.7331,20.521 L 22.605,17.745 L 14.549,13.961 L 1.540,16.974 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 7.812,10.136 L 7.812,20.500" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 22.841,21.164 L 26.462,6.6923 C 26.610,5.3945 27.232,4.939 28.105,4.932" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.90399998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 14.1281,17.1309 L 16.5851,2.98845 C 16.5652,2.09899 16.8043,1.34902 17.8289,1.02204" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0.761,16.846 L 0.761,6.781" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.160;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 17.707,0.991 C 17.727,0.991 17.748,0.991 17.707,0.991 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.27;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 17.707,1.022 L 28.196,4.902" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 14.009,17.240 L 3.853,20.726 C 1.229,21.787 3.228,23.365 4.126,23.909 C 5.447,24.711 6.096,25.159 9.340,24.728 C 13.993,24.109 22.709,21.211 22.709,21.211" />
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.980" d="M 5.601,21.945 C 5.601,22.437 5.209,22.834 4.727,22.835 C 4.244,22.835 3.853,22.437 3.853,21.945 C 3.853,21.454 4.244,21.056 4.727,21.056 C 5.2095,21.056 5.601,21.454 5.601,21.945 z" />
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.980" d="M 11.254,25.962 C 11.254,26.453 10.863,26.852 10.380,26.852 C 9.898,26.852 9.506,26.453 9.506,25.962 C 9.506,25.471 9.898,25.072 10.380,25.072 C 10.863,25.072 11.254,25.471 11.254,25.962 z" />
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.980" d="M 21.926,23.143 C 21.926,23.635 21.535,24.033 21.052,24.033 C 20.569,24.033 20.177,23.632 20.177,23.143 C 20.177,22.652 20.569,22.253 21.052,22.253 C 21.535,22.253 21.926,22.652 21.926,23.143 z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/shopping/rental/library.svg b/data/map-icons/svg/shopping/rental/library.svg
new file mode 100644
index 0000000..8df2bbc
--- /dev/null
+++ b/data/map-icons/svg/shopping/rental/library.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-library" viewBox="160 310 319.3 621.3">
+            <path fill="#FFFFFF" stroke="#000000" stroke-width="32.0585" d="M136,165.5l5.1,414l162.2-163.5V46.6 L136,165.5z"/>
+            <path fill="#FFFFFF" stroke="#000000" stroke-width="32.1739" d="M20.2,136.7l-3.9,422.1c0,0-6.4,45,43.8,46.3 c56.6,1.5,68.2-10.3,68.2-10.3l2.6-426c0,0-18,14.2-57.9,12.9C22.8,180.1,20.2,136.7,20.2,136.7z"/>
+            <path fill="none" stroke="#000000" stroke-width="26.7171" d="M175.9,229.4l79.8-48.9"/>
+            <path fill="none" stroke="#000000" stroke-width="26.7171" d="M182.3,289.9l69.5-42.5"/>
+            <path fill="none" stroke="#000000" stroke-width="26.7171" d="M184.9,351.6l75.9-48.9"/>
+            <path fill="none" stroke="#000000" stroke-width="26.7171" d="M13.7,147L191.3,10.6 c-18.3,17.1,13.9,32.3,37.3,33.5c51.5,2.6,81.1-7.7,81.1-7.7"/>
+            <path fill="#FFFFFF" stroke="#000000" d="M36.7,143.9l144-116c0,0-7,18,26,25s59,1,59,1l-149,107c0,0-27,16-59,1 S36.7,143.9,36.7,143.9z"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/shopping/supermarket.svg b/data/map-icons/svg/shopping/supermarket.svg
new file mode 100644
index 0000000..9f9be7b
--- /dev/null
+++ b/data/map-icons/svg/shopping/supermarket.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-supermarket" viewBox="14.5 13.5 29 27">
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.158;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.9801324" d="M 13.711,19.263 C 13.711,19.754 13.319,20.153 12.836,20.153 C 12.353,20.153 11.962,19.754 11.962,19.263 C 11.962,18.771793 12.353,18.373 12.836,18.373 C 13.319,18.373 13.711,18.771 13.711,19.263 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 1.496,6.889 L 16.443,2.987 L 25.387,6.367 L 7.7960,10.054 L 1.496,6.889 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 1.540,16.974 L 7.7331,20.521 L 22.605,17.745 L 14.549,13.961 L 1.540,16.974 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 7.812,10.136 L 7.812,20.500" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 22.841,21.164 L 26.462,6.6923 C 26.610,5.3945 27.232,4.939 28.105,4.932" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.90399998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 14.1281,17.1309 L 16.5851,2.98845 C 16.5652,2.09899 16.8043,1.34902 17.8289,1.02204" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 0.761,16.846 L 0.761,6.781" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.160;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 17.707,0.991 C 17.727,0.991 17.748,0.991 17.707,0.991 z" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.27;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 17.707,1.022 L 28.196,4.902" />
+            <path style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.732;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 14.009,17.240 L 3.853,20.726 C 1.229,21.787 3.228,23.365 4.126,23.909 C 5.447,24.711 6.096,25.159 9.340,24.728 C 13.993,24.109 22.709,21.211 22.709,21.211" />
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.980" d="M 5.601,21.945 C 5.601,22.437 5.209,22.834 4.727,22.835 C 4.244,22.835 3.853,22.437 3.853,21.945 C 3.853,21.454 4.244,21.056 4.727,21.056 C 5.2095,21.056 5.601,21.454 5.601,21.945 z" />
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.980" d="M 11.254,25.962 C 11.254,26.453 10.863,26.852 10.380,26.852 C 9.898,26.852 9.506,26.453 9.506,25.962 C 9.506,25.471 9.898,25.072 10.380,25.072 C 10.863,25.072 11.254,25.471 11.254,25.962 z" />
+            <path style="fill:black;fill-opacity:1;stroke:none;stroke-width:0.159;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.980" d="M 21.926,23.143 C 21.926,23.635 21.535,24.033 21.052,24.033 C 20.569,24.033 20.177,23.632 20.177,23.143 C 20.177,22.652 20.569,22.253 21.052,22.253 C 21.535,22.253 21.926,22.652 21.926,23.143 z" />
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/sightseeing/museum.svg b/data/map-icons/svg/sightseeing/museum.svg
new file mode 100644
index 0000000..9f5c48c
--- /dev/null
+++ b/data/map-icons/svg/sightseeing/museum.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-museum" viewBox="94 140 156 180">
+            <g fill="#f2f2f2" stroke-width="4" stroke="#000000">
+                <path d="M 38.2,92.9 L 60.6,92.9 L 60.6,215.6 L 38.2,215.6 L 38.2,92.9 z " />
+                <path d="M 85,92.9 L 107.4,92.8 L 107.4,215.6 L 85,215.6 L 85,92.9 z " />
+                <path d="M 131.8,92.8 L 154.2,92.8 L 154.2,215.6 L 131.8,215.6 L 131.8,92.8 z " />
+                <path d="M 18.0,216.1 L 170.0,216.1 L 170.0,226.6 L 18.0,226.6 L 18.0,216.1 z " />
+                <path d="M 17.9,82.0 L 95.4,53.6 L 169.9,82.0 L 169.9,92.5 L 17.9,92.5 L 17.9,82.0 z " />
+            </g>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/sports/bicycle.svg b/data/map-icons/svg/sports/bicycle.svg
new file mode 100644
index 0000000..059042e
--- /dev/null
+++ b/data/map-icons/svg/sports/bicycle.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape ("http://www.inkscape.org/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="102.91438"
+   id="svg800"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/transport"
+   sodipodi:docname="bicycle.svg"
+   sodipodi:version="0.32"
+   width="174.69241"
+   version="1.0">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Watch For Bicycles Sign</dc:title>
+        <dc:description />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+            <rdf:li>bicycle</rdf:li>
+            <rdf:li>watch</rdf:li>
+            <rdf:li>caution</rdf:li>
+            <rdf:li>bicycles</rdf:li>
+            <rdf:li>roadsign</rdf:li>
+            <rdf:li>transportation</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org">
+            <dc:title>John Cliff</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>John Cliff</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>John Cliff</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs802" />
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     id="base"
+     inkscape:cx="48.974664"
+     inkscape:cy="94.410227"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="721"
+     inkscape:window-width="1024"
+     inkscape:window-x="1801"
+     inkscape:window-y="54"
+     inkscape:zoom="1.0330066"
+     pagecolor="#ffffff"
+     inkscape:current-layer="svg800" />
+  <g
+     id="g2873"
+     transform="matrix(-1,0,0,1,290.9116,-126.4264)">
+    <path
+       transform="matrix(0.336803,0,0,0.336803,192.5945,42.97304)"
+       style="font-size:12px;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:26;stroke-opacity:1"
+       sodipodi:type="arc"
+       sodipodi:ry="78.380615"
+       sodipodi:rx="78.380615"
+       sodipodi:cy="461.96271"
+       sodipodi:cx="200.53224"
+       id="path596"
+       d="M 278.91286 461.96271 A 78.380615 78.380615 0 1 1  122.15163,461.96271 A 78.380615 78.380615 0 1 1  278.91286 461.96271 z" />
+    <path
+       transform="matrix(0.336803,0,0,0.336803,79.45661,42.45877)"
+       style="font-size:12px;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:26;stroke-opacity:1"
+       sodipodi:type="arc"
+       sodipodi:ry="78.380615"
+       sodipodi:rx="78.380615"
+       sodipodi:cy="461.96271"
+       sodipodi:cx="200.53224"
+       id="path595"
+       d="M 278.91286 461.96271 A 78.380615 78.380615 0 1 1  122.15163,461.96271 A 78.380615 78.380615 0 1 1  278.91286 461.96271 z" />
+    <path
+       style="font-size:12px;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:7.03076267;stroke-linejoin:round;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc"
+       id="path594"
+       d="M 167.90982,153.1369 L 235.79253,153.47975 L 259.79146,198.0492 L 213.85064,198.0492 L 165.85277,165.47922" />
+    <path
+       style="font-size:12px;fill:black;fill-opacity:1;fill-rule:evenodd;stroke-width:25;stroke-linecap:round"
+       sodipodi:nodetypes="ccccscccccsscsccccccccccccssccc"
+       id="path593"
+       d="M 170.5183,126.42646 C 166.83103,126.42646 164.04394,126.34419 161.1872,130.70844 C 160.3649,132.16329 159.98894,133.93965 160.29257,135.70786 C 160.65681,137.71849 161.84718,139.69391 163.25047,140.86331 C 165.10867,142.41182 166.87215,142.29236 166.58715,143.68438 C 166.22147,145.4705 165.10547,147.95255 163.89944,151.9829 C 162.67523,156.07397 161.22156,161.08105 159.79465,166.01285 C 158.36774,170.94464 156.96703,175.80381 155.85827,179.59022 C 155.30388,181.48342 154.81971,183.10905 154.4479,184.32651 C 154.08565,185.51268 153.76582,186.43407 153.79535,186.36838 C 152.64018,188.40081 152.48294,189.72514 150.54536,191.45502 C 148.37291,193.35632 146.60413,194.7609 145.99026,195.18996 C 144.43106,196.32261 143.70621,198.71294 144.52957,199.89402 C 145.56721,201.50364 147.71021,201.75055 149.27646,201.269 C 150.76366,200.7969 153.11787,199.98597 155.84774,197.72495 L 155.86879,197.69338 L 155.90037,197.67233 C 159.69884,194.41421 161.10411,190.45988 161.24711,190.23109 L 161.44709,189.92586 L 161.58392,189.58906 C 161.91306,188.77884 162.11021,188.06443 162.4996,186.78938 C 162.88899,185.51433 163.38262,183.86707 163.94154,181.95836 C 165.05938,178.14096 166.45298,173.2744 167.87792,168.34942 C 169.30287,163.42444 170.75298,158.44285 171.96166,154.40367 C 173.17034,150.36449 173.93395,147.04714 174.21622,146.34145 C 174.90326,144.62386 175.25425,142.76958 174.78458,140.9105 C 174.31492,139.05142 172.91143,137.55099 171.65157,137.2022 C 168.77584,136.39766 169.53887,134.32918 171.01013,134.32618 L 183.33913,134.30108 L 183.36952,126.42663 C 183.36944,126.42646 175.3668,126.42646 170.5183,126.42646 z " />
+    <path
+       style="font-size:12px;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:8.42007542;stroke-opacity:1"
+       id="path599"
+       d="M 214.73026,196.65372 L 238.00315,139.68364" />
+    <path
+       style="font-size:12px;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:3.0733273;stroke-linecap:round;stroke-opacity:1"
+       id="path600"
+       d="M 204.30595,178.47178 L 223.21516,218.47205" />
+    <path
+       transform="matrix(0.132315,0,0,0.136689,187.5743,134.9894)"
+       style="font-size:12px;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:31.30500031;stroke-opacity:1"
+       sodipodi:type="arc"
+       sodipodi:ry="78.380615"
+       sodipodi:rx="78.380615"
+       sodipodi:cy="461.96271"
+       sodipodi:cx="200.53224"
+       id="path597"
+       d="M 278.91286 461.96271 A 78.380615 78.380615 0 1 1  122.15163,461.96271 A 78.380615 78.380615 0 1 1  278.91286 461.96271 z" />
+    <path
+       style="font-size:12px;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:4.29423809;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       id="path601"
+       d="M 199.25786,179.69861 L 211.67914,179.81247" />
+    <path
+       style="font-size:12px;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:4.29423809;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       id="path602"
+       d="M 216.88312,216.79001 L 229.3044,216.90387" />
+    <path
+       style="font-size:12px;fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.33680301pt;stroke-opacity:1"
+       sodipodi:nodetypes="cssccc"
+       id="path603"
+       d="M 249.39728,134.59251 L 220.18494,134.59251 C 219.09402,134.59251 217.68598,136.52227 219.09402,137.80466 C 220.61688,139.254 234.30626,142.22893 234.30626,142.22893 C 234.30626,142.22893 238.06386,143.25924 240.06388,143.01682 C 242.06389,142.77439 248.97303,142.16833 249.39728,134.59251 z " />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/sports/cycling.svg b/data/map-icons/svg/sports/cycling.svg
new file mode 100644
index 0000000..94c6e8c
--- /dev/null
+++ b/data/map-icons/svg/sports/cycling.svg
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 455.148 454.788"
+   height="454.788"
+   i:pageBounds="0 792 612 0"
+   i:rulerOrigin="0 0"
+   i:viewOrigin="78 623"
+   overflow="visible"
+   space="preserve"
+   viewBox="0 0 455.148 454.788"
+   width="455.148"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="cycling.svg"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports">
+  <defs
+     id="defs110">
+    <foreignObject
+       id="foreignObject8"
+       y="0"
+       x="0"
+       width="1"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       height="1">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <linearGradient
+       y2="227.73579"
+       y1="227.73579"
+       x2="455.14841"
+       x1="424.36719"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop16"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop18"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop20"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop22"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop24"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop26"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop28"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop30"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop32"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop34"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="227.37601"
+       y1="227.37601"
+       x2="0.0713"
+       x1="30.851601"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop39"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop41"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop43"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop45"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop47"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop49"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="0.071800001"
+       y1="30.8521"
+       x2="227.73579"
+       x1="227.73579"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop54"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop56"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop58"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop60"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop62"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop64"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="454.67969"
+       y1="423.89941"
+       x2="227.37601"
+       x1="227.37601"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop69"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop71"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop73"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop75"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop77"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop79"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop81"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop83"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop85"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop87"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="761"
+     inkscape:window-width="930"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.83115651"
+     inkscape:cx="227.57401"
+     inkscape:cy="227.394"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Hotel Icon Cycling</dc:title>
+        <dc:description>Part of Hotel Icons Collection</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>hotel</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     clip-rule="evenodd"
+     d="M 235.658,181.167 L 207.471,208.599 L 247.863,231.819 C 248.115,249.532 248.258,264.651 248.15,278.007 C 248.043,291.291 249.23,304.179 247.287,310.983 C 245.199,317.536 240.303,317.607 236.199,317.607 C 232.058,317.5 225.29,315.664 222.842,310.731 C 220.395,305.62 221.547,298.059 221.438,288.051 C 221.186,277.971 221.186,265.875 221.438,251.079 C 208.551,245.066 197.823,239.847 188.715,234.734 C 179.498,229.658 171.794,225.879 167.114,221.018 C 162.47,215.978 160.849,210.506 160.849,205.43 C 160.778,200.318 162.578,196.502 166.537,190.922 C 170.461,185.234 176.617,179.33 184.177,171.95 C 191.701,164.498 203.942,152.114 211.177,146.858 C 218.269,141.602 221.869,140.414 226.837,140.522 C 231.84,140.558 236.629,143.834 240.77,147.146 C 244.694,150.314 246.385,153.518 250.706,160.07 C 254.954,166.586 260.03,175.19 266.077,186.17 C 277.669,185.126 286.489,185.126 292.825,186.17 C 298.981,187.106 302.761,189.086 303.626,192.254 C 304.454,195.458 303.806,202.73 297.938,205.178 C 291.889,207.338 275.581,206.294 268.057,206.222 C 260.606,206.222 256.61,206.654 253.008,205.178 C 249.194,203.522 248.76,200.714 245.881,196.754 C 243.002,192.723 239.547,187.575 235.658,181.167 z "
+     i:knockout="Off"
+     id="path93"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 264.914,105.227 C 278.408,105.227 289.359,115.388 289.359,127.907 C 289.359,140.427 278.408,150.587 264.914,150.587 C 251.422,150.587 240.471,140.426 240.471,127.907 C 240.471,115.388 251.422,105.227 264.914,105.227"
+     i:knockout="Off"
+     id="path95"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 145.443,236.715 C 183.2,236.715 213.842,265.149 213.842,300.183 C 213.842,335.217 183.2,363.65 145.443,363.65 C 107.686,363.65 77.043,335.216 77.043,300.182 C 77.043,265.148 107.686,236.715 145.443,236.715 z M 145.443,248.991 C 175.907,248.991 200.631,271.925 200.631,300.182 C 200.631,328.439 175.906,351.374 145.443,351.374 C 114.98,351.374 90.255,328.439 90.255,300.182 C 90.255,271.925 114.979,248.991 145.443,248.991 z "
+     i:knockout="Off"
+     id="path97"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 324.326,236.715 C 362.084,236.715 392.726,265.149 392.726,300.183 C 392.726,335.217 362.083,363.651 324.326,363.651 C 286.57,363.651 255.926,335.217 255.926,300.183 C 255.926,265.149 286.57,236.715 324.326,236.715 z M 324.326,248.991 C 354.771,248.991 379.478,271.925 379.478,300.182 C 379.478,328.439 354.771,351.374 324.326,351.374 C 293.883,351.374 269.174,328.439 269.174,300.182 C 269.174,271.925 293.883,248.991 324.326,248.991 z "
+     i:knockout="Off"
+     id="path99"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 233.283,176.775 L 205.094,204.207 L 245.486,227.427 C 245.738,245.175 245.882,260.187 245.775,273.579 C 245.666,286.827 246.855,299.823 244.91,306.591 C 242.822,313.179 237.926,313.107 233.822,313.179 C 229.681,313.071 222.914,311.235 220.467,306.303 C 218.018,301.263 219.17,293.523 219.063,283.623 C 218.811,273.507 218.811,261.519 219.063,246.686 C 206.174,240.71 195.447,235.382 186.338,230.306 C 177.158,225.23 169.346,221.45 164.702,216.59 C 160.021,211.478 158.547,206.15 158.474,201.038 C 158.402,195.926 160.202,192.11 164.162,186.53 C 168.086,180.878 174.242,174.866 181.803,167.522 C 189.326,159.998 201.567,147.758 208.803,142.466 C 215.895,137.21 219.494,136.022 224.462,136.13 C 229.466,136.202 234.254,139.37 238.394,142.718 C 242.318,145.886 244.009,149.09 248.33,155.642 C 252.578,162.23 257.654,170.762 263.703,181.778 C 275.295,180.734 284.115,180.734 290.451,181.778 C 296.607,182.75 300.387,184.586 301.25,187.826 C 302.078,191.03 301.432,198.302 295.562,200.75 C 289.515,202.982 273.207,201.866 265.683,201.83 C 258.158,201.83 254.199,202.262 250.599,200.75 C 246.925,199.094 246.279,196.286 243.505,192.326 C 240.555,188.295 237.279,183.111 233.283,176.775 z "
+     i:knockout="Off"
+     id="path101"
+     style="fill:#17057a;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 262.516,100.667 C 276.008,100.667 286.959,110.827 286.959,123.347 C 286.959,135.867 276.008,146.027 262.516,146.027 C 249.022,146.027 238.071,135.866 238.071,123.347 C 238.071,110.828 249.021,100.667 262.516,100.667"
+     i:knockout="Off"
+     id="path103"
+     style="fill:#17057a;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 143.067,232.287 C 180.823,232.287 211.467,260.721 211.467,295.755 C 211.467,330.789 180.822,359.223 143.067,359.223 C 105.31,359.223 74.667,330.789 74.667,295.755 C 74.667,260.721 105.31,232.287 143.067,232.287 z M 143.067,244.563 C 173.53,244.563 198.255,267.498 198.255,295.755 C 198.255,324.012 173.53,346.946 143.067,346.946 C 112.603,346.946 87.879,324.012 87.879,295.755 C 87.879,267.498 112.603,244.563 143.067,244.563 z "
+     i:knockout="Off"
+     id="path105"
+     style="fill:#17057a;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 321.951,232.287 C 359.707,232.287 390.351,260.721 390.351,295.755 C 390.351,330.789 359.706,359.223 321.951,359.223 C 284.193,359.223 253.551,330.789 253.551,295.755 C 253.551,260.721 284.193,232.287 321.951,232.287 z M 321.951,244.563 C 352.394,244.563 377.103,267.498 377.103,295.755 C 377.103,324.012 352.394,346.946 321.951,346.946 C 291.506,346.946 266.799,324.012 266.799,295.755 C 266.799,267.498 291.506,244.563 321.951,244.563 z "
+     i:knockout="Off"
+     id="path107"
+     style="fill:#17057a;fill-rule:evenodd" />
+</svg>
diff --git a/data/map-icons/svg/sports/golf.svg b/data/map-icons/svg/sports/golf.svg
new file mode 100644
index 0000000..92da0b2
--- /dev/null
+++ b/data/map-icons/svg/sports/golf.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <!-- derived from http://www.sodipodi.com/index.php3?section=clipart -->
+        <symbol id="symbol-golf_course" viewBox="55 65 100 110">
+            <path fill='#000000' fill-rule="evenodd" stroke="none" d="M 61.6421 25.2514 C 61.6421 25.2514 48.7712 34.4528 48.1727 38.766 C 47.574 43.0787 56.5537 48.8295 56.8529 52.2802 C 57.1522 55.7303 56.5537 87.3594 56.5537 87.3594 C 56.5537 87.3594 37.3978 104.036 36.7993 105.474 C 36.2006 106.912 41.5878 117.55 43.9826 117.263 C 46.3769 116.975 43.3841 109.787 44.2819 108.349 C 45.1798 106.912 64.0363 92.5353 65.2335 90.5221 C 65.5327 91.0979 65.8321 76.7208 65.5327 76.7208 L 66.7305 76.7208 L 66.1319 91.0979 C 66.1319 91.0979 59.2473 108.349 60.1451 113.237 C 60.1451 115.824 70.6212 122.15 72.1176 121 C 73.6145 119.85 68.5261 115.536 68.8254 112.375 C 67.6283 109.212 73.016 97.4233 73.3153 94.2605 C 73.6145 91.0979 73.9138 56.3053 72.7167 51.9927 C 72.7161 48.542 69.424 42.5037 67.9276 40.2035 C 67.6283 37.9029 65.8326 31.2897 65.8326 31.2897 C 65.8326 31.2897 59.547 39.341 59.5465 39.341 C 58.0501 37.9035 68.2268 28.702 68.2268 25.8268 C 68.2268 22.9513 49.9689 9.72452 49.9689 9.72452 C 49.9689 9.72452 25.126 63.2064 25.4254 65.5065 C 25.7246 67.8065 29.9146 72.9824 32.908 70.6823 C 35.9009 68.3822 27.8197 62.9194 27.8197 62.9194 L 49.3703 14.6122 L 52.6624 18.3506 L 58.3494 18.638 L 58.0501 19.5005 C 58.0501 19.5005 51.7645 18.9255 50.5675 19.788 C 49.3703 20.6506 47.574 22.0887 47.574 25.5388 C 47.574 28.9896 52.0638 30.4271 53.5603 30.7146 L 60.8936 24.6764 L 61.6421 25.2514 z "/>
+        </symbol>	
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/sports/indoor_pool.svg b/data/map-icons/svg/sports/indoor_pool.svg
new file mode 100644
index 0000000..fe85505
--- /dev/null
+++ b/data/map-icons/svg/sports/indoor_pool.svg
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 455.148 454.788"
+   height="348.54398"
+   i:pageBounds="0 792 612 0"
+   i:rulerOrigin="0 0"
+   i:viewOrigin="78 623"
+   overflow="visible"
+   space="preserve"
+   viewBox="0 0 455.148 454.788"
+   width="393.01099"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="indoor_pool.svg"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports"
+   version="1.0">
+  <defs
+     id="defs124">
+    <foreignObject
+       id="foreignObject8"
+       y="0"
+       x="0"
+       width="1"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       height="1">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <linearGradient
+       y2="227.73579"
+       y1="227.73579"
+       x2="455.14841"
+       x1="424.36719"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop16"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop18"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop20"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop22"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop24"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop26"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop28"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop30"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop32"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop34"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="227.37601"
+       y1="227.37601"
+       x2="0.0713"
+       x1="30.851601"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop39"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop41"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop43"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop45"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop47"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop49"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="0.071800001"
+       y1="30.8521"
+       x2="227.73579"
+       x1="227.73579"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop54"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop56"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop58"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop60"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop62"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop64"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="454.67969"
+       y1="423.89941"
+       x2="227.37601"
+       x1="227.37601"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop69"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop71"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop73"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop75"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop77"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop79"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop81"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop83"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop85"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop87"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="579"
+     inkscape:window-width="857"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.20778913"
+     inkscape:cx="-375.60482"
+     inkscape:cy="107.45506"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Hotel Icon Indoor Pool</dc:title>
+        <dc:description>Part of Hotel Icons Collection</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>hotel</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g91"
+     style="fill:navy"
+     transform="translate(-27.33301,-35.333)">
+    <path
+       style="fill:navy;fill-rule:evenodd"
+       id="path93"
+       i:knockout="Off"
+       d="M 225.619,39.761 L 30.86,100.457 L 30.86,127.961 L 225.619,67.265 L 225.619,39.761 L 225.619,39.761 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:navy;fill-rule:evenodd"
+       id="path95"
+       i:knockout="Off"
+       d="M 225.619,39.761 L 420.344,100.457 L 420.344,127.961 L 225.619,67.265 L 225.619,39.761 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:black;fill-opacity:1;fill-rule:evenodd"
+       id="path97"
+       i:knockout="Off"
+       d="M 222.057,35.333 L 27.333,96.029 L 27.333,123.533 L 222.058,62.837 L 222.058,35.333 L 222.057,35.333 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:black;fill-opacity:1;fill-rule:evenodd"
+       id="path99"
+       i:knockout="Off"
+       d="M 222.057,35.333 L 416.816,96.029 L 416.816,123.533 L 222.057,62.837 L 222.057,35.333 z "
+       clip-rule="evenodd" />
+  </g>
+  <path
+     clip-rule="evenodd"
+     d="M 380.63499,280.175 C 377.50399,281.05 373.26899,280.912 367.93099,279.76 C 362.54799,278.563 357.47499,272.666 348.43099,273.082 C 339.12099,273.403 325.97399,281.742 313.26899,281.742 C 300.38599,281.513 285.91499,272.619 272.76899,272.666 C 259.66599,272.711 247.75399,281.927 235.18199,282.156 C 222.38699,282.202 209.63799,273.678 197.10699,273.496 C 184.40199,273.174 172.35699,281.05 160.48999,280.959 C 148.62199,280.775 138.51999,272.204 126.78399,272.666 C 114.87199,273.082 101.81299,282.479 90.165992,282.939 C 78.518992,283.124 67.798992,274.371 57.474992,274.279 C 47.106992,274.093 35.195992,280.681 28.180992,282.156 C 21.121992,283.584 16.665992,283.539 14.989992,282.524 L 14.989992,306.942 C 16.666992,307.957 21.121992,308.002 28.180992,306.575 C 35.195992,305.1 47.106992,298.512 57.474992,298.696 C 67.798992,298.789 78.517992,307.542 90.165992,307.358 C 101.81299,306.804 114.87199,297.591 126.78399,297.129 C 138.51899,296.761 148.62199,305.145 160.48999,305.377 C 172.35799,305.467 184.40199,297.591 197.10699,297.913 C 209.63799,298.096 222.38699,306.619 235.18199,306.574 C 247.75399,306.297 259.66599,297.22 272.76899,297.129 C 285.91499,297.129 300.38599,305.882 313.26899,306.159 C 325.97399,306.159 339.12199,297.821 348.43099,297.498 C 357.47499,297.084 362.54799,302.979 367.93099,304.177 C 373.26899,305.329 377.50399,305.467 380.63499,304.592 L 380.63499,280.175 L 380.63499,280.175 z "
+     i:knockout="Off"
+     id="path103"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 380.63499,321.04 C 377.50399,321.917 373.26899,321.777 367.93099,320.628 C 362.54799,319.428 357.47499,313.531 348.43099,313.946 C 339.12099,314.268 325.97399,322.607 313.26899,322.607 C 300.38599,322.377 285.91499,313.486 272.76899,313.531 C 259.66599,313.624 247.75399,322.7 235.18199,322.977 C 222.38699,323.022 209.63799,314.498 197.10699,314.314 C 184.40199,314.084 172.35699,321.917 160.48999,321.825 C 148.62199,321.639 138.51999,313.071 126.78399,313.531 C 114.87199,313.946 101.81299,323.344 90.165992,323.804 C 78.518992,324.033 67.798992,315.143 57.474992,315.098 C 47.106992,314.912 35.195992,321.502 28.180992,322.977 C 21.121992,324.311 16.665992,324.449 14.989992,323.389 L 14.989992,347.807 C 16.666992,348.823 21.121992,348.868 28.180992,347.44 C 35.195992,345.965 47.106992,339.377 57.474992,339.561 C 67.798992,339.654 78.517992,348.408 90.165992,348.222 C 101.81299,347.762 114.87199,338.364 126.78399,337.949 C 138.51899,337.489 148.62199,346.057 160.48999,346.243 C 172.35799,346.196 184.40199,338.595 197.10699,338.731 C 209.63799,338.824 222.38699,347.532 235.18199,347.44 C 247.75399,347.21 259.66599,337.994 272.76899,337.949 C 285.91499,337.904 300.38599,346.795 313.26899,347.025 C 325.97399,347.025 339.12199,338.686 348.43099,338.364 C 357.47499,337.949 362.54799,343.845 367.93099,345.044 C 373.26899,346.196 377.50399,346.335 380.63499,345.458 L 380.63499,321.04 L 380.63499,321.04 z "
+     i:knockout="Off"
+     id="path111"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 376.26899,275.613 C 373.09199,276.583 368.98899,276.397 363.60699,275.246 C 358.13699,274.001 353.15099,268.197 344.06299,268.518 C 334.75399,268.841 321.60599,277.18 308.90199,277.18 C 296.01799,276.906 281.54799,268.149 268.40099,268.149 C 255.29799,268.242 243.38599,277.317 230.81299,277.594 C 218.01899,277.639 205.26899,269.118 192.73999,268.934 C 180.03399,268.612 167.98999,276.491 156.12199,276.397 C 144.43099,276.168 134.06299,267.781 122.45999,268.149 C 110.54799,268.612 97.488992,277.825 85.841992,278.378 C 74.106992,278.563 63.473992,269.81 53.106992,269.716 C 42.651992,269.532 30.915992,276.12 23.856992,277.595 C 16.797992,278.933 12.341992,279.071 10.665992,278.01 L 10.665992,302.429 C 12.341992,303.488 16.797992,303.351 23.856992,302.014 C 30.915992,300.539 42.650992,293.951 53.106992,294.135 C 63.474992,294.228 74.106992,302.981 85.841992,302.795 C 97.488992,302.336 110.54799,292.89 122.45999,292.567 C 134.06299,292.107 144.42999,300.676 156.12199,300.86 C 167.98999,300.954 180.03399,293.122 192.73999,293.352 C 205.26899,293.535 218.01899,302.057 230.81299,302.013 C 243.38599,301.736 255.29799,292.659 268.40099,292.567 C 281.54799,292.523 296.01799,301.414 308.90199,301.646 C 321.60599,301.646 334.75499,293.304 344.06299,292.983 C 353.15099,292.567 358.13699,298.465 363.60699,299.663 C 368.98899,300.815 373.09199,300.999 376.26899,300.031 L 376.26899,275.613 z "
+     i:knockout="Off"
+     id="path113"
+     style="fill:#3d258e;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 171.56299,267.183 L 272.45899,213.326 C 264.47499,195.911 259.00299,182.781 255.69499,173.429 C 252.34099,164.122 250.92799,162.049 252.82599,157.626 C 254.76599,153.065 252.07599,152.374 266.85599,146.338 C 281.67799,140.119 325.75199,122.013 340.22299,121.183 C 354.25199,120.492 353.85499,135.972 351.47299,141.317 C 348.91299,146.384 335.76699,147.859 325.79599,151.775 C 315.73599,155.645 304.48699,159.976 291.69299,164.767 L 337.92699,266.402 C 331.97099,271.423 324.07399,273.45 313.39899,272.668 C 302.58999,271.608 287.98699,261.287 274.53099,261.242 C 260.94199,261.426 245.76599,272.713 233.41399,273.084 C 220.97299,273.035 211.35399,263.085 200.98699,262.069 C 190.62199,261.056 180.87199,262.76 171.56299,267.183 z "
+     i:knockout="Off"
+     id="path105"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 352.81299,179.284 C 368.37399,179.284 381.00299,192.473 381.00299,208.724 C 381.00299,224.974 368.37299,238.162 352.81299,238.162 C 337.25099,238.162 324.62099,224.974 324.62099,208.724 C 324.62099,192.473 337.25199,179.284 352.81299,179.284"
+     i:knockout="Off"
+     id="path107"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 103.40199,269.164 C 91.445992,266.952 79.269992,263.591 66.033992,258.891 C 52.710992,253.96 29.990992,247.556 24.607992,241.107 C 19.225992,234.656 23.151992,221.295 34.004992,220.744 C 44.857992,220.053 66.607992,229.958 89.019992,237.836 C 111.34299,245.714 136.93099,255.713 166.97499,268.013 C 163.26999,270.04 158.37199,270.64 152.10799,269.811 C 145.75499,268.75 137.72499,262.9 129.56399,262.714 C 121.35699,262.576 112.75399,264.788 103.40199,269.164 z "
+     i:knockout="Off"
+     id="path109"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 167.19499,262.623 L 268.13499,208.765 C 260.19599,191.349 254.59199,178.22 251.32699,168.867 C 247.97299,159.56 246.56199,157.487 248.45899,153.064 C 250.39999,148.503 247.70899,147.812 262.48899,141.777 C 277.26699,135.511 321.47299,117.543 335.89899,116.668 C 350.01699,115.931 349.44399,131.503 347.10599,136.756 C 344.54599,141.869 331.39899,143.159 321.42899,147.214 C 311.32499,151.084 300.20799,155.414 287.36999,160.206 L 333.55999,261.84 C 327.60499,266.953 319.70699,268.936 309.03099,268.151 C 298.17799,267.094 283.70699,256.774 270.20799,256.725 C 256.75199,256.774 241.39899,268.291 229.09099,268.52 C 216.73799,268.473 206.94399,258.523 196.61999,257.511 C 186.25399,256.494 176.50399,258.198 167.19499,262.623 z "
+     i:knockout="Off"
+     id="path115"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 348.54799,174.677 C 364.10999,174.677 376.73799,187.865 376.73799,204.116 C 376.73799,220.367 364.10899,233.555 348.54799,233.555 C 332.98699,233.555 320.35699,220.367 320.35699,204.116 C 320.35699,187.865 332.98599,174.677 348.54799,174.677"
+     i:knockout="Off"
+     id="path117"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 99.077992,264.603 C 87.121992,262.391 74.945992,258.985 61.710992,254.374 C 48.386992,249.493 25.666992,242.949 20.283992,236.545 C 14.901992,229.957 18.827992,216.781 29.681992,216.182 C 40.577992,215.583 62.195992,225.258 84.651992,233.275 C 106.97499,241.201 132.51899,251.106 162.65199,263.499 C 158.94599,265.526 154.04899,266.171 147.78399,265.249 C 141.43099,264.188 133.40199,258.337 125.23999,258.154 C 117.03399,258.015 108.43099,260.227 99.077992,264.603 z "
+     i:knockout="Off"
+     id="path119"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 376.26899,316.481 C 373.09199,317.355 368.98899,317.218 363.60699,316.066 C 358.13699,314.869 353.15099,308.969 344.06299,309.384 C 334.75399,309.706 321.60599,318.045 308.90199,318.045 C 296.01799,317.77 281.54799,309.016 268.40099,309.016 C 255.29799,309.109 243.38599,318.185 230.81299,318.46 C 218.01899,318.507 205.26899,309.984 192.73999,309.799 C 180.03399,309.476 167.98999,317.355 156.12199,317.263 C 144.43099,317.033 134.06299,308.647 122.45999,309.016 C 110.54799,309.476 97.488992,318.69 85.841992,319.245 C 74.106992,319.428 63.473992,310.674 53.106992,310.582 C 42.651992,310.399 30.915992,316.986 23.856992,318.461 C 16.797992,319.891 12.341992,319.843 10.665992,318.83 L 10.665992,343.248 C 12.341992,344.261 16.797992,344.309 23.856992,342.879 C 30.915992,341.403 42.650992,334.817 53.106992,335 C 63.474992,335.092 74.106992,343.846 85.841992,343.663 C 97.488992,343.108 110.54799,333.894 122.45999,333.434 C 134.06299,333.065 144.42999,341.451 156.12199,341.681 C 167.98999,341.773 180.03399,333.894 192.73999,334.217 C 205.26899,334.402 218.01899,342.925 230.81299,342.878 C 243.38599,342.603 255.29799,333.524 268.40099,333.434 C 281.54799,333.434 296.01799,342.188 308.90199,342.463 C 321.60599,342.463 334.75499,334.124 344.06299,333.802 C 353.15099,333.479 358.13699,339.283 363.60699,340.529 C 368.98899,341.681 373.09199,341.866 376.26899,340.899 L 376.26899,316.481 z "
+     i:knockout="Off"
+     id="path121"
+     style="fill:#17057a;fill-rule:evenodd" />
+</svg>
diff --git a/data/map-icons/svg/sports/mountain_bike.svg b/data/map-icons/svg/sports/mountain_bike.svg
new file mode 100644
index 0000000..cfb974a
--- /dev/null
+++ b/data/map-icons/svg/sports/mountain_bike.svg
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 455.148 454.788"
+   height="454.788"
+   i:pageBounds="0 792 612 0"
+   i:rulerOrigin="0 0"
+   i:viewOrigin="78 623"
+   overflow="visible"
+   space="preserve"
+   viewBox="0 0 455.148 454.788"
+   width="455.148"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="mountain_bike.svg"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports">
+  <defs
+     id="defs118">
+    <foreignObject
+       id="foreignObject8"
+       y="0"
+       x="0"
+       width="1"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       height="1">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <linearGradient
+       y2="227.73579"
+       y1="227.73579"
+       x2="455.14841"
+       x1="424.36719"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop16"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop18"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop20"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop22"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop24"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop26"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop28"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop30"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop32"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop34"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="227.37601"
+       y1="227.37601"
+       x2="0.0713"
+       x1="30.851601"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop39"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop41"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop43"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop45"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop47"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop49"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="0.071800001"
+       y1="30.8521"
+       x2="227.73579"
+       x1="227.73579"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop54"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop56"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop58"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop60"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop62"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop64"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="454.67969"
+       y1="423.89941"
+       x2="227.37601"
+       x1="227.37601"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop69"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop71"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop73"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop75"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop77"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop79"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop81"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop83"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop85"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop87"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="579"
+     inkscape:window-width="857"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.83115651"
+     inkscape:cx="227.57401"
+     inkscape:cy="227.394"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Hotel Icon Mountain Biking</dc:title>
+        <dc:description>Part of Hotel Icons Collection</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>hotel</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g91">
+    <path
+       style="fill:#7f7f7f;fill-rule:evenodd"
+       id="path93"
+       i:knockout="Off"
+       d="M 198.244,215.423 L 173.224,241.739 L 209.152,263.987 C 209.44,280.979 209.476,295.415 209.404,308.268 C 209.332,321.012 210.267,333.36 208.612,339.875 C 206.776,346.246 202.384,346.139 198.748,346.211 C 194.969,346.139 189.064,344.268 186.868,339.623 C 184.637,334.799 185.788,327.418 185.608,317.879 C 185.355,308.268 185.355,296.604 185.608,282.455 C 174.232,276.73 164.584,271.654 156.519,266.795 C 148.347,261.899 141.472,258.299 137.296,253.619 C 133.155,248.795 131.716,243.539 131.716,238.68 C 131.608,233.819 133.3,230.112 136.791,224.784 C 140.319,219.276 145.683,213.659 152.451,206.568 C 159.147,199.44 169.983,187.488 176.499,182.52 C 182.8,177.516 185.968,176.291 190.431,176.472 C 194.931,176.436 199.108,179.64 202.816,182.772 C 206.343,185.868 207.82,188.856 211.671,195.192 C 215.451,201.456 219.951,209.7 225.316,220.212 C 235.72,219.204 243.423,219.204 249.111,220.212 C 254.656,221.148 257.859,222.948 258.724,226.044 C 259.48,229.14 258.759,236.052 253.648,238.429 C 248.285,240.659 233.74,239.437 227.08,239.472 C 220.385,239.544 216.892,239.796 213.687,238.429 C 210.376,236.808 209.835,234.216 207.351,230.365 C 204.725,226.513 201.736,221.579 198.244,215.423 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#7f7f7f;fill-rule:evenodd"
+       id="path95"
+       i:knockout="Off"
+       d="M 224.309,142.628 C 236.311,142.628 246.053,152.369 246.053,164.372 C 246.053,176.375 236.311,186.116 224.309,186.116 C 212.306,186.116 202.565,176.375 202.565,164.372 C 202.564,152.369 212.306,142.628 224.309,142.628"
+       clip-rule="evenodd" />
+    <path
+       style="fill:#7f7f7f;fill-rule:evenodd"
+       id="path97"
+       i:knockout="Off"
+       d="M 118,268.667 C 151.584,268.667 178.84,295.925 178.84,329.507 C 178.84,363.091 151.584,390.349 118,390.349 C 84.416,390.349 57.16,363.091 57.16,329.507 C 57.16,295.925 84.416,268.667 118,268.667 z M 118,280.44 C 145.086,280.44 167.068,302.422 167.068,329.506 C 167.068,356.592 145.086,378.574 118,378.574 C 90.914,378.574 68.932,356.592 68.932,329.506 C 68.932,302.423 90.914,280.44 118,280.44 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#7f7f7f;fill-rule:evenodd"
+       id="path99"
+       i:knockout="Off"
+       d="M 277.156,268.667 C 310.74,268.667 337.996,295.925 337.996,329.507 C 337.996,363.091 310.74,390.349 277.156,390.349 C 243.572,390.349 216.316,363.091 216.316,329.507 C 216.316,295.925 243.572,268.667 277.156,268.667 z M 277.156,280.44 C 304.242,280.44 326.224,302.422 326.224,329.506 C 326.224,356.592 304.242,378.574 277.156,378.574 C 250.07,378.574 228.088,356.592 228.088,329.506 C 228.088,302.423 250.07,280.44 277.156,280.44 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#17057a;fill-rule:evenodd"
+       id="path101"
+       i:knockout="Off"
+       d="M 196.156,211.176 L 171.1,237.491 L 207.029,259.776 C 207.209,276.731 207.389,291.204 207.281,304.02 C 207.173,316.692 208.218,329.184 206.525,335.663 C 204.688,342.036 200.297,341.929 196.661,341.999 C 192.882,341.929 187.013,340.056 184.745,335.411 C 182.405,330.624 183.737,323.136 183.485,313.632 C 183.233,304.021 183.233,292.357 183.485,278.243 C 172.109,272.555 162.462,267.372 154.397,262.548 C 146.225,257.652 139.348,254.052 135.172,249.372 C 131.032,244.583 129.592,239.292 129.592,234.468 C 129.485,229.644 131.176,225.792 134.668,220.536 C 138.16,215.028 143.668,209.411 150.364,202.32 C 157.06,195.156 167.931,183.312 174.377,178.308 C 180.676,173.196 183.844,172.188 188.309,172.224 C 192.809,172.152 196.985,175.464 200.693,178.56 C 204.221,181.692 205.697,184.572 209.549,190.944 C 213.328,197.208 217.792,205.416 223.229,215.999 C 233.561,214.991 241.301,214.991 246.989,215.999 C 252.532,216.899 255.737,218.7 256.6,221.796 C 257.428,224.819 256.672,231.876 251.561,234.216 C 246.196,236.484 231.653,235.152 224.993,235.224 C 218.298,235.259 214.841,235.62 211.565,234.216 C 208.325,232.632 207.713,229.933 205.264,226.116 C 202.637,222.265 199.648,217.331 196.156,211.176 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#17057a;fill-rule:evenodd"
+       id="path103"
+       i:knockout="Off"
+       d="M 222.148,138.308 C 234.15,138.308 243.892,148.05 243.892,160.052 C 243.892,172.054 234.15,181.796 222.148,181.796 C 210.145,181.796 200.404,172.054 200.404,160.052 C 200.404,148.05 210.146,138.308 222.148,138.308"
+       clip-rule="evenodd" />
+    <path
+       style="fill:#17057a;fill-rule:evenodd"
+       id="path105"
+       i:knockout="Off"
+       d="M 115.912,264.456 C 149.496,264.456 176.752,291.712 176.752,325.296 C 176.752,358.88 149.496,386.136 115.912,386.136 C 82.328,386.136 55.072,358.88 55.072,325.296 C 55.072,291.712 82.328,264.456 115.912,264.456 z M 115.912,276.192 C 142.998,276.192 164.98,298.174 164.98,325.258 C 164.98,352.344 142.998,374.326 115.912,374.326 C 88.826,374.326 66.844,352.344 66.844,325.258 C 66.844,298.175 88.826,276.192 115.912,276.192 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#17057a;fill-rule:evenodd"
+       id="path107"
+       i:knockout="Off"
+       d="M 275.031,264.456 C 308.615,264.456 335.873,291.712 335.873,325.296 C 335.873,358.88 308.615,386.136 275.031,386.136 C 241.449,386.136 214.192,358.88 214.192,325.296 C 214.192,291.712 241.449,264.456 275.031,264.456 z M 275.031,276.192 C 302.117,276.192 324.099,298.174 324.099,325.258 C 324.099,352.344 302.117,374.326 275.031,374.326 C 247.947,374.326 225.965,352.344 225.965,325.258 C 225.965,298.175 247.947,276.192 275.031,276.192 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#7f7f7f;fill-rule:evenodd"
+       id="path109"
+       i:knockout="Off"
+       d="M 215.813,106.596 C 218.512,104.4 224.777,97.884 235.038,86.616 C 245.261,75.276 258.94,59.76 276.653,39.384 C 288.244,57.6 296.775,70.74 303.076,79.38 C 309.232,87.912 312.652,91.656 313.48,90.612 C 320.031,84.132 325.541,78.624 330.293,73.8 C 334.973,68.976 338.607,65.016 341.488,61.776 C 355.888,81.792 367.84,98.28 378.316,112.212 C 388.611,126.036 396.785,136.512 403.121,144.216 L 363.916,108.216 C 360.676,117.432 355.385,122.184 347.896,122.616 C 340.191,122.868 328.492,112.536 319.06,110.628 C 309.628,108.72 300.232,114.588 291.843,111.42 C 283.275,108.072 276.652,94.824 268.624,91.404 C 260.56,88.02 252.388,88.02 243.819,91.404 C 234.496,96.444 225.172,101.52 215.813,106.596 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#17057a;fill-rule:evenodd"
+       id="path111"
+       i:knockout="Off"
+       d="M 213.4,101.808 C 216.099,99.54 222.364,93.096 232.625,81.792 C 242.848,70.452 256.527,54.937 274.24,34.56 C 285.832,52.74 294.363,65.988 300.664,74.592 C 306.82,83.16 310.24,86.796 311.068,85.788 C 317.621,79.308 323.129,73.8 327.881,68.976 C 332.561,64.152 336.195,60.156 339.076,56.988 C 353.476,77.004 365.428,93.492 375.904,107.424 C 386.199,121.248 394.373,131.724 400.709,139.428 L 361.504,103.392 C 358.264,112.68 352.973,117.36 345.484,117.828 C 337.851,118.116 326.115,107.676 316.683,105.804 C 307.216,103.896 297.855,109.764 289.431,106.596 C 280.935,103.212 274.275,90.072 266.247,86.616 C 258.147,83.232 250.048,83.232 241.407,86.616 C 232.084,91.656 222.76,96.732 213.4,101.808 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#3d258e;fill-rule:evenodd"
+       id="path113"
+       i:knockout="Off"
+       d="M 254.225,73.8 L 272.621,50.58 L 304.66,97.02 C 296.992,96.732 290.369,95.076 284.644,92.196 C 278.812,89.208 275.355,82.44 270.244,79.38 C 265.061,76.32 259.912,74.412 254.225,73.8 z "
+       clip-rule="evenodd" />
+    <path
+       style="fill:#3d258e;fill-rule:evenodd"
+       id="path115"
+       i:knockout="Off"
+       d="M 315.064,97.812 L 338.285,72.972 L 355.889,97.812 C 350.416,103.752 345.305,106.776 339.869,107.424 C 334.469,107.928 327.988,102.6 323.885,101.016 C 319.672,99.324 316.863,98.388 315.064,97.812 z "
+       clip-rule="evenodd" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/sports/pool.svg b/data/map-icons/svg/sports/pool.svg
new file mode 100644
index 0000000..c6f7e3c
--- /dev/null
+++ b/data/map-icons/svg/sports/pool.svg
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 455.148 454.788"
+   height="348.54398"
+   i:pageBounds="0 792 612 0"
+   i:rulerOrigin="0 0"
+   i:viewOrigin="78 623"
+   overflow="visible"
+   space="preserve"
+   viewBox="0 0 455.148 454.788"
+   width="393.01099"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="pool.svg"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports"
+   version="1.0">
+  <defs
+     id="defs124">
+    <foreignObject
+       id="foreignObject8"
+       y="0"
+       x="0"
+       width="1"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       height="1">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <linearGradient
+       y2="227.73579"
+       y1="227.73579"
+       x2="455.14841"
+       x1="424.36719"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop16"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop18"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop20"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop22"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop24"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop26"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop28"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop30"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop32"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop34"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="227.37601"
+       y1="227.37601"
+       x2="0.0713"
+       x1="30.851601"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop39"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop41"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop43"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop45"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop47"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop49"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="0.071800001"
+       y1="30.8521"
+       x2="227.73579"
+       x1="227.73579"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop54"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop56"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop58"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop60"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop62"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop64"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="454.67969"
+       y1="423.89941"
+       x2="227.37601"
+       x1="227.37601"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop69"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop71"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop73"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop75"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop77"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop79"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop81"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop83"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop85"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop87"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="579"
+     inkscape:window-width="857"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.20778913"
+     inkscape:cx="-375.60482"
+     inkscape:cy="107.45506"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Hotel Icon Indoor Pool</dc:title>
+        <dc:description>Part of Hotel Icons Collection</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>hotel</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     clip-rule="evenodd"
+     d="M 380.63499,280.175 C 377.50399,281.05 373.26899,280.912 367.93099,279.76 C 362.54799,278.563 357.47499,272.666 348.43099,273.082 C 339.12099,273.403 325.97399,281.742 313.26899,281.742 C 300.38599,281.513 285.91499,272.619 272.76899,272.666 C 259.66599,272.711 247.75399,281.927 235.18199,282.156 C 222.38699,282.202 209.63799,273.678 197.10699,273.496 C 184.40199,273.174 172.35699,281.05 160.48999,280.959 C 148.62199,280.775 138.51999,272.204 126.78399,272.666 C 114.87199,273.082 101.81299,282.479 90.165992,282.939 C 78.518992,283.124 67.798992,274.371 57.474992,274.279 C 47.106992,274.093 35.195992,280.681 28.180992,282.156 C 21.121992,283.584 16.665992,283.539 14.989992,282.524 L 14.989992,306.942 C 16.666992,307.957 21.121992,308.002 28.180992,306.575 C 35.195992,305.1 47.106992,298.512 57.474992,298.696 C 67.798992,298.789 78.517992,307.542 90.165992,307.358 C 101.81299,306.804 114.87199,297.591 126.78399,297.129 C 138.51899,296.761 148.62199,305.145 160.48999,305.377 C 172.35799,305.467 184.40199,297.591 197.10699,297.913 C 209.63799,298.096 222.38699,306.619 235.18199,306.574 C 247.75399,306.297 259.66599,297.22 272.76899,297.129 C 285.91499,297.129 300.38599,305.882 313.26899,306.159 C 325.97399,306.159 339.12199,297.821 348.43099,297.498 C 357.47499,297.084 362.54799,302.979 367.93099,304.177 C 373.26899,305.329 377.50399,305.467 380.63499,304.592 L 380.63499,280.175 L 380.63499,280.175 z "
+     i:knockout="Off"
+     id="path103"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 380.63499,321.04 C 377.50399,321.917 373.26899,321.777 367.93099,320.628 C 362.54799,319.428 357.47499,313.531 348.43099,313.946 C 339.12099,314.268 325.97399,322.607 313.26899,322.607 C 300.38599,322.377 285.91499,313.486 272.76899,313.531 C 259.66599,313.624 247.75399,322.7 235.18199,322.977 C 222.38699,323.022 209.63799,314.498 197.10699,314.314 C 184.40199,314.084 172.35699,321.917 160.48999,321.825 C 148.62199,321.639 138.51999,313.071 126.78399,313.531 C 114.87199,313.946 101.81299,323.344 90.165992,323.804 C 78.518992,324.033 67.798992,315.143 57.474992,315.098 C 47.106992,314.912 35.195992,321.502 28.180992,322.977 C 21.121992,324.311 16.665992,324.449 14.989992,323.389 L 14.989992,347.807 C 16.666992,348.823 21.121992,348.868 28.180992,347.44 C 35.195992,345.965 47.106992,339.377 57.474992,339.561 C 67.798992,339.654 78.517992,348.408 90.165992,348.222 C 101.81299,347.762 114.87199,338.364 126.78399,337.949 C 138.51899,337.489 148.62199,346.057 160.48999,346.243 C 172.35799,346.196 184.40199,338.595 197.10699,338.731 C 209.63799,338.824 222.38699,347.532 235.18199,347.44 C 247.75399,347.21 259.66599,337.994 272.76899,337.949 C 285.91499,337.904 300.38599,346.795 313.26899,347.025 C 325.97399,347.025 339.12199,338.686 348.43099,338.364 C 357.47499,337.949 362.54799,343.845 367.93099,345.044 C 373.26899,346.196 377.50399,346.335 380.63499,345.458 L 380.63499,321.04 L 380.63499,321.04 z "
+     i:knockout="Off"
+     id="path111"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 376.26899,275.613 C 373.09199,276.583 368.98899,276.397 363.60699,275.246 C 358.13699,274.001 353.15099,268.197 344.06299,268.518 C 334.75399,268.841 321.60599,277.18 308.90199,277.18 C 296.01799,276.906 281.54799,268.149 268.40099,268.149 C 255.29799,268.242 243.38599,277.317 230.81299,277.594 C 218.01899,277.639 205.26899,269.118 192.73999,268.934 C 180.03399,268.612 167.98999,276.491 156.12199,276.397 C 144.43099,276.168 134.06299,267.781 122.45999,268.149 C 110.54799,268.612 97.488992,277.825 85.841992,278.378 C 74.106992,278.563 63.473992,269.81 53.106992,269.716 C 42.651992,269.532 30.915992,276.12 23.856992,277.595 C 16.797992,278.933 12.341992,279.071 10.665992,278.01 L 10.665992,302.429 C 12.341992,303.488 16.797992,303.351 23.856992,302.014 C 30.915992,300.539 42.650992,293.951 53.106992,294.135 C 63.474992,294.228 74.106992,302.981 85.841992,302.795 C 97.488992,302.336 110.54799,292.89 122.45999,292.567 C 134.06299,292.107 144.42999,300.676 156.12199,300.86 C 167.98999,300.954 180.03399,293.122 192.73999,293.352 C 205.26899,293.535 218.01899,302.057 230.81299,302.013 C 243.38599,301.736 255.29799,292.659 268.40099,292.567 C 281.54799,292.523 296.01799,301.414 308.90199,301.646 C 321.60599,301.646 334.75499,293.304 344.06299,292.983 C 353.15099,292.567 358.13699,298.465 363.60699,299.663 C 368.98899,300.815 373.09199,300.999 376.26899,300.031 L 376.26899,275.613 z "
+     i:knockout="Off"
+     id="path113"
+     style="fill:#3d258e;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 171.56299,267.183 L 272.45899,213.326 C 264.47499,195.911 259.00299,182.781 255.69499,173.429 C 252.34099,164.122 250.92799,162.049 252.82599,157.626 C 254.76599,153.065 252.07599,152.374 266.85599,146.338 C 281.67799,140.119 325.75199,122.013 340.22299,121.183 C 354.25199,120.492 353.85499,135.972 351.47299,141.317 C 348.91299,146.384 335.76699,147.859 325.79599,151.775 C 315.73599,155.645 304.48699,159.976 291.69299,164.767 L 337.92699,266.402 C 331.97099,271.423 324.07399,273.45 313.39899,272.668 C 302.58999,271.608 287.98699,261.287 274.53099,261.242 C 260.94199,261.426 245.76599,272.713 233.41399,273.084 C 220.97299,273.035 211.35399,263.085 200.98699,262.069 C 190.62199,261.056 180.87199,262.76 171.56299,267.183 z "
+     i:knockout="Off"
+     id="path105"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 352.81299,179.284 C 368.37399,179.284 381.00299,192.473 381.00299,208.724 C 381.00299,224.974 368.37299,238.162 352.81299,238.162 C 337.25099,238.162 324.62099,224.974 324.62099,208.724 C 324.62099,192.473 337.25199,179.284 352.81299,179.284"
+     i:knockout="Off"
+     id="path107"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 103.40199,269.164 C 91.445992,266.952 79.269992,263.591 66.033992,258.891 C 52.710992,253.96 29.990992,247.556 24.607992,241.107 C 19.225992,234.656 23.151992,221.295 34.004992,220.744 C 44.857992,220.053 66.607992,229.958 89.019992,237.836 C 111.34299,245.714 136.93099,255.713 166.97499,268.013 C 163.26999,270.04 158.37199,270.64 152.10799,269.811 C 145.75499,268.75 137.72499,262.9 129.56399,262.714 C 121.35699,262.576 112.75399,264.788 103.40199,269.164 z "
+     i:knockout="Off"
+     id="path109"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 167.19499,262.623 L 268.13499,208.765 C 260.19599,191.349 254.59199,178.22 251.32699,168.867 C 247.97299,159.56 246.56199,157.487 248.45899,153.064 C 250.39999,148.503 247.70899,147.812 262.48899,141.777 C 277.26699,135.511 321.47299,117.543 335.89899,116.668 C 350.01699,115.931 349.44399,131.503 347.10599,136.756 C 344.54599,141.869 331.39899,143.159 321.42899,147.214 C 311.32499,151.084 300.20799,155.414 287.36999,160.206 L 333.55999,261.84 C 327.60499,266.953 319.70699,268.936 309.03099,268.151 C 298.17799,267.094 283.70699,256.774 270.20799,256.725 C 256.75199,256.774 241.39899,268.291 229.09099,268.52 C 216.73799,268.473 206.94399,258.523 196.61999,257.511 C 186.25399,256.494 176.50399,258.198 167.19499,262.623 z "
+     i:knockout="Off"
+     id="path115"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 348.54799,174.677 C 364.10999,174.677 376.73799,187.865 376.73799,204.116 C 376.73799,220.367 364.10899,233.555 348.54799,233.555 C 332.98699,233.555 320.35699,220.367 320.35699,204.116 C 320.35699,187.865 332.98599,174.677 348.54799,174.677"
+     i:knockout="Off"
+     id="path117"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 99.077992,264.603 C 87.121992,262.391 74.945992,258.985 61.710992,254.374 C 48.386992,249.493 25.666992,242.949 20.283992,236.545 C 14.901992,229.957 18.827992,216.781 29.681992,216.182 C 40.577992,215.583 62.195992,225.258 84.651992,233.275 C 106.97499,241.201 132.51899,251.106 162.65199,263.499 C 158.94599,265.526 154.04899,266.171 147.78399,265.249 C 141.43099,264.188 133.40199,258.337 125.23999,258.154 C 117.03399,258.015 108.43099,260.227 99.077992,264.603 z "
+     i:knockout="Off"
+     id="path119"
+     style="fill:#8f3e3e;fill-opacity:1;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 376.26899,316.481 C 373.09199,317.355 368.98899,317.218 363.60699,316.066 C 358.13699,314.869 353.15099,308.969 344.06299,309.384 C 334.75399,309.706 321.60599,318.045 308.90199,318.045 C 296.01799,317.77 281.54799,309.016 268.40099,309.016 C 255.29799,309.109 243.38599,318.185 230.81299,318.46 C 218.01899,318.507 205.26899,309.984 192.73999,309.799 C 180.03399,309.476 167.98999,317.355 156.12199,317.263 C 144.43099,317.033 134.06299,308.647 122.45999,309.016 C 110.54799,309.476 97.488992,318.69 85.841992,319.245 C 74.106992,319.428 63.473992,310.674 53.106992,310.582 C 42.651992,310.399 30.915992,316.986 23.856992,318.461 C 16.797992,319.891 12.341992,319.843 10.665992,318.83 L 10.665992,343.248 C 12.341992,344.261 16.797992,344.309 23.856992,342.879 C 30.915992,341.403 42.650992,334.817 53.106992,335 C 63.474992,335.092 74.106992,343.846 85.841992,343.663 C 97.488992,343.108 110.54799,333.894 122.45999,333.434 C 134.06299,333.065 144.42999,341.451 156.12199,341.681 C 167.98999,341.773 180.03399,333.894 192.73999,334.217 C 205.26899,334.402 218.01899,342.925 230.81299,342.878 C 243.38599,342.603 255.29799,333.524 268.40099,333.434 C 281.54799,333.434 296.01799,342.188 308.90199,342.463 C 321.60599,342.463 334.75499,334.124 344.06299,333.802 C 353.15099,333.479 358.13699,339.283 363.60699,340.529 C 368.98899,341.681 373.09199,341.866 376.26899,340.899 L 376.26899,316.481 z "
+     i:knockout="Off"
+     id="path121"
+     style="fill:#17057a;fill-rule:evenodd" />
+</svg>
diff --git a/data/map-icons/svg/sports/racquetball.svg b/data/map-icons/svg/sports/racquetball.svg
new file mode 100644
index 0000000..6b92ea0
--- /dev/null
+++ b/data/map-icons/svg/sports/racquetball.svg
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 455.148 454.788"
+   height="454.788"
+   i:pageBounds="0 792 612 0"
+   i:rulerOrigin="0 0"
+   i:viewOrigin="78 623"
+   overflow="visible"
+   space="preserve"
+   viewBox="0 0 455.148 454.788"
+   width="455.148"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="racquetball.svg"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports">
+  <defs
+     id="defs126">
+    <foreignObject
+       id="foreignObject8"
+       y="0"
+       x="0"
+       width="1"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       height="1">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <linearGradient
+       y2="227.73579"
+       y1="227.73579"
+       x2="455.14841"
+       x1="424.36719"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop16"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop18"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop20"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop22"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop24"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop26"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop28"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop30"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop32"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop34"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="227.37601"
+       y1="227.37601"
+       x2="0.0713"
+       x1="30.851601"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop39"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop41"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop43"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop45"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop47"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop49"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="0.071800001"
+       y1="30.8521"
+       x2="227.73579"
+       x1="227.73579"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop54"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop56"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop58"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop60"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop62"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop64"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="454.67969"
+       y1="423.89941"
+       x2="227.37601"
+       x1="227.37601"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop69"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop71"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop73"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop75"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop77"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop79"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop81"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop83"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop85"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop87"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="579"
+     inkscape:window-width="857"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.83115651"
+     inkscape:cx="227.57401"
+     inkscape:cy="227.394"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Hotel Icon Racquetball</dc:title>
+        <dc:description>Part of Hotel Icons Collection</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>hotel</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     clip-rule="evenodd"
+     d="M 291.666,128.313 C 291.666,144.261 279.641,157.185 264.809,157.185 C 249.977,157.185 237.954,144.261 237.954,128.313 C 237.954,112.365 249.977,99.441 264.809,99.441 C 279.641,99.441 291.666,112.366 291.666,128.313 z "
+     i:knockout="Off"
+     id="path93"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 97.949,118.954 C 97.949,126.298 92.406,132.238 85.566,132.238 C 78.726,132.238 73.181,126.298 73.181,118.954 C 73.181,111.61 78.726,105.634 85.566,105.634 C 92.406,105.634 97.949,111.61 97.949,118.954 z "
+     i:knockout="Off"
+     id="path95"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 202.277,169.498 C 191.838,165.466 181.613,164.854 171.029,167.626 C 160.445,170.434 147.486,182.854 139.314,186.094 C 131.177,189.226 125.058,189.298 122.574,186.562 C 120.162,183.754 119.765,176.266 124.769,169.498 C 129.845,162.73 140.538,151.75 152.525,146.314 C 164.549,140.914 183.162,137.566 196.122,137.314 C 209.082,137.098 221.934,140.914 229.602,144.874 C 237.198,148.87 236.838,157.546 241.481,161.002 C 246.163,164.386 253.038,161.434 257.323,165.25 C 261.606,169.102 264.415,175.51 267.007,183.718 C 269.599,191.926 265.927,203.122 272.73,214.03 C 279.679,224.938 289.003,236.71 305.779,249.058 C 314.634,237.287 318.054,231.203 323.924,223.318 C 329.756,215.434 343.508,193.762 343.508,193.762 C 343.508,193.762 336.883,175.114 342.643,164.494 C 348.44,153.946 357.872,138.106 365.18,133.714 C 372.489,129.358 382.424,136.774 391.172,143.794 C 399.992,150.85 406.723,151.21 406.147,159.094 C 405.573,166.978 394.413,180.586 387.104,189.658 C 375.979,202.546 358.124,200.782 353.444,200.782 C 349.089,206.938 340.196,221.302 335.264,229.15 C 330.332,237.07 318.92,253.451 313.268,260.398 C 307.653,267.31 306.321,269.831 301.821,270.371 C 297.284,270.803 292.821,267.635 286.413,263.243 C 279.968,258.85 270.753,252.011 263.517,244.306 C 256.246,236.566 249.621,227.746 243.249,217.342 L 226.077,240.058 C 236.804,248.662 245.876,257.014 253.796,265.619 C 261.753,274.223 270.357,281.639 273.2,291.179 C 275.971,300.719 274.063,306.407 270.536,322.427 C 266.972,338.591 257.253,372.791 252.032,386.831 C 246.884,400.69 244.653,403.499 239.719,405.299 C 234.752,406.99 224.816,406.019 222.547,397.235 C 220.352,388.343 224.6,368.183 226.508,352.739 C 228.451,337.296 230.901,321.779 233.997,305.399 L 198.321,278.399 C 177.26,308.208 160.52,331.607 147.237,349.895 C 134.024,368.075 127.149,377.868 119.481,386.832 C 111.884,395.724 107.745,401.231 101.877,402.924 C 96.009,404.58 85.856,403.248 84.705,396.768 C 83.625,390.216 85.317,383.592 95.289,364.116 C 105.333,344.425 126.177,312.997 144.141,280.308 C 162.173,247.546 181.181,211.258 202.277,169.498 z M 352.973,158.194 C 343.651,170.29 343.254,185.59 352.075,192.394 C 360.93,199.198 375.618,194.914 384.942,182.818 L 394.446,169.822 C 403.733,157.726 394.663,155.422 385.805,148.618 L 377.201,142.822 C 368.381,136.018 362.262,146.098 352.973,158.194 z "
+     i:knockout="Off"
+     id="path97"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 58.097,216.01 L 58.097,223.102 L 149.429,223.102 L 149.429,216.01 L 58.097,216.01 z "
+     i:knockout="Off"
+     id="path99"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 142.914,223.138 L 150.006,223.138 L 149.934,186.634 L 142.914,190.774 L 142.914,223.138 z "
+     i:knockout="Off"
+     id="path101"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 142.949,146.17 L 150.006,142.894 L 150.006,49.33 L 142.914,49.33 L 142.949,146.17 z "
+     i:knockout="Off"
+     id="path103"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 162.677,238.834 L 166.277,232.966 L 149.646,216.334 L 144.642,221.374 L 162.677,238.834 z "
+     i:knockout="Off"
+     id="path105"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 333.102,384.418 L 338.106,379.414 L 275.79,318.034 L 273.235,327.214 L 333.102,384.418 z "
+     i:knockout="Off"
+     id="path107"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 289.902,125.65 C 289.902,141.598 277.877,154.522 263.045,154.522 C 248.213,154.522 236.19,141.598 236.19,125.65 C 236.19,109.702 248.213,96.778 263.045,96.778 C 277.877,96.778 289.902,109.702 289.902,125.65 z "
+     i:knockout="Off"
+     id="path109"
+     style="fill:#a02c2c;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 96.15,116.29 C 96.15,123.634 90.642,129.574 83.801,129.574 C 76.961,129.574 71.417,123.634 71.417,116.29 C 71.417,108.946 76.961,102.97 83.801,102.97 C 90.642,102.97 96.15,108.946 96.15,116.29 z "
+     i:knockout="Off"
+     id="path111"
+     style="fill:#160379;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 200.513,166.834 C 190.074,162.802 179.849,162.19 169.23,164.962 C 158.646,167.77 145.721,180.19 137.549,183.43 C 129.413,186.562 123.257,186.67 120.81,183.898 C 118.398,181.09 118.001,173.602 123.005,166.834 C 128.081,160.066 138.773,149.086 150.761,143.65 C 162.785,138.25 181.361,134.902 194.357,134.65 C 207.281,134.434 220.17,138.25 227.8,142.246 C 235.396,146.206 235.074,154.882 239.717,158.338 C 244.362,161.722 251.238,158.806 255.557,162.586 C 259.842,166.438 262.651,172.846 265.243,181.054 C 267.835,189.262 264.126,200.458 270.966,211.366 C 277.878,222.274 287.239,234.046 303.978,246.394 C 312.871,234.623 316.291,228.539 322.123,220.654 C 327.955,212.769 341.744,191.098 341.744,191.098 C 341.744,191.098 335.119,172.45 340.844,161.83 C 346.639,151.282 356.073,135.442 363.379,131.086 C 370.688,126.694 380.623,134.11 389.408,141.13 C 398.191,148.186 404.959,148.546 404.347,156.43 C 403.771,164.314 392.646,177.922 385.302,186.994 C 374.214,199.882 356.359,198.118 351.679,198.118 C 347.286,204.274 338.431,218.638 333.499,226.522 C 328.565,234.405 317.155,250.786 311.503,257.733 C 305.886,264.645 304.554,267.202 300.019,267.706 C 295.519,268.138 291.054,264.97 284.611,260.578 C 278.168,256.185 268.988,249.346 261.715,241.641 C 254.479,233.901 247.856,225.081 241.483,214.677 L 224.275,237.393 C 235.004,245.997 244.111,254.349 252.031,262.954 C 259.951,271.558 268.554,278.974 271.398,288.514 C 274.207,298.054 272.298,303.743 268.771,319.762 C 265.207,335.926 255.488,370.126 250.267,384.166 C 245.119,398.025 242.886,400.834 237.954,402.634 C 232.987,404.362 223.014,403.354 220.782,394.57 C 218.587,385.678 222.797,365.518 224.742,350.074 C 226.65,334.631 229.098,319.114 232.231,302.734 L 196.554,275.734 C 175.494,305.543 158.754,328.942 145.47,347.23 C 132.258,365.411 125.382,375.238 117.714,384.167 C 110.118,393.059 105.942,398.566 100.11,400.259 C 94.243,401.915 84.09,400.583 82.938,394.103 C 81.858,387.551 83.55,380.927 93.487,361.452 C 103.567,341.76 124.375,310.332 142.375,277.643 C 160.374,244.882 179.417,208.594 200.513,166.834 z M 351.174,155.53 C 341.885,167.626 341.49,182.926 350.309,189.73 C 359.129,196.534 373.854,192.251 383.178,180.154 L 392.645,167.158 C 401.969,155.062 392.862,152.758 384.041,145.954 L 375.437,140.158 C 366.582,133.354 360.498,143.434 351.174,155.53 z "
+     i:knockout="Off"
+     id="path113"
+     style="fill:#a02c2c;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 56.333,213.346 L 56.333,220.438 L 147.665,220.438 L 147.665,213.346 L 56.333,213.346 z "
+     i:knockout="Off"
+     id="path115"
+     style="fill:navy;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 141.15,220.474 L 148.242,220.474 L 148.17,183.97 L 141.15,188.11 L 141.15,220.474 z "
+     i:knockout="Off"
+     id="path117"
+     style="fill:navy;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 141.15,143.506 L 148.242,140.23 L 148.242,46.666 L 141.15,46.666 L 141.15,143.506 z "
+     i:knockout="Off"
+     id="path119"
+     style="fill:navy;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 160.877,236.17 L 164.478,230.302 L 147.881,213.67 L 142.841,218.71 L 160.877,236.17 z "
+     i:knockout="Off"
+     id="path121"
+     style="fill:navy;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 331.338,381.754 L 336.342,376.75 L 274.026,315.37 L 271.469,324.55 L 331.338,381.754 z "
+     i:knockout="Off"
+     id="path123"
+     style="fill:navy;fill-rule:evenodd" />
+</svg>
diff --git a/data/map-icons/svg/sports/riding.svg b/data/map-icons/svg/sports/riding.svg
new file mode 100644
index 0000000..e4ff48f
--- /dev/null
+++ b/data/map-icons/svg/sports/riding.svg
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape ("http://www.inkscape.org/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="171.56784"
+   id="svg1"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/transport"
+   sodipodi:docname="horse.svg"
+   sodipodi:version="0.32"
+   width="225.88885"
+   version="1.0">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>SVG Road Signs</dc:title>
+        <dc:description>UK roadsigns</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>transport</rdf:li>
+            <rdf:li>roadsign</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org">
+            <dc:title>John Cliff</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>John Cliff</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>John Cliff</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     id="base"
+     inkscape:cx="315.08125"
+     inkscape:cy="-15.607186"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="721"
+     inkscape:window-width="1024"
+     inkscape:window-x="1918"
+     inkscape:window-y="55"
+     inkscape:zoom="0.61398209"
+     pagecolor="#ffffff"
+     showgrid="false"
+     snaptogrid="false"
+     snaptoguides="false"
+     inkscape:current-layer="svg1" />
+  <path
+     style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccc"
+     id="path720"
+     d="M 184.0703,0.75049975 C 180.94341,3.8154898 180.07753,7.2376501 178.48358,7.5851301 C 175.92933,7.0767101 171.40988,6.8590701 168.79369,8.5985901 C 168.21433,10.16098 169.96685,8.7679001 173.02274,10.44251 C 170.12745,12.70344 168.88845,9.5580701 165.27179,13.9276 C 163.97818,15.47477 165.8309,13.87018 168.43842,14.82631 C 166.1733,17.45493 165.30185,14.15557 161.30251,15.98465 C 156.97106,18.70559 156.70126,20.11805 152.12815,20.32262 C 151.17935,20.79477 153.48156,21.68296 154.67512,21.59186 C 150.86293,23.25876 144.03411,29.14132 149.29078,28.03869 C 152.30328,25.79565 153.00215,26.37449 154.67736,27.10853 C 153.74483,29.27034 151.20646,27.70159 149.21773,29.47583 C 145.56675,31.14841 146.66255,33.15977 140.77565,33.47763 C 137.10295,34.17418 141.62124,35.39074 142.35364,36.51493 C 138.71918,37.03329 135.23591,41.14868 136.84371,41.12038 C 139.67365,39.49025 142.32718,41.48941 145.31866,38.91258 C 141.54916,42.83708 134.62573,45.66649 128.71773,45.10083 C 121.85596,45.92979 114.23533,43.89105 107.4797,40.77427 C 96.994823,36.25866 90.680231,33.67154 82.445774,32.72712 C 73.264124,32.22001 66.919084,34.28582 59.984924,39.17193 C 57.077704,38.30614 55.621234,37.58391 51.148724,37.28455 C 42.290704,36.96145 34.428504,40.6922 29.032324,47.70591 C 23.792764,52.27615 20.517984,63.12393 20.191944,67.41856 C 18.827184,72.67475 18.820674,77.78897 11.406074,85.97598 C 6.323794,91.76418 -0.95220608,94.51418 0.10310392,103.77335 C -0.10636608,106.07608 0.83100392,109.09251 4.2712339,107.28014 C 6.784034,106.85468 15.579044,98.741054 17.607194,95.655784 C 22.341284,88.84709 28.201834,80.54309 31.655034,72.00601 C 34.211834,66.18952 34.653814,64.98929 36.217734,56.63208 C 37.535104,50.80459 42.852514,44.28157 52.337674,46.19458 C 51.055254,47.41598 50.502814,48.37136 49.186484,50.50708 C 43.444594,62.8931 46.698184,72.42586 51.073854,77.20695 C 50.842594,84.18404 45.032034,86.98316 40.186484,86.85083 C 36.379614,86.70591 30.192824,86.24805 29.822814,93.15578 C 29.222444,100.07316 31.305024,102.32897 30.735564,112.77218 C 30.577404,116.32358 25.560264,126.83141 30.407794,129.45767 C 30.429994,131.31384 26.372564,130.59226 24.702114,130.75708 C 21.409094,130.34478 19.008194,131.15719 18.954524,135.26469 C 18.186344,138.16558 14.758714,141.98325 15.356794,144.96828 C 23.681614,143.96825 31.927504,140.98992 37.219424,133.72519 C 39.910804,127.06744 39.833564,113.18856 40.557824,104.10352 C 42.218214,97.734744 51.105564,100.98102 55.387914,101.07713 C 60.458014,100.97296 63.876124,98.617884 68.584544,99.776994 C 66.833684,102.38986 66.395854,103.19543 63.832454,106.63313 C 60.545234,110.90935 58.519744,115.57265 64.460184,117.87935 C 72.245834,120.77002 77.545804,125.25794 83.348354,130.76409 C 90.435191,138.6621 92.005911,145.65696 93.450541,145.16333 C 95.214941,146.55564 98.256203,144.27097 98.407963,148.39016 C 98.189413,152.77299 104.5357,152.75014 106.82929,154.48155 C 108.59775,154.3722 113.15124,157.66161 112.6202,153.24953 C 113.89555,145.09771 104.73047,140.38285 100.5663,134.81476 C 94.279271,128.03515 88.435351,122.61299 81.473604,116.62075 C 79.282304,114.77749 79.135734,111.56986 81.561484,109.88208 C 89.383351,103.54268 90.078861,94.70243 96.195773,89.1681 C 100.43503,90.30481 105.51845,93.68858 111.09273,95.132084 C 119.49297,97.266304 127.74544,101.27549 136.62398,100.53833 C 142.78164,100.0725 133.22886,112.2989 132.31148,117.71555 C 133.66071,123.28107 132.64105,132.93369 131.25411,138.106 C 127.87457,144.3686 126.46594,148.41844 122.50171,153.62557 C 119.30283,159.65633 129.89816,157.17487 127.71789,162.25055 C 125.60292,165.0448 126.97556,165.43726 130.11938,166.75596 C 133.66849,167.80281 138.51387,170.67975 142.02018,171.56783 C 146.70077,166.41274 133.90244,160.59724 134.84273,154.86646 C 134.29501,149.12449 137.7843,144.17859 138.78023,138.66333 C 142.63893,130.10863 146.91505,122.25514 150.33881,113.50252 C 153.15246,108.3828 154.97177,101.74691 159.7452,98.275964 C 165.56038,95.643814 174.31086,100.88248 181.17515,103.66711 C 183.28021,104.40791 190.41578,105.8481 187.92679,108.59571 C 180.79666,111.33573 174.83453,117.90512 167.58959,120.24366 C 165.48715,120.48172 164.61128,120.96974 164.6503,124.30261 C 161.16916,124.984 159.47948,121.27072 156.3874,120.04688 C 152.36746,121.10583 148.84153,126.6898 147.52645,129.9343 C 145.72555,132.28513 154.32646,132.79378 156.43962,132.57063 C 161.32055,132.5647 164.41928,131.8697 166.57972,131.16247 C 170.07441,129.87292 173.2014,126.58667 176.03871,125.27217 C 184.0359,120.65552 194.19851,114.75018 200.85739,108.28382 C 203.15623,105.9137 204.80975,102.4368 200.52194,99.941304 C 196.61032,96.461044 190.16254,92.32512 184.49898,89.72583 C 181.34809,87.67987 180.65265,87.94266 176.59497,84.97955 C 179.26127,81.65195 179.88756,73.27072 180.2775,69.29861 C 184.47084,62.83736 186.14656,54.35263 189.74559,45.82099 C 193.50634,47.14305 199.2208,47.90841 203.13519,47.17454 C 209.67709,46.98852 213.13611,56.36914 220.12398,51.56958 C 224.85942,47.26824 214.37593,47.34698 215.51902,45.13432 C 218.17693,41.98079 221.44813,48.34617 223.89626,47.65451 C 226.99004,46.35561 226.41688,40.55872 222.62398,38.37102 C 218.66689,34.21842 209.48152,27.78104 208.49674,25.6673 C 207.089,20.98706 192.88606,13.07412 189.41629,10.02226 C 187.82442,6.7859601 189.22887,3.7324198 187.84568,0.62946975 C 187.00562,-0.13768025 185.05251,-0.32177025 184.0703,0.75049975 z " />
+</svg>
diff --git a/data/map-icons/svg/sports/skiing.svg b/data/map-icons/svg/sports/skiing.svg
new file mode 100644
index 0000000..52d5b50
--- /dev/null
+++ b/data/map-icons/svg/sports/skiing.svg
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  -->
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 455.148 454.788"
+   height="454.788"
+   i:pageBounds="0 792 612 0"
+   i:rulerOrigin="0 0"
+   i:viewOrigin="78 623"
+   overflow="visible"
+   space="preserve"
+   viewBox="0 0 455.148 454.788"
+   width="455.148"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   sodipodi:docname="ski.svg"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports">
+  <defs
+     id="defs110">
+    <foreignObject
+       id="foreignObject8"
+       y="0"
+       x="0"
+       width="1"
+       requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+       height="1">
+      <i:pgfRef
+         xlink:href="#adobe_illustrator_pgf" />
+    </foreignObject>
+    <linearGradient
+       y2="227.73579"
+       y1="227.73579"
+       x2="455.14841"
+       x1="424.36719"
+       id="XMLID_1_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop16"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop18"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop20"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop22"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop24"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop26"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop28"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop30"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop32"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop34"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="227.37601"
+       y1="227.37601"
+       x2="0.0713"
+       x1="30.851601"
+       id="XMLID_2_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop39"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop41"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop43"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop45"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop47"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop49"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="0.071800001"
+       y1="30.8521"
+       x2="227.73579"
+       x1="227.73579"
+       id="XMLID_3_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop54"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop56"
+         style="stop-color:#E2E2E2"
+         offset="0.2675" />
+      <stop
+         id="stop58"
+         style="stop-color:#D8D8D8"
+         offset="0.4824" />
+      <stop
+         id="stop60"
+         style="stop-color:#C7C7C7"
+         offset="0.679" />
+      <stop
+         id="stop62"
+         style="stop-color:#B0B0B0"
+         offset="0.8635" />
+      <stop
+         id="stop64"
+         style="stop-color:#999999"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#999999"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="454.67969"
+       y1="423.89941"
+       x2="227.37601"
+       x1="227.37601"
+       id="XMLID_4_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop69"
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <stop
+         id="stop71"
+         style="stop-color:#E2E2E2"
+         offset="0.1696" />
+      <stop
+         id="stop73"
+         style="stop-color:#D8D8D8"
+         offset="0.3059" />
+      <stop
+         id="stop75"
+         style="stop-color:#C7C7C7"
+         offset="0.4306" />
+      <stop
+         id="stop77"
+         style="stop-color:#B0B0B0"
+         offset="0.5484" />
+      <stop
+         id="stop79"
+         style="stop-color:#919191"
+         offset="0.6614" />
+      <stop
+         id="stop81"
+         style="stop-color:#6B6B6B"
+         offset="0.7707" />
+      <stop
+         id="stop83"
+         style="stop-color:#3E3E3E"
+         offset="0.8772" />
+      <stop
+         id="stop85"
+         style="stop-color:#0C0C0C"
+         offset="0.9788" />
+      <stop
+         id="stop87"
+         style="stop-color:#000000"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#E5E5E5"
+         offset="0.75" />
+      <a:midPointStop
+         style="stop-color:#000000"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="579"
+     inkscape:window-width="857"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.83115651"
+     inkscape:cx="227.57401"
+     inkscape:cy="227.394"
+     inkscape:window-x="1600"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Hotel Icon Ski Area</dc:title>
+        <dc:description>Part of Hotel Icons Collection</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>symbol</rdf:li>
+            <rdf:li>hotel</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     clip-rule="evenodd"
+     d="M 169.8939,135.8434 C 173.14062,133.16551 180.67699,125.21966 193.01908,111.48026 C 205.31666,97.651835 221.77278,78.731043 243.08032,53.883786 C 257.02471,76.097058 267.28693,92.120467 274.86661,102.65641 C 282.27186,113.06065 286.38589,117.62622 287.38192,116.35313 C 295.26233,108.45117 301.89049,101.73451 307.60683,95.851945 C 313.23655,89.969379 317.60801,85.140407 321.07366,81.189429 C 338.39589,105.59769 352.77334,125.70377 365.37526,142.69298 C 377.75945,159.55048 387.59222,172.32531 395.214,181.71985 L 348.05303,137.82011 C 344.15553,149.05844 337.79081,154.85321 328.78205,155.38 C 319.51345,155.6873 305.44034,143.08808 294.09428,140.76139 C 282.74822,138.4347 271.44547,145.59036 261.35407,141.72718 C 251.04734,137.64451 243.08032,121.4894 233.42318,117.31892 C 223.72273,113.19235 213.89236,113.19235 203.58443,117.31892 C 192.36829,123.46367 181.15215,129.65353 169.8939,135.8434 z "
+     i:knockout="Off"
+     id="path93"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 171.725,140.952 C 166,143.652 161.141,147.144 156.856,151.572 C 152.537,155.964 148.397,159.384 146.237,167.268 C 143.968,175.08 143.213,185.268 143.68,198.264 L 90.184,198.264 C 92.02,205.032 95.225,210.324 99.94,214.428 C 104.585,218.46 110.344,221.196 118.192,222.492 C 125.968,223.752 138.28,223.608 146.237,221.628 C 154.157,219.468 160.384,215.508 165.317,209.748 L 190.373,231.816 C 180.005,242.255 172.553,251.039 167.477,258.996 C 162.329,266.736 158.477,270.805 160.241,278.543 C 162.005,286.283 167.44,292.871 178.096,305.256 C 188.716,317.641 203.657,332.94 223.492,351.985 C 198.221,363.432 176.8,372.36 158.116,379.596 C 139.468,386.725 124.924,393.096 112.252,394.428 C 99.436,395.543 88.889,387.768 82.12,386.795 C 75.316,385.932 71.968,386.039 71.932,388.92 C 71.968,391.764 73.84,401.016 82.12,403.356 C 90.363,405.481 92.488,410.917 120.964,402.024 C 149.656,392.879 210.856,364.981 251.787,349.717 C 292.504,334.451 329.187,321.817 363.641,311.233 L 355.108,307.417 C 348.989,309.146 337.864,312.349 321.592,317.173 C 305.176,321.96 284.08,328.333 257.477,336.288 C 251.5,327.649 246.172,321.169 241.348,316.309 C 236.416,311.448 232.348,308.532 228.604,307.416 C 218.237,295.787 211.721,287.291 209.057,281.496 C 206.464,275.736 210.712,275.267 212.477,273 C 213.989,270.695 213.557,271.955 218.416,267.492 C 223.275,262.668 235.912,251.795 241.347,245.424 C 246.603,239.053 250.492,236.028 250.24,230.123 C 249.916,224.148 246.388,217.632 239.656,210.18 L 297.797,210.18 L 301.649,226.308 L 305.897,211.44 L 333.04,208.488 L 307.985,204.672 L 300.784,189.372 L 297.798,203.376 L 231.161,202.944 C 218.921,188.256 207.978,175.944 198.041,165.576 C 188.069,155.136 179.393,147.072 171.725,140.952 z "
+     i:knockout="Off"
+     id="path95"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 131.932,100.268 C 146.817,100.268 158.897,112.348 158.897,127.232 C 158.897,142.116 146.817,154.196 131.932,154.196 C 117.048,154.196 104.969,142.116 104.969,127.232 C 104.969,112.348 117.048,100.268 131.932,100.268"
+     i:knockout="Off"
+     id="path97"
+     style="fill:#7f7f7f;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 166.792,138.828 C 161.068,141.528 156.208,145.02 151.924,149.448 C 147.604,153.804 143.464,157.332 141.305,165.18 C 139.036,172.992 138.28,183.18 138.748,196.176 L 85.252,196.176 C 87.088,202.98 90.292,208.164 95.008,212.304 C 99.653,216.336 105.412,219.072 113.26,220.368 C 121.036,221.628 133.348,221.484 141.305,219.504 C 149.225,217.344 155.452,213.384 160.384,207.624 L 185.44,229.691 C 175.073,240.132 167.621,248.916 162.544,256.871 C 157.397,264.648 153.544,268.572 155.309,276.42 C 157.108,284.123 162.401,290.82 173.128,303.168 C 183.784,315.588 198.652,330.779 218.561,349.859 C 193.289,361.308 171.869,370.236 153.184,377.472 C 134.537,384.564 119.993,391.042 107.321,392.339 C 94.505,393.384 83.957,385.644 77.188,384.671 C 70.384,383.698 67.037,383.95 67,386.794 C 67.036,389.64 68.908,398.892 77.188,401.232 C 85.432,403.427 87.557,408.828 116.032,399.935 C 144.725,390.828 205.925,362.82 246.856,347.591 C 287.608,332.327 324.184,319.691 358.672,309.107 L 350.176,305.291 C 344.057,307.02 332.932,310.225 316.66,315.049 C 300.244,319.836 279.148,326.207 252.545,334.164 C 246.568,325.523 241.24,319.043 236.416,314.184 C 231.484,309.325 227.416,306.409 223.672,305.291 C 213.233,293.627 206.897,285.275 204.124,279.408 C 201.389,273.611 205.889,273.217 207.508,270.875 C 208.985,268.572 208.66,269.832 213.485,265.367 C 218.344,260.543 230.981,249.672 236.416,243.301 C 241.672,236.928 245.561,233.905 245.309,228 C 244.985,222.024 241.493,215.508 234.688,208.056 L 292.864,208.056 L 296.68,224.184 L 300.928,209.316 L 328.108,206.364 L 303.053,202.548 L 295.852,187.248 L 292.864,201.252 L 226.193,200.82 C 213.918,186.132 203.082,173.82 193.109,163.452 C 183.137,153.012 174.46,144.948 166.792,138.828 z "
+     i:knockout="Off"
+     id="path99"
+     style="fill:#782121;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 127.132,98.108 C 142.016,98.108 154.096,110.188 154.096,125.072 C 154.096,139.956 142.016,152.036 127.132,152.036 C 112.248,152.036 100.168,139.956 100.168,125.072 C 100.168,110.188 112.249,98.108 127.132,98.108"
+     i:knockout="Off"
+     id="path101"
+     style="fill:#782121;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 166.99243,130.00473 C 170.23914,127.23905 177.77552,119.38099 190.1176,105.59647 C 202.41518,91.768049 218.8713,72.847258 240.17885,48 C 254.12324,70.169373 264.38546,86.32448 271.96514,96.81652 C 279.37039,107.26466 283.48442,111.69854 284.48045,110.46934 C 292.36326,102.56739 298.98902,95.850726 304.70535,89.96816 C 310.33508,84.085593 314.70653,79.212721 318.17218,75.349543 C 335.49441,99.757804 349.87186,119.86389 362.47378,136.85309 C 374.86038,153.71059 384.69075,166.48542 392.31253,175.87997 L 345.15155,131.93632 C 341.25405,143.26245 334.88934,148.96942 325.88058,149.54012 C 316.69859,149.89132 302.58338,137.16039 291.23491,134.8776 C 279.84675,132.55092 268.5861,139.70657 258.4526,135.8434 C 248.23248,131.71682 240.22095,115.69341 230.56381,111.48026 C 220.82005,107.35368 211.0775,107.35368 200.68296,111.48026 C 189.46682,117.625 178.25067,123.81487 166.99243,130.00473 z "
+     i:knockout="Off"
+     id="path103"
+     style="fill:#17057a;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 216.09975,95.850726 L 238.22889,67.535388 L 276.76965,124.16606 C 267.54556,123.81487 259.57854,121.79548 252.69175,118.2835 C 245.67625,114.63982 241.51771,106.38667 235.36952,102.65519 C 229.13472,98.923708 222.94203,96.597022 216.09975,95.850726 z "
+     i:knockout="Off"
+     id="path105"
+     style="fill:#3d258e;fill-rule:evenodd" />
+  <path
+     clip-rule="evenodd"
+     d="M 289.28616,125.13186 L 317.21946,94.884931 L 338.39589,125.13186 C 331.81224,132.37532 325.66405,136.0629 319.12491,136.85309 C 312.62907,137.46769 304.83286,130.97052 299.89723,129.03894 C 294.82928,126.97565 291.45024,125.83425 289.28616,125.13186 z "
+     i:knockout="Off"
+     id="path107"
+     style="fill:#3d258e;fill-rule:evenodd" />
+</svg>
diff --git a/data/map-icons/svg/sports/soccer.svg b/data/map-icons/svg/sports/soccer.svg
new file mode 100644
index 0000000..e96a537
--- /dev/null
+++ b/data/map-icons/svg/sports/soccer.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  --><svg enable-background="new 0 0 105.66 100.619" height="100.619" i:pageBounds="0 792 612 0" i:rulerOrigin="0 0" i:viewOrigin="253 446" overflow="visible" space="preserve" viewBox="0 0 105.66 100.619" width="105.66" xmlns="http://www.w3.org/2000/svg" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" xmlns:graph="http://ns.adobe.com/Graphs/1.0/" xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:x="http://ns.adobe.com/Extensibility/1.0/" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <metadata>
+    <rdf:RDF xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <cc:Work rdf:about="">
+        <dc:title>Soccer Ball</dc:title>
+        <dc:description>Soccer Ball.</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>sports</rdf:li>
+            <rdf:li>toy</rdf:li>
+            <rdf:li>ball</rdf:li>
+            <rdf:li>soccer</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://www.openclipart.org/">
+            <dc:title>Open Clip Art Project</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent rdf:about="http://web.resource.org/cc/PublicDomain">
+            <dc:title>Gerald G.</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent rdf:about="http://web.resource.org/cc/PublicDomain">
+            <dc:title>Public Domain</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date>2005-04-22</dc:date>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain"/>
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g i:dimmedPercent="50" i:layer="yes" i:rgbTrio="#4F008000FFFF" id="Layer_1">
+    <g>
+      <path clip-rule="evenodd" d="     M52.83,0.018c29.152,0,52.813,22.531,52.813,50.292c0,27.76-23.66,50.292-52.813,50.292S0.018,78.07,0.018,50.31     C0.018,22.549,23.678,0.018,52.83,0.018" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M25.254,11.218c-1.548,0.648-2.664,1.332-3.78,2.196c-1.116,0.756-1.908,1.692-2.664,2.664c-0.864,0.9-1.584,1.872-2.16,2.916     l7.128-1.836h0C24.246,15.178,24.75,13.198,25.254,11.218z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M32.886,8.086L48.87,4.198l11.016,9.108L56.97,24.934l-12.24,5.688l-15.48-4.104l-2.304-9.468L32.886,8.086z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M63.342,14.026l-1.943,11.016L73.53,37.174l12.96-1.944l3.996-14.544L76.302,9.058L63.342,14.026z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M76.05,41.278l12.24-2.196l7.272,12.24L85.518,67.918l-12.6-1.188l-4.607-10.549L76.05,41.278z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M94.482,75.91l-5.832-6.768l10.188-17.209l3.528-1.943c0.036,4.176-0.288,7.703-0.972,11.268     c-0.828,3.527-2.053,6.732-3.276,9.324C96.895,73.029,95.778,74.758,94.482,75.91z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M33.894,63.418L48.33,52.762l16.236,4.248l5.184,12.205l-8.964,11.771l-20.232-4.248L33.894,63.418z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M64.962,97.113c-2.988,0.434-6.012,0.756-9.216,0.828c-3.312,0.072-6.84,0-10.044-0.359c-3.42-0.504-6.588-1.404-9.36-2.305     c-2.772-0.971-4.896-2.051-6.768-3.383l-0.252-4.861l9.576-7.271l21.457,3.781l6.155,9.432L64.962,97.113z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M14.31,43.726l13.212-13.428l14.292,3.996l3.636,15.48L30.546,61.295l-12.96-0.361L14.31,43.726z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+      <path clip-rule="evenodd" d="     M9.45,71.123c-1.152,0.467-2.232-0.758-3.384-3.277c-1.26-2.736-2.952-8.244-3.528-12.348c-0.54-4.141-0.504-8.172,0.252-12.24     l7.524,2.412l3.996,16.705L9.45,71.123z" fill="#FFFFFF" fill-rule="evenodd" i:knockout="Off" stroke="#000000" stroke-miterlimit="10" stroke-width="0.036"/>
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/sports/swimming.svg b/data/map-icons/svg/sports/swimming.svg
new file mode 100644
index 0000000..bd02f6a
--- /dev/null
+++ b/data/map-icons/svg/sports/swimming.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="171"
+   height="186"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/sports"
+   sodipodi:docname="swimming.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="50"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.56"
+     inkscape:cx="53.974005"
+     inkscape:cy="92.695159"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="823"
+     inkscape:window-x="485"
+     inkscape:window-y="49"
+     width="200px"
+     height="200px"
+     inkscape:showpageshadow="true"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="false"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     inkscape:grid-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-56.02747,-58.56237)">
+    <path
+       style="fill:#0072ff;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 95.763711,95.39705 L 71.02747,234.56237 L 211.19951,234.56237 L 190.58597,95.39705 L 95.763711,95.39705 z "
+       id="path2778"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#00cbff;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.7047621px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 104.11589,104.1877 L 83.894366,225.77173 L 198.48297,225.77173 L 181.63171,104.1877 L 104.11589,104.1877 z "
+       id="path2781"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g4637"
+       transform="matrix(0.813114,0,0,1.122946,-26.10526,67.69702)"
+       style="fill:none;fill-opacity:1;stroke:black;stroke-width:5.03525639;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+      <path
+         id="path3668"
+         d="M 224.88873,9.3121198 L 224.88873,59.762064"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3670"
+         d="M 193.50101,9.2432488 L 193.50101,59.693194"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3696"
+         d="M 193.73075,13.041386 L 224.81912,12.86954"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3698"
+         d="M 193.57374,23.18033 L 224.66211,23.008483"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3700"
+         d="M 193.88776,33.319275 L 224.97614,33.147428"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3702"
+         d="M 193.88776,43.458218 L 224.97614,43.286372"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3704"
+         d="M 193.57374,53.425315 L 224.66211,53.253469"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5.03525639;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/sports/tennis.svg b/data/map-icons/svg/sports/tennis.svg
new file mode 100644
index 0000000..fe285a2
--- /dev/null
+++ b/data/map-icons/svg/sports/tennis.svg
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="51.939621"
+   id="svg1065"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg/sports"
+   sodipodi:docname="tennis.svg"
+   sodipodi:version="0.32"
+   space="preserve"
+   width="65.389267"
+   inkscape:version="0.44.1"
+   version="1.0">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>tennis_racket</dc:title>
+        <dc:description />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li />
+            <rdf:li>sports</rdf:li>
+            <rdf:li>sport</rdf:li>
+            <rdf:li>recreation</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org">
+            <dc:title>Franck Doucet</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Franck Doucet</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Franck Doucet</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs1067">
+    <linearGradient
+       id="linearGradient660">
+      <stop
+         id="stop661"
+         offset="0"
+         style="stop-color:#5a3a00;stop-opacity:1;" />
+      <stop
+         id="stop662"
+         offset="1"
+         style="stop-color:#b55700;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient618">
+      <stop
+         id="stop619"
+         offset="0"
+         style="stop-color:#002fff;stop-opacity:1;" />
+      <stop
+         id="stop620"
+         offset="1"
+         style="stop-color:#00d2ff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient610">
+      <stop
+         id="stop611"
+         offset="0"
+         style="stop-color:#666767;stop-opacity:1;" />
+      <stop
+         id="stop612"
+         offset="1"
+         style="stop-color:#f3f2f2;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient613"
+       x1="104.97143"
+       x2="620.09906"
+       xlink:href="#linearGradient610"
+       y1="291.65118"
+       y2="460.67682"
+       gradientTransform="scale(1.090974,0.916612)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient617"
+       x1="56.804844"
+       x2="94.860718"
+       xlink:href="#linearGradient618"
+       y1="612.43427"
+       y2="612.43427"
+       gradientTransform="scale(0.91691,1.090619)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="647.54254"
+       cy="84.237411"
+       fx="647.54254"
+       fy="84.237411"
+       id="radialGradient621"
+       r="314.27206"
+       xlink:href="#linearGradient618"
+       gradientTransform="scale(0.817182,1.223717)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient659"
+       x1="43.973091"
+       x2="69.677185"
+       xlink:href="#linearGradient660"
+       y1="697.01044"
+       y2="697.01044"
+       gradientTransform="scale(1.054979,0.947886)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient660"
+       id="linearGradient1986"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.532197e-2,-0.104017,-0.101668,-2.091418e-2,76.78139,70.7629)"
+       x1="43.973091"
+       y1="697.01044"
+       x2="69.677185"
+       y2="697.01044" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient660"
+       id="linearGradient1989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.924665e-2,-7.906098e-2,-0.13376,-2.751583e-2,76.78139,70.7629)"
+       x1="128.54153"
+       y1="493.01468"
+       x2="174.81496"
+       y2="493.01468" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient660"
+       id="linearGradient1992"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.89333e-2,-7.77733e-2,-0.135974,-2.797136e-2,76.78139,70.7629)"
+       x1="74.654968"
+       y1="509.15399"
+       x2="122.01689"
+       y2="509.15399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient660"
+       id="linearGradient1995"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.939954e-2,-7.96886e-2,-0.132706,-2.729906e-2,76.78139,70.7629)"
+       x1="154.63251"
+       y1="484.70239"
+       x2="200.81082"
+       y2="484.70239" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient660"
+       id="linearGradient1998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.948362e-2,-8.003418e-2,-0.132134,-2.718118e-2,76.78139,70.7629)"
+       x1="180.73508"
+       y1="486.52179"
+       x2="214.42944"
+       y2="486.52179" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient660"
+       id="linearGradient2001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.912323e-2,-7.855366e-2,-0.134623,-2.769348e-2,76.78139,70.7629)"
+       x1="102.09601"
+       y1="501.86938"
+       x2="148.66516"
+       y2="501.86938" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient618"
+       id="linearGradient2037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.00622e-2,-9.07853e-2,-0.117472,-2.193593e-2,76.78139,70.7629)"
+       x1="56.804844"
+       y1="612.43427"
+       x2="94.860718"
+       y2="612.43427" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient618"
+       id="radialGradient2041"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.724149e-2,-6.362365e-2,-0.103646,7.879606e-2,76.78139,70.7629)"
+       cx="647.54254"
+       cy="84.237411"
+       fx="647.54254"
+       fy="84.237411"
+       r="314.27206" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient610"
+       id="linearGradient2044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.618597e-2,-0.107566,-9.831403e-2,-2.022421e-2,76.78139,70.7629)"
+       x1="104.97143"
+       y1="291.65118"
+       x2="620.09906"
+       y2="460.67682" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     inkscape:zoom="5.7470708"
+     inkscape:cx="60.459233"
+     inkscape:cy="20.053704"
+     inkscape:window-width="1212"
+     inkscape:window-height="1047"
+     inkscape:window-x="1811"
+     inkscape:window-y="24"
+     inkscape:current-layer="svg1065" />
+  <path
+     d="M 53.158477,25.878914 C 46.066697,33.454049 36.263843,33.310133 31.837007,30.488164 C 36.815667,36.172899 47.933907,33.727631 55.613937,25.668207 C 62.705727,18.093089 65.303207,3.7839517 53.777467,1.4219016 C 63.477777,6.5392754 60.250277,18.303804 53.158477,25.878914 z "
+     id="path609"
+     sodipodi:nodetypes="ccccc"
+     style="font-size:12px;fill:gray;fill-rule:evenodd;stroke-width:1" />
+  <path
+     d="M 58.577367,3.6217882 C 53.192257,-1.0057891 43.015187,1.435755 35.846264,9.0751475 C 28.677344,16.714543 27.231279,26.658898 32.616395,31.286465 C 38.001507,35.91405 48.178577,33.472476 55.347497,25.833092 C 62.516417,18.193697 63.962477,8.2493603 58.577367,3.6217882 z M 57.279877,2.1040482 C 50.226957,-1.9247174 41.642847,-0.2653442 33.644525,7.9255817 C 25.646219,16.116486 24.558829,23.274541 28.880541,29.946556 C 33.013195,36.320112 46.851207,35.343116 55.301357,26.389121 C 63.299667,18.198203 64.218587,6.1986038 57.279877,2.1040482 z "
+     id="path1074"
+     sodipodi:nodetypes="ccscsccscc"
+     style="font-size:12px;fill:url(#linearGradient2044);fill-rule:evenodd;stroke-width:1" />
+  <path
+     d="M 39.195957,34.042511 C 30.192298,34.713325 23.94431,38.340097 13.288547,44.485597 C 16.490981,43.215417 13.599078,40.202423 12.038715,41.009734 C 19.769129,32.672695 25.158776,22.31503 28.6612,14.432467 C 29.685248,15.479099 30.710513,15.747723 31.638089,14.872112 C 30.274219,17.310888 28.742165,22.131796 29.50476,25.762345 C 29.096416,26.377503 28.049706,26.553854 27.261671,26.322706 C 26.935305,25.69028 26.429372,25.560251 25.15102,27.950844 C 22.735787,31.828067 20.812658,34.939553 18.05278,38.395465 C 17.858524,38.720949 17.908754,39.13305 18.174808,38.991696 C 22.425647,36.825799 26.283404,34.94952 28.395007,34.108912 C 29.450807,33.688589 30.334691,32.830898 29.920232,31.139676 C 30.62268,31.890962 31.594563,32.16229 32.346553,30.91053 C 35.681222,32.166908 36.542177,32.103476 37.918117,32.192765 C 39.345327,32.418447 39.760937,33.215167 39.195957,34.042511 z "
+     id="path1070"
+     sodipodi:nodetypes="ccccccccccscccc"
+     style="font-size:12px;fill:url(#radialGradient2041);fill-opacity:1;fill-rule:evenodd" />
+  <path
+     d="M 15.353374,40.324425 C 16.021847,40.879134 16.314809,42.808882 15.95191,43.062459 L 6.0202031,51.487906 C 5.7460171,51.701798 4.9283761,51.981601 5.3223261,51.507559 C 5.5399871,51.01587 5.5787731,49.721748 5.1078001,49.283813 C 4.4406781,48.714732 2.8332021,48.36134 2.2834091,48.592033 L 12.709234,40.081502 C 12.801333,40.027531 12.927768,39.908823 13.053524,39.912675 C 13.764818,39.64013 15.118814,40.101418 15.353374,40.324425 z "
+     id="path614"
+     sodipodi:nodetypes="ccccscccs"
+     style="font-size:12px;fill:gray;fill-rule:evenodd" />
+  <path
+     d="M 6.1739521,50.980375 C 6.3551941,51.623099 5.3451421,52.045719 4.6367031,51.916302 L 3.4335151,51.696508 C 2.7250631,51.567087 2.5966171,50.926124 2.4153631,50.28339 L 2.0740441,49.07304 C 1.8927891,48.430306 2.9028581,48.007691 3.6113101,48.137113 L 4.8144981,48.356911 C 5.5229231,48.486328 5.6513951,49.127291 5.8326381,49.77002 L 6.1739521,50.980375 z "
+     id="path616"
+     sodipodi:nodetypes="cssssssss"
+     style="font-size:12px;fill:url(#linearGradient2037);fill-opacity:1;fill-rule:evenodd" />
+  <path
+     d="M 32.826384,31.151736 L 60.149807,8.3794952"
+     id="path625"
+     sodipodi:nodetypes="cc"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 29.336463,23.162481 L 54.589147,1.9827278"
+     id="path631"
+     sodipodi:nodetypes="cc"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 39.603047,32.648525 L 59.838237,15.654239"
+     id="path633"
+     sodipodi:nodetypes="cc"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 50.373547,29.099937 L 38.738047,6.5295209"
+     id="path636"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 43.115747,32.256379 L 32.752863,12.886567"
+     id="path642"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 54.728557,25.127047 L 43.470227,3.5553353"
+     id="path647"
+     sodipodi:nodetypes="cc"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 59.083257,18.215284 L 50.292047,1.4057773"
+     id="path652"
+     sodipodi:nodetypes="cc"
+     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.10537922pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 11.676495,46.680503 L 9.5281241,48.506576 C 9.7616931,48.265859 8.0282811,47.003663 7.7051101,46.782774 C 7.3889311,46.612906 5.4047501,46.008064 5.2284911,46.209394 L 7.5483031,44.324433 C 7.7757271,44.239625 9.5129721,44.678352 9.8370241,44.885642 C 10.12769,45.116278 11.986637,46.451887 11.676495,46.680503 z "
+     id="path663"
+     sodipodi:nodetypes="ccsccsc"
+     style="font-size:12px;fill:url(#linearGradient2001);fill-rule:evenodd" />
+  <path
+     d="M 15.988593,43.067846 C 16.085841,42.799085 14.613062,41.515622 14.289887,41.294731 C 13.973712,41.124863 12.078742,40.569394 11.90247,40.770722 L 12.765974,40.046958 C 13.295598,39.528526 15.154762,40.016073 15.440535,40.29232 C 15.724897,40.517621 16.370632,42.42114 15.988593,43.067846 z "
+     id="path669"
+     sodipodi:nodetypes="csccsc"
+     style="font-size:12px;fill:url(#linearGradient1998);fill-rule:evenodd" />
+  <path
+     d="M 15.946088,43.115816 L 13.801778,44.867842 C 14.035352,44.627124 12.402985,43.341852 12.079814,43.120964 C 11.763638,42.951094 9.8365231,42.389013 9.6602641,42.590344 L 11.980084,40.705383 C 12.207503,40.620576 13.88768,41.016541 14.211728,41.223834 C 14.502393,41.454466 16.256234,42.887195 15.946088,43.115816 z "
+     id="path670"
+     sodipodi:nodetypes="ccsccsc"
+     style="font-size:12px;fill:url(#linearGradient1995);fill-rule:evenodd" />
+  <path
+     d="M 9.4928551,48.455465 L 7.3078741,50.374573 C 7.5414391,50.133856 5.6228921,48.743189 5.2997131,48.5223 C 4.9835291,48.352428 2.9936161,47.979031 2.8173581,48.180361 L 5.2659191,46.182316 C 5.4933511,46.097508 7.2646331,46.465692 7.5886851,46.672983 C 7.8793501,46.903617 9.8029961,48.226841 9.4928551,48.455465 z "
+     id="path671"
+     sodipodi:nodetypes="ccsccsc"
+     style="font-size:12px;fill:url(#linearGradient1992);fill-rule:evenodd" />
+  <path
+     d="M 13.815109,44.870594 L 11.672248,46.697791 C 11.905822,46.457078 10.238349,45.177432 9.9151751,44.956539 C 9.5990001,44.786672 7.6308841,44.185138 7.4546251,44.386466 L 9.7475931,42.542512 C 9.9750031,42.457702 11.723036,42.852118 12.047088,43.059412 C 12.337749,43.290044 14.125238,44.641972 13.815109,44.870594 z "
+     id="path672"
+     sodipodi:nodetypes="ccsccsc"
+     style="font-size:12px;fill:url(#linearGradient1989);fill-rule:evenodd" />
+  <path
+     d="M 7.3407891,50.33747 L 6.1218271,51.424527 C 6.3553891,51.183805 5.7988211,49.565248 5.6683811,49.170999 C 5.5634951,48.882081 5.3476421,48.659089 5.0685961,48.400646 C 5.2781551,48.421822 7.4769611,49.941474 7.3407891,50.33747 z "
+     id="path673"
+     sodipodi:nodetypes="ccscc"
+     style="font-size:12px;fill:url(#linearGradient1986);fill-rule:evenodd" />
+</svg>
diff --git a/data/map-icons/svg/transport/airport.svg b/data/map-icons/svg/transport/airport.svg
new file mode 100644
index 0000000..6ca0f87
--- /dev/null
+++ b/data/map-icons/svg/transport/airport.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+<symbol
+  id="symbol-airport"
+  viewBox="5 5 10 10"
+  fill="black"
+  fill-opacity="1"
+  fill-rule="evenodd"
+  stroke="none">
+	<path d="M 9.2,5 C 9.2,4.5 9.8,3.2 10,3 L 9,3 L 8,4 L 5.5,4 L 8,0 L 6,0 L 3,4 C 2,4 1,4.2 0.5,4.5 C 0,5 0,5 0.5,5.5 C 1,5.8 2,6 3,6 L 6,10 L 8,10 L 5.5,6 L 7.8,6 L 9,7 L 10,7 C 9.8,6.8 9.2,5.5 9.2,5 z " />
+</symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/transport/bridge.svg b/data/map-icons/svg/transport/bridge.svg
new file mode 100644
index 0000000..8951c4c
--- /dev/null
+++ b/data/map-icons/svg/transport/bridge.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2170"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/transport"
+   sodipodi:docname="bridge.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2172" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="37.896548"
+     inkscape:cy="16.586709"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="197"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata2175">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-248.20068,-550.15906)">
+    <path
+       style="font-size:12px;fill:#0000ff;fill-rule:evenodd;stroke-width:10.30560017"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       id="path624"
+       d="M 264.21115,580.01847 C 263.39237,580.87121 261.49042,580.88404 260.76006,580.03851 C 260.36357,579.57905 259.28672,579.5603 258.83811,579.98441 C 258.13335,580.84986 256.18786,580.86298 255.45685,580.01245 C 255.04363,579.53804 253.91093,579.5328 253.50054,580.01847 C 253.26877,579.88556 253.03701,579.75264 252.80524,579.61974 C 253.16619,579.20115 253.83636,578.99572 254.47869,578.99859 C 255.12286,578.9973 255.8101,579.20075 256.16007,579.62975 C 256.56322,580.08869 257.6503,580.10274 258.08466,579.6538 C 258.79645,578.80034 260.74452,578.81619 261.46591,579.6538 C 261.87481,580.12394 262.96281,580.12247 263.45848,579.64777 C 263.87682,579.20115 264.547,578.99572 265.18931,578.99859 C 265.83348,578.9973 266.52075,579.20075 266.87068,579.62975 C 267.27384,580.08869 268.36091,580.10274 268.79529,579.6538 C 269.50708,578.80034 271.45515,578.81619 272.17653,579.6538 C 272.58545,580.12394 272.20103,580.88404 271.47067,580.03851 C 271.07418,579.57905 269.99736,579.5603 269.54874,579.98441 C 268.84397,580.84986 266.89847,580.86298 266.16748,580.01245 C 265.75424,579.53804 264.62154,579.5328 264.21115,580.01847 z " />
+    <path
+       style="font-size:12px;fill:#0000ff;fill-rule:evenodd;stroke-width:10.30560017"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       id="path625"
+       d="M 264.21115,578.4412 C 263.39237,579.29397 261.49042,579.30679 260.76006,578.46125 C 260.36357,578.0018 259.28672,577.98304 258.83811,578.40714 C 258.13335,579.2726 256.18786,579.28571 255.45685,578.43521 C 255.04363,577.96077 253.91093,577.95556 253.50054,578.4412 C 253.26877,578.3083 253.03701,578.17538 252.80524,578.04246 C 253.16619,577.6239 253.83636,577.41846 254.47869,577.42133 C 255.12286,577.42003 255.8101,577.62349 256.16007,578.0525 C 256.56322,578.51144 257.6503,578.52547 258.08466,578.07655 C 258.79645,577.2231 260.74452,577.23894 261.46591,578.07655 C 261.87481,578.5467 262.96281,578.54522 263.45848,578.07052 C 263.87682,577.6239 264.547,577.41846 265.18931,577.42133 C 265.83348,577.42003 266.52075,577.62349 266.87068,578.0525 C 267.27384,578.51144 268.36091,578.52547 268.79529,578.07655 C 269.50708,577.2231 271.45515,577.23894 272.17653,578.07655 C 272.58545,578.5467 272.20103,579.30679 271.47067,578.46125 C 271.07418,578.0018 269.99736,577.98304 269.54874,578.40714 C 268.84397,579.2726 266.89847,579.28571 266.16748,578.43521 C 265.75424,577.96077 264.62154,577.95556 264.21115,578.4412 z " />
+    <path
+       style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.03629506pt"
+       id="path620"
+       d="M 273.6714,575.31409 L 271.95881,575.36263 L 271.95881,580.55646 L 279.72843,580.55646 L 273.6714,575.31409 z "
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.03916228pt"
+       id="path637"
+       d="M 254.51186,575.24117 L 255.63622,575.28968 L 255.63622,580.47962 L 248.49377,580.47962 L 254.51186,575.24117 z "
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2180"
+       width="17.600103"
+       height="1.0009658"
+       x="255.17328"
+       y="575.24982" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/transport/bridge/drawbridge.svg b/data/map-icons/svg/transport/bridge/drawbridge.svg
new file mode 100644
index 0000000..3b68937
--- /dev/null
+++ b/data/map-icons/svg/transport/bridge/drawbridge.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2170"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/transport/bridge"
+   sodipodi:docname="drawbridge.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2172" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="37.896548"
+     inkscape:cy="16.586709"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="485"
+     inkscape:window-y="197"
+     width="32px"
+     height="32px" />
+  <metadata
+     id="metadata2175">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-248.20068,-550.15906)">
+    <path
+       style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.04732872pt"
+       id="path637"
+       d="M 252.21738,573.21894 L 255.13981,573.29678 L 255.13981,581.62491 L 248.63889,581.62491 L 252.21738,573.21894 z " />
+    <path
+       style="font-size:12px;fill-rule:evenodd;stroke:#000000;stroke-width:0.04732872pt"
+       id="path620"
+       d="M 275.63977,573.21894 L 272.71734,573.29678 L 272.71734,581.62491 L 279.21826,581.62491 L 275.63977,573.21894 z " />
+    <path
+       style="font-size:12px;fill:#0000ff;fill-rule:evenodd;stroke-width:10.30560017"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       id="path624"
+       d="M 265.45935,580.58812 C 264.62447,581.95729 262.6851,581.97787 261.94037,580.62029 C 261.53608,579.88259 260.43806,579.85249 259.98062,580.53344 C 259.26199,581.923 257.27824,581.94405 256.53285,580.57846 C 256.1115,579.81674 254.95652,579.80834 254.53806,580.58812 C 254.30173,580.37472 254.06541,580.16132 253.82909,579.94792 C 254.19713,579.27583 254.88049,578.946 255.53545,578.95061 C 256.19229,578.94853 256.89305,579.2752 257.24991,579.96399 C 257.66098,580.70087 258.76944,580.72341 259.21235,580.0026 C 259.93814,578.63231 261.92453,578.65774 262.66011,580.0026 C 263.07706,580.75748 264.18646,580.7551 264.69187,579.99294 C 265.11844,579.27583 265.8018,578.946 266.45675,578.95061 C 267.1136,578.94853 267.81437,579.2752 268.1712,579.96399 C 268.58228,580.70087 269.69074,580.72341 270.13366,580.0026 C 270.85945,578.63231 272.84584,578.65774 273.58141,580.0026 C 273.99837,580.75748 273.6064,581.97787 272.86166,580.62029 C 272.45738,579.88259 271.35937,579.85249 270.90193,580.53344 C 270.1833,581.923 268.19953,581.94405 267.45416,580.57846 C 267.03279,579.81674 265.87781,579.80834 265.45935,580.58812 z " />
+    <path
+       style="font-size:12px;fill:#0000ff;fill-rule:evenodd;stroke-width:10.30560017"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       id="path625"
+       d="M 265.45935,578.05568 C 264.62447,579.42487 262.6851,579.44545 261.94037,578.08786 C 261.53608,577.35017 260.43806,577.32006 259.98062,578.00099 C 259.26199,579.39056 257.27824,579.41161 256.53285,578.04604 C 256.1115,577.2843 254.95652,577.27591 254.53806,578.05568 C 254.30173,577.84228 254.06541,577.62888 253.82909,577.41547 C 254.19713,576.74342 254.88049,576.41357 255.53545,576.41818 C 256.19229,576.4161 256.89305,576.74275 257.24991,577.43158 C 257.66098,578.16844 258.76944,578.19098 259.21235,577.47018 C 259.93814,576.09988 261.92453,576.12532 262.66011,577.47018 C 263.07706,578.22504 264.18646,578.22268 264.69187,577.46052 C 265.11844,576.74342 265.8018,576.41357 266.45675,576.41818 C 267.1136,576.4161 267.81437,576.74275 268.1712,577.43158 C 268.58228,578.16844 269.69074,578.19098 270.13366,577.47018 C 270.85945,576.09988 272.84584,576.12532 273.58141,577.47018 C 273.99837,578.22504 273.6064,579.44545 272.86166,578.08786 C 272.45738,577.35017 271.35937,577.32006 270.90193,578.00099 C 270.1833,579.39056 268.19953,579.41161 267.45416,578.04604 C 267.03279,577.2843 265.87781,577.27591 265.45935,578.05568 z " />
+    <rect
+       y="568.77563"
+       x="-169.62271"
+       width="22.66062"
+       transform="matrix(0.6344658,-0.7729509,0.6344658,0.7729509,0,0)"
+       style="font-size:12px;fill:#000000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:0.30847383pt"
+       id="rect626"
+       height="3.2447085" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/transport/ticket-machine.svg b/data/map-icons/svg/transport/ticket-machine.svg
new file mode 100644
index 0000000..7ef25a8
--- /dev/null
+++ b/data/map-icons/svg/transport/ticket-machine.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="41.314293"
+   height="39.885719"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/transport"
+   sodipodi:docname="ticket-machine.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.12"
+     inkscape:cx="3.588783"
+     inkscape:cy="32.059243"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="934"
+     inkscape:window-height="889"
+     inkscape:window-x="458"
+     inkscape:window-y="82" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-72.200012,-235.27648)">
+    <rect
+       style="fill:#344fdd;fill-opacity:1;stroke:#000000;stroke-width:1.15039241;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect4297"
+       width="23.577732"
+       height="34.905861"
+       x="75.157234"
+       y="237.98271"
+       rx="0"
+       ry="0" />
+    <rect
+       style="fill:#344fdd;fill-opacity:1;stroke:#fff6f6;stroke-width:1.7329936;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect5292"
+       width="12.448256"
+       height="4.6357565"
+       x="77.499321"
+       y="264.93417"
+       ry="0"
+       rx="0" />
+    <rect
+       style="fill:#344fdd;fill-opacity:1;stroke:#fff6f6;stroke-width:1.63677526;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="rect5322"
+       width="2.9445393"
+       height="17.482193"
+       x="86.390419"
+       y="241.78334"
+       ry="0"
+       rx="0" />
+    <g
+       id="g5314"
+       transform="matrix(1.9842471,0,0,2.5000012,-94.804584,-354.00335)">
+      <path
+         transform="matrix(3.1890837,0,0,2.6538915,28.292002,229.77783)"
+         d="M 22.412109 4.4365005 A 1.2207031 1.0742188 0 1 1  19.970703,4.4365005 A 1.2207031 1.0742188 0 1 1  22.412109 4.4365005 z"
+         sodipodi:ry="1.0742188"
+         sodipodi:rx="1.2207031"
+         sodipodi:cy="4.4365005"
+         sodipodi:cx="21.191406"
+         id="path5296"
+         style="fill:#dfb43a;fill-opacity:1;stroke:#fff6f6;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <text
+         transform="scale(1.0216747,0.9787851)"
+         id="text5298"
+         y="247.99812"
+         x="91.81884"
+         style="font-size:3.12976599px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="247.99812"
+           x="91.81884"
+           id="tspan5300"
+           sodipodi:role="line">10</tspan></text>
+      <path
+         transform="matrix(3.1890837,0,0,2.6538915,31.406343,227.18615)"
+         d="M 22.412109 4.4365005 A 1.2207031 1.0742188 0 1 1  19.970703,4.4365005 A 1.2207031 1.0742188 0 1 1  22.412109 4.4365005 z"
+         sodipodi:ry="1.0742188"
+         sodipodi:rx="1.2207031"
+         sodipodi:cy="4.4365005"
+         sodipodi:cx="21.191406"
+         id="path5302"
+         style="fill:#dfb43a;fill-opacity:1;stroke:#fff6f6;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <text
+         transform="scale(1.0216747,0.9787851)"
+         id="text5304"
+         y="245.35025"
+         x="94.867081"
+         style="font-size:3.12976599px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="245.35025"
+           x="94.867081"
+           id="tspan5306"
+           sodipodi:role="line">10</tspan></text>
+    </g>
+    <g
+       inkscape:label="Layer 1"
+       id="g4289"
+       transform="matrix(4.7662171e-2,-6.7394623e-2,6.4584461e-2,5.2919333e-2,63.765891,258.7632)">
+      <path
+         style="fill:#979cb6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="rect4"
+         d="M 158.12831,348.42577 C 157.7684,353.38156 153.18939,357.35846 147.47777,357.35846 C 147.25944,357.35846 147.08025,357.24514 146.86513,357.23382 L 146.86513,457.19696 C 147.08025,457.18564 147.25944,457.07231 147.47777,457.07231 C 153.42375,457.07231 158.26969,461.30303 158.26969,466.54513 C 158.26969,466.81121 158.10557,467.03243 158.08119,467.29298 L 392.20459,467.29298 C 392.1802,467.03243 392.01608,466.81121 392.01608,466.54513 C 392.0161,461.37663 396.74159,457.23101 402.57237,457.11386 L 402.57237,357.31692 C 396.97467,357.20445 392.51211,353.30914 392.15746,348.42577 L 158.12831,348.42577 z " />
+      <rect
+         y="360.66522"
+         x="162.03979"
+         width="226.20619"
+         style="fill:#dbdff4;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         ry="5.5462275"
+         rx="5.5462275"
+         id="rect188"
+         height="93.716026" />
+      <text
+         y="164.85933"
+         xml:space="preserve"
+         x="-479.21829"
+         transform="matrix(-5.986597e-3,-0.938931,1.065007,-5.277899e-3,0,0)"
+         style="font-size:16.9916153px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         id="text189"><tspan
+           y="164.85933"
+           x="-479.21829"
+           sodipodi:role="line"
+           id="tspan190">Admit One</tspan></text>
+      <text
+         y="-345.91006"
+         xml:space="preserve"
+         x="391.21219"
+         transform="matrix(8.732736e-3,0.938914,-1.064988,7.698947e-3,0,0)"
+         style="font-size:16.99158478px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+         id="text191"><tspan
+           y="-345.91006"
+           x="391.21219"
+           sodipodi:role="line"
+           id="tspan192">Admit One</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/crossing.svg b/data/map-icons/svg/vehicle/crossing.svg
new file mode 100644
index 0000000..3abfada
--- /dev/null
+++ b/data/map-icons/svg/vehicle/crossing.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle"
+   sodipodi:docname="crosing.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="22.431541"
+     inkscape:cy="15.277155"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1192"
+     inkscape:window-height="999"
+     inkscape:window-x="199"
+     inkscape:window-y="17"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3132"
+       transform="matrix(1.2682927,0,0,1.4285714,-3.3803418,-7.4698325)">
+      <path
+         id="path2157"
+         d="M 5,22 L 25,12"
+         style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path2159"
+         d="M 5,12 L 25,22"
+         style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/crossing_small.svg b/data/map-icons/svg/vehicle/crossing_small.svg
new file mode 100644
index 0000000..01c2c3e
--- /dev/null
+++ b/data/map-icons/svg/vehicle/crossing_small.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle"
+   sodipodi:docname="crosing_small.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="22.431541"
+     inkscape:cy="15.277155"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1192"
+     inkscape:window-height="999"
+     inkscape:window-x="199"
+     inkscape:window-y="17"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3132"
+       transform="matrix(0.3355951,0,0,0.2368237,10.610122,12.789878)">
+      <path
+         id="path2157"
+         d="M 5,22 L 25,12"
+         style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path2159"
+         d="M 5,12 L 25,22"
+         style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/fuel_station.svg b/data/map-icons/svg/vehicle/fuel_station.svg
new file mode 100644
index 0000000..06108ce
--- /dev/null
+++ b/data/map-icons/svg/vehicle/fuel_station.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <!-- derived from http://www.sodipodi.com/index.php3?section=clipart -->
+        <symbol id="symbol-petrol_station" viewBox="55 63 110 110">
+            <path
+                fill='#000000'
+                fill-rule="evenodd"
+                stroke-width="3"
+                d="M 22.7283 108.087 C 4.26832 107.546 23.6818 43.3596 32.6686 21.0597 C 33.8491 17.0245 60.28 18.4952 60.0056 19.8857 C 59.0889 25.9148 54.8979 23.2429 52.0142 26.8579 L 51.7464 36.8066 C 48.6085 40.8144 40.2357 34.4677 38.078 42.8773 C 31.3694 92.5727 45.0689 108.819 22.7283 108.087 z M 85.3122 9.52799 L 29.1766 9.52847 C 28.4855 17.5896 -11.559 113.573 22.9292 113.284 C 48.5214 113.073 39.5312 104.08 42.6984 51.03 C 41.8513 49.3228 50.871 48.6585 50.8739 51.4448 L 51.0453 116.604 L 97.6129 116.188 L 97.6129 26.544 C 96.0669 24.2073 93.899 25.2958 90.584 22.394 C 87.7907 19.4131 92.2353 9.52799 85.3122 9.52799 z M 64.0766 35.3236 C 61.5443 36.7258 61.5443 45.2814 64.0766 46.6836 C 68.3819 49.0684 80.2848 49.0684 84.5902 46.6836 C 87.1225 45.2814 87.1225 36.7258 84.5902 35.3236 C 80.2848 32.9393 68.3819 32.9393 64.0766 35.3236 z "/>
+        </symbol>	
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/vehicle/parking.svg b/data/map-icons/svg/vehicle/parking.svg
new file mode 100644
index 0000000..a691543
--- /dev/null
+++ b/data/map-icons/svg/vehicle/parking.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle"
+   sodipodi:docname="parking.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="29.021042"
+     inkscape:cy="14.297118"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="956"
+     inkscape:window-height="909"
+     inkscape:window-x="436"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#ff0000;stroke-width:0.1092821;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2157"
+       width="29.990725"
+       height="29.865675"
+       x="1.0671376"
+       y="1.0692713"
+       ry="4.6501541" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.77949917px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="25.967566"
+       y="40.215179"
+       id="text2159"
+       transform="scale(1.2972641,0.770853)"><tspan
+         sodipodi:role="line"
+         id="tspan2161"
+         x="25.967566"
+         y="40.215179">P</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:29.42379189px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="6.3084321"
+       y="26.325073"
+       id="text2160"
+       transform="scale(0.9750027,1.0256382)"><tspan
+         sodipodi:role="line"
+         id="tspan2162"
+         x="6.3084321"
+         y="26.325073"
+         style="font-weight:bold">P</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions.svg b/data/map-icons/svg/vehicle/restrictions.svg
new file mode 100644
index 0000000..429b8e8
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="41.314293"
+   height="39.885719"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle"
+   sodipodi:docname="restrictions.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="119.88661"
+     inkscape:cy="-74.243893"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="665"
+     inkscape:window-x="486"
+     inkscape:window-y="306" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-72.200012,-235.27648)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#f20d0d;stroke-width:15.60000038;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="path2160"
+       sodipodi:cx="262.85715"
+       sodipodi:cy="320.93362"
+       sodipodi:rx="48.57143"
+       sodipodi:ry="48.57143"
+       d="M 311.42858 320.93362 A 48.57143 48.57143 0 1 1  214.28572,320.93362 A 48.57143 48.57143 0 1 1  311.42858 320.93362 z"
+       transform="matrix(0.3674749,0,0,0.352769,-3.7362444,142.00391)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/dead_end.svg b/data/map-icons/svg/vehicle/restrictions/dead_end.svg
new file mode 100644
index 0000000..2a651ad
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/dead_end.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/transport/restrictions"
+   sodipodi:docname="dead_end.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-87.098319"
+     inkscape:cy="-33.466384"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1014"
+     inkscape:window-height="979"
+     inkscape:window-x="294"
+     inkscape:window-y="37"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3150"
+       width="26"
+       height="26"
+       x="3"
+       y="3" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3152"
+       width="6"
+       height="16"
+       x="13"
+       y="11" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3154"
+       width="20"
+       height="5"
+       x="6"
+       y="6" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/right_of_way.svg b/data/map-icons/svg/vehicle/restrictions/right_of_way.svg
new file mode 100644
index 0000000..69840a2
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/right_of_way.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/transport/restrictions"
+   sodipodi:docname="right_of_way.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.923682"
+     inkscape:cy="9.1048958"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="989"
+     inkscape:window-height="1016"
+     inkscape:window-x="402"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#f81919;stroke-width:4.02286291;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.0114314,4.056395 L 28.988569,4.056395 L 16.154315,27.116837 L 3.0114314,4.056395 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/roundabout_left.svg b/data/map-icons/svg/vehicle/restrictions/roundabout_left.svg
new file mode 100644
index 0000000..5b3fdcd
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/roundabout_left.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-roundabout_left" viewBox="253.5 253.5 507 507"> 
+            <path fill="#4161D8" d="M507,253.5c0,140-113.5,253.5-253.5,253.5 S0,393.5,0,253.5S113.5,0,253.5,0S507,113.5,507,253.5z"/>
+            <path  fill="#FFFFFF" d="M97.6,113.6l40.8-47.7c0,0,91.7,3.1,90.6,2.1 c-1.1-1,2.3,89.2,2.3,89.2l-49.8,33.2l-1.1-48.8c0,0-27.2,27-30.6,27c-3.4,0-27.2,61.2-27.2,61.2l-3.4,79.9L67,312.8v-73.6 l10.6-50.5l18.8-34.5l38.5-40.5"/>
+            <path fill="#FFFFFF" d="M459.6,190.5l19.7,59.6 c0,0-50.2,76.9-48.7,76.4c1.5-0.4-77.5-44.3-77.5-44.3l-2.6-59.8l42.3,24.3c0,0-9-37.2-7.2-40.1c1.8-2.9-38.3-54.9-38.3-54.9 l-66.6-44.3l24.3-46.2l63,38.1l37.7,35.3l19.8,34l14.7,53.9"/>
+            <path fill="#FFFFFF" d="M209.2,466.6l-60.7-16.1 c0,0-36.9-84-37.4-82.6c-0.4,1.5,79.4-40.7,79.4-40.7l51.5,30.6l-43.5,22.1c0,0,36.1,12.8,37.6,15.9c1.5,3.1,66.9-2,66.9-2 l73.5-31.5l25.4,45.6l-66.4,31.9l-50.2,12.3l-39.3-2L193,432.9"/>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/roundabout_right.svg b/data/map-icons/svg/vehicle/restrictions/roundabout_right.svg
new file mode 100644
index 0000000..071bf3c
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/roundabout_right.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+    <defs>
+        <symbol id="symbol-roundabout_right" viewBox="-253.5 253.5 507 507"> 
+            <g transform="scale(-1,1)">
+                <path fill="#4161D8" d="M507,253.5c0,140-113.5,253.5-253.5,253.5 S0,393.5,0,253.5S113.5,0,253.5,0S507,113.5,507,253.5z"/>
+                <path  fill="#FFFFFF" d="M97.6,113.6l40.8-47.7c0,0,91.7,3.1,90.6,2.1 c-1.1-1,2.3,89.2,2.3,89.2l-49.8,33.2l-1.1-48.8c0,0-27.2,27-30.6,27c-3.4,0-27.2,61.2-27.2,61.2l-3.4,79.9L67,312.8v-73.6 l10.6-50.5l18.8-34.5l38.5-40.5"/>
+                <path fill="#FFFFFF" d="M459.6,190.5l19.7,59.6 c0,0-50.2,76.9-48.7,76.4c1.5-0.4-77.5-44.3-77.5-44.3l-2.6-59.8l42.3,24.3c0,0-9-37.2-7.2-40.1c1.8-2.9-38.3-54.9-38.3-54.9 l-66.6-44.3l24.3-46.2l63,38.1l37.7,35.3l19.8,34l14.7,53.9"/>
+                <path fill="#FFFFFF" d="M209.2,466.6l-60.7-16.1 c0,0-36.9-84-37.4-82.6c-0.4,1.5,79.4-40.7,79.4-40.7l51.5,30.6l-43.5,22.1c0,0,36.1,12.8,37.6,15.9c1.5,3.1,66.9-2,66.9-2 l73.5-31.5l25.4,45.6l-66.4,31.9l-50.2,12.3l-39.3-2L193,432.9"/>
+            </g>
+        </symbol>
+    </defs>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/speed.svg b/data/map-icons/svg/vehicle/restrictions/speed.svg
new file mode 100644
index 0000000..658bb5a
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/speed.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="41.314293"
+   height="39.885719"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle/restrictions"
+   sodipodi:docname="speed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="119.88661"
+     inkscape:cy="-74.243893"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="665"
+     inkscape:window-x="486"
+     inkscape:window-y="306" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-72.200012,-235.27648)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#f20d0d;stroke-width:15.60000038;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:18;stroke-opacity:1"
+       id="path2160"
+       sodipodi:cx="262.85715"
+       sodipodi:cy="320.93362"
+       sodipodi:rx="48.57143"
+       sodipodi:ry="48.57143"
+       d="M 311.42858 320.93362 A 48.57143 48.57143 0 1 1  214.28572,320.93362 A 48.57143 48.57143 0 1 1  311.42858 320.93362 z"
+       transform="matrix(0.3674749,0,0,0.352769,-3.7362444,142.00391)" />
+    <text
+       xml:space="preserve"
+       style="font-size:3.70651841px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="99.42878"
+       y="-330.72659"
+       id="text3160"
+       transform="scale(1.1917261,-0.839119)"><tspan
+         sodipodi:role="line"
+         id="tspan3162"
+         x="99.42878"
+         y="-330.72659">30</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:21.37568283px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="89.270638"
+       y="241.54208"
+       id="text3164"
+       transform="scale(0.9161272,1.0915514)"><tspan
+         sodipodi:role="line"
+         id="tspan3166"
+         x="89.270638"
+         y="241.54208">30</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/stop.svg b/data/map-icons/svg/vehicle/restrictions/stop.svg
new file mode 100644
index 0000000..773fa85
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/stop.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle/restrictions"
+   sodipodi:docname="stop.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="27.09423"
+     inkscape:cy="8.7910817"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1142"
+     inkscape:window-height="889"
+     inkscape:window-x="156"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#f31818;fill-opacity:1;stroke:#f0e2e2;stroke-width:3.87775566;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2157"
+       sodipodi:sides="8"
+       sodipodi:cx="8"
+       sodipodi:cy="2"
+       sodipodi:r1="29.832869"
+       sodipodi:r2="29.740255"
+       sodipodi:arg1="0.88034987"
+       sodipodi:arg2="0.8821647"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 27.000001,25.000001 L 26.899374,24.962936 L 5.1715728,31.698486 L 5.1266277,31.601124 L -15.000001,21.000001 L -14.962936,20.899374 L -21.698486,-0.82842721 L -21.601124,-0.87337234 L -11.000001,-21.000001 L -10.899374,-20.962936 L 10.828427,-27.698486 L 10.873372,-27.601124 L 31.000001,-17.000001 L 30.962936,-16.899374 L 37.698486,4.8284272 L 37.601124,4.8733723 L 27.000001,25.000001 z "
+       transform="matrix(-0.155911,0.4899203,-0.4937338,-0.1547068,17.933079,12.166133)" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.2309742px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-57.90855"
+       y="-17.8048"
+       id="text4098"
+       transform="scale(-0.5849504,-1.7095466)"><tspan
+         sodipodi:role="line"
+         id="tspan4100"
+         x="-57.90855"
+         y="-17.8048">STOP</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:0.00007633px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="-0.0053610327"
+       y="203554.52"
+       id="text2160"
+       transform="scale(-6361.0785,1.5720605e-4)"><tspan
+         sodipodi:role="line"
+         id="tspan2162"
+         x="-0.0053610327"
+         y="203554.52">.</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:10.53277206px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="3.422013"
+       y="18.008179"
+       id="text2164"
+       transform="scale(0.8984554,1.1130213)"><tspan
+         sodipodi:role="line"
+         id="tspan2166"
+         x="3.422013"
+         y="18.008179">STOP</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/vehicle/restrictions/traffic-light.svg b/data/map-icons/svg/vehicle/restrictions/traffic-light.svg
new file mode 100644
index 0000000..d7b2ae5
--- /dev/null
+++ b/data/map-icons/svg/vehicle/restrictions/traffic-light.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/vehicle/restrictions"
+   sodipodi:docname="traffic-light.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="20.471423"
+     inkscape:cy="14.149163"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1178"
+     inkscape:window-height="1016"
+     inkscape:window-x="213"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2157"
+       width="10"
+       height="28"
+       x="10"
+       y="1"
+       ry="1.7307692" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2161"
+       sodipodi:cx="15"
+       sodipodi:cy="7"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="M 19 7 A 4 4 0 1 1  11,7 A 4 4 0 1 1  19 7 z"
+       transform="translate(0,-1)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2163"
+       sodipodi:cx="15"
+       sodipodi:cy="7"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="M 19 7 A 4 4 0 1 1  11,7 A 4 4 0 1 1  19 7 z"
+       transform="translate(0,8)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2165"
+       sodipodi:cx="15"
+       sodipodi:cy="7"
+       sodipodi:rx="4"
+       sodipodi:ry="4"
+       d="M 19 7 A 4 4 0 1 1  11,7 A 4 4 0 1 1  19 7 z"
+       transform="translate(0,17)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.0999999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2167"
+       width="2.1160715"
+       height="3"
+       x="13.883928"
+       y="29"
+       ry="0" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/flag.svg b/data/map-icons/svg/waypoint/flag.svg
new file mode 100644
index 0000000..ec51f7a
--- /dev/null
+++ b/data/map-icons/svg/waypoint/flag.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="flag.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.766775"
+     inkscape:cy="14.936609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="970"
+     inkscape:window-x="366"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,27 L 5,2"
+       id="path2157" />
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,4.9152849 C 5,4.9152849 11,12 21.823455,6.3053803 C 21,12 16,19 5,16.910846 L 5,4.9152849 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/flag/blue.svg b/data/map-icons/svg/waypoint/flag/blue.svg
new file mode 100644
index 0000000..a5eeccd
--- /dev/null
+++ b/data/map-icons/svg/waypoint/flag/blue.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/flag"
+   sodipodi:docname="blue.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.766775"
+     inkscape:cy="14.936609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="970"
+     inkscape:window-x="366"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,27 L 5,2"
+       id="path2157" />
+    <path
+       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,4.9152849 C 5,4.9152849 11,12 21.823455,6.3053803 C 21,12 16,19 5,16.910846 L 5,4.9152849 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/flag/green.svg b/data/map-icons/svg/waypoint/flag/green.svg
new file mode 100644
index 0000000..1560898
--- /dev/null
+++ b/data/map-icons/svg/waypoint/flag/green.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/flag"
+   sodipodi:docname="green.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.766775"
+     inkscape:cy="14.936609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="970"
+     inkscape:window-x="366"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,27 L 5,2"
+       id="path2157" />
+    <path
+       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,4.9152849 C 5,4.9152849 11,12 21.823455,6.3053803 C 21,12 16,19 5,16.910846 L 5,4.9152849 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/flag/orange.svg b/data/map-icons/svg/waypoint/flag/orange.svg
new file mode 100644
index 0000000..9f8b62b
--- /dev/null
+++ b/data/map-icons/svg/waypoint/flag/orange.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/flag"
+   sodipodi:docname="orange.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.766775"
+     inkscape:cy="14.936609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="970"
+     inkscape:window-x="366"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,27 L 5,2"
+       id="path2157" />
+    <path
+       style="fill:#ff9f00;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 5,4.9152849 C 5,4.9152849 11,12 21.823455,6.3053803 C 21,12 16,19 5,16.910846 L 5,4.9152849 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/flag/red.svg b/data/map-icons/svg/waypoint/flag/red.svg
new file mode 100644
index 0000000..33be06c
--- /dev/null
+++ b/data/map-icons/svg/waypoint/flag/red.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/flag"
+   sodipodi:docname="red.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.766775"
+     inkscape:cy="14.936609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="970"
+     inkscape:window-x="366"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,27 L 5,2"
+       id="path2157" />
+    <path
+       style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 5,4.9152849 C 5,4.9152849 11,12 21.823455,6.3053803 C 21,12 16,19 5,16.910846 L 5,4.9152849 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/flag/yellow.svg b/data/map-icons/svg/waypoint/flag/yellow.svg
new file mode 100644
index 0000000..3b6f5cc
--- /dev/null
+++ b/data/map-icons/svg/waypoint/flag/yellow.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/flag"
+   sodipodi:docname="yellow.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="24.766775"
+     inkscape:cy="14.936609"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="970"
+     inkscape:window-x="366"
+     inkscape:window-y="0"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5,27 L 5,2"
+       id="path2157" />
+    <path
+       style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 5,4.9152849 C 5,4.9152849 6,10 21.823455,6.3053803 C 21,12 10,19 5,16.910846 L 5,4.9152849 z "
+       id="path2159"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/pin.svg b/data/map-icons/svg/waypoint/pin.svg
new file mode 100644
index 0000000..a290539
--- /dev/null
+++ b/data/map-icons/svg/waypoint/pin.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="32"
+   height="32"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="970"
+     inkscape:window-width="1126"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-points="true"
+     inkscape:object-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:zoom="11.8125"
+     inkscape:cx="1.0203058"
+     inkscape:cy="11.970677"
+     inkscape:window-x="266"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.863234,13.93212 L 9.0700837,22.083158 L 8.7265574,24.29268 L 10.700291,23.241788 L 16.493442,15.09075 L 14.863234,13.93212 z "
+     id="path3138" />
+  <image
+     xlink:href="svg/waypoint/pin.png"
+     sodipodi:absref="svg/waypoint/pin.png"
+     width="32"
+     height="32"
+     id="image9"
+     x="0"
+     y="0" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path2161"
+     sodipodi:cx="14"
+     sodipodi:cy="22"
+     sodipodi:rx="7"
+     sodipodi:ry="5"
+     d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+     transform="matrix(0.8075597,0.5160123,-0.5175485,0.8051626,16.802352,-11.469939)" />
+  <rect
+     style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#030000;stroke-width:0.11176623;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect3134"
+     width="8.246089"
+     height="11.090103"
+     x="17.2633"
+     y="-7.8418651"
+     transform="matrix(0.8190901,0.5736649,-0.5849116,0.8110971,0,0)"
+     ry="3.8925574" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="path3136"
+     sodipodi:cx="14"
+     sodipodi:cy="22"
+     sodipodi:rx="7"
+     sodipodi:ry="5"
+     d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+     transform="matrix(0.6433843,0.3773464,-0.4123319,0.5887944,21.080317,-11.253533)" />
+</svg>
diff --git a/data/map-icons/svg/waypoint/pin/blue.svg b/data/map-icons/svg/waypoint/pin/blue.svg
new file mode 100644
index 0000000..bc3ff14
--- /dev/null
+++ b/data/map-icons/svg/waypoint/pin/blue.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="32"
+   height="32"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/pin"
+   sodipodi:docname="blue.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="970"
+     inkscape:window-width="1126"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-points="true"
+     inkscape:object-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:zoom="11.8125"
+     inkscape:cx="1.0203058"
+     inkscape:cy="11.970677"
+     inkscape:window-x="266"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.863234,13.93212 L 9.0700837,22.083158 L 8.7265574,24.29268 L 10.700291,23.241788 L 16.493442,15.09075 L 14.863234,13.93212 z "
+     id="path3138" />
+  <image
+     xlink:href="svg/waypoint/pin.png"
+     sodipodi:absref="svg/waypoint/pin.png"
+     width="32"
+     height="32"
+     id="image9"
+     x="0"
+     y="0" />
+  <g
+     id="g2161"
+     style="fill:#0000ff">
+    <path
+       transform="matrix(0.8075597,0.5160123,-0.5175485,0.8051626,16.802352,-11.469939)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path2161"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       ry="3.8925574"
+       transform="matrix(0.8190901,0.5736649,-0.5849116,0.8110971,0,0)"
+       y="-7.8418651"
+       x="17.2633"
+       height="11.090103"
+       width="8.246089"
+       id="rect3134"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#030000;stroke-width:0.11176623;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       transform="matrix(0.6433843,0.3773464,-0.4123319,0.5887944,21.080317,-11.253533)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path3136"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/pin/green.svg b/data/map-icons/svg/waypoint/pin/green.svg
new file mode 100644
index 0000000..aa25733
--- /dev/null
+++ b/data/map-icons/svg/waypoint/pin/green.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="32"
+   height="32"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/pin"
+   sodipodi:docname="green.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="970"
+     inkscape:window-width="1126"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-points="true"
+     inkscape:object-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:zoom="11.8125"
+     inkscape:cx="1.0203058"
+     inkscape:cy="11.970677"
+     inkscape:window-x="266"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.863234,13.93212 L 9.0700837,22.083158 L 8.7265574,24.29268 L 10.700291,23.241788 L 16.493442,15.09075 L 14.863234,13.93212 z "
+     id="path3138" />
+  <image
+     xlink:href="svg/waypoint/pin.png"
+     sodipodi:absref="svg/waypoint/pin.png"
+     width="32"
+     height="32"
+     id="image9"
+     x="0"
+     y="0" />
+  <g
+     id="g2161"
+     style="fill:#00ff00">
+    <path
+       transform="matrix(0.8075597,0.5160123,-0.5175485,0.8051626,16.802352,-11.469939)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path2161"
+       style="opacity:1;fill:#00ff00;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       ry="3.8925574"
+       transform="matrix(0.8190901,0.5736649,-0.5849116,0.8110971,0,0)"
+       y="-7.8418651"
+       x="17.2633"
+       height="11.090103"
+       width="8.246089"
+       id="rect3134"
+       style="opacity:1;fill:#00ff00;fill-opacity:1;stroke:#030000;stroke-width:0.11176623;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       transform="matrix(0.6433843,0.3773464,-0.4123319,0.5887944,21.080317,-11.253533)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path3136"
+       style="opacity:1;fill:#00ff00;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/pin/orange.svg b/data/map-icons/svg/waypoint/pin/orange.svg
new file mode 100644
index 0000000..091aadb
--- /dev/null
+++ b/data/map-icons/svg/waypoint/pin/orange.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="32"
+   height="32"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/pin"
+   sodipodi:docname="orange.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="970"
+     inkscape:window-width="1126"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-points="true"
+     inkscape:object-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:zoom="11.8125"
+     inkscape:cx="1.0203058"
+     inkscape:cy="11.970677"
+     inkscape:window-x="266"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.863234,13.93212 L 9.0700837,22.083158 L 8.7265574,24.29268 L 10.700291,23.241788 L 16.493442,15.09075 L 14.863234,13.93212 z "
+     id="path3138" />
+  <image
+     xlink:href="svg/waypoint/pin.png"
+     sodipodi:absref="svg/waypoint/pin.png"
+     width="32"
+     height="32"
+     id="image9"
+     x="0"
+     y="0" />
+  <g
+     id="g2161"
+     style="fill:#ffc800;fill-opacity:1">
+    <path
+       transform="matrix(0.8075597,0.5160123,-0.5175485,0.8051626,16.802352,-11.469939)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path2161"
+       style="opacity:1;fill:#ffc800;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       ry="3.8925574"
+       transform="matrix(0.8190901,0.5736649,-0.5849116,0.8110971,0,0)"
+       y="-7.8418651"
+       x="17.2633"
+       height="11.090103"
+       width="8.246089"
+       id="rect3134"
+       style="opacity:1;fill:#ffc800;fill-opacity:1;stroke:#030000;stroke-width:0.11176623;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       transform="matrix(0.6433843,0.3773464,-0.4123319,0.5887944,21.080317,-11.253533)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path3136"
+       style="opacity:1;fill:#ffc800;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/pin/red.svg b/data/map-icons/svg/waypoint/pin/red.svg
new file mode 100644
index 0000000..3c67f4a
--- /dev/null
+++ b/data/map-icons/svg/waypoint/pin/red.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="32"
+   height="32"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/pin"
+   sodipodi:docname="red.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="970"
+     inkscape:window-width="1126"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-points="true"
+     inkscape:object-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:zoom="11.8125"
+     inkscape:cx="1.0203058"
+     inkscape:cy="11.970677"
+     inkscape:window-x="266"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.863234,13.93212 L 9.0700837,22.083158 L 8.7265574,24.29268 L 10.700291,23.241788 L 16.493442,15.09075 L 14.863234,13.93212 z "
+     id="path3138" />
+  <image
+     xlink:href="svg/waypoint/pin.png"
+     sodipodi:absref="svg/waypoint/pin.png"
+     width="32"
+     height="32"
+     id="image9"
+     x="0"
+     y="0" />
+  <g
+     id="g2161"
+     style="fill:#ff0000">
+    <path
+       transform="matrix(0.8075597,0.5160123,-0.5175485,0.8051626,16.802352,-11.469939)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path2161"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       ry="3.8925574"
+       transform="matrix(0.8190901,0.5736649,-0.5849116,0.8110971,0,0)"
+       y="-7.8418651"
+       x="17.2633"
+       height="11.090103"
+       width="8.246089"
+       id="rect3134"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#030000;stroke-width:0.11176623;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       transform="matrix(0.6433843,0.3773464,-0.4123319,0.5887944,21.080317,-11.253533)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path3136"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/pin/yellow.svg b/data/map-icons/svg/waypoint/pin/yellow.svg
new file mode 100644
index 0000000..67041ef
--- /dev/null
+++ b/data/map-icons/svg/waypoint/pin/yellow.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   width="32"
+   height="32"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint/pin"
+   sodipodi:docname="yellow.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5" />
+  <sodipodi:namedview
+     inkscape:window-height="970"
+     inkscape:window-width="1126"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="true"
+     inkscape:object-points="true"
+     inkscape:object-bbox="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:zoom="11.8125"
+     inkscape:cx="1.0203058"
+     inkscape:cy="11.970677"
+     inkscape:window-x="266"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#808080;fill-rule:evenodd;stroke:#000000;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.863234,13.93212 L 9.0700837,22.083158 L 8.7265574,24.29268 L 10.700291,23.241788 L 16.493442,15.09075 L 14.863234,13.93212 z "
+     id="path3138" />
+  <image
+     xlink:href="svg/waypoint/pin.png"
+     sodipodi:absref="svg/waypoint/pin.png"
+     width="32"
+     height="32"
+     id="image9"
+     x="0"
+     y="0" />
+  <g
+     id="g2161"
+     style="fill:#ffff00">
+    <path
+       transform="matrix(0.8075597,0.5160123,-0.5175485,0.8051626,16.802352,-11.469939)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path2161"
+       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+    <rect
+       ry="3.8925574"
+       transform="matrix(0.8190901,0.5736649,-0.5849116,0.8110971,0,0)"
+       y="-7.8418651"
+       x="17.2633"
+       height="11.090103"
+       width="8.246089"
+       id="rect3134"
+       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#030000;stroke-width:0.11176623;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       transform="matrix(0.6433843,0.3773464,-0.4123319,0.5887944,21.080317,-11.253533)"
+       d="M 21 22 A 7 5 0 1 1  7,22 A 7 5 0 1 1  21 22 z"
+       sodipodi:ry="5"
+       sodipodi:rx="7"
+       sodipodi:cy="22"
+       sodipodi:cx="14"
+       id="path3136"
+       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#030000;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt1.svg b/data/map-icons/svg/waypoint/wpt1.svg
new file mode 100644
index 0000000..bc87ba3
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt1.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt1.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">1</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt2.svg b/data/map-icons/svg/waypoint/wpt2.svg
new file mode 100644
index 0000000..5b3abf3
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt2.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt2.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">2</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt3.svg b/data/map-icons/svg/waypoint/wpt3.svg
new file mode 100644
index 0000000..89364a9
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt3.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt3.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">3</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt4.svg b/data/map-icons/svg/waypoint/wpt4.svg
new file mode 100644
index 0000000..9c1298c
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt4.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt4.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">4</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt5.svg b/data/map-icons/svg/waypoint/wpt5.svg
new file mode 100644
index 0000000..edd3e1d
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt5.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt5.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">5</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt6.svg b/data/map-icons/svg/waypoint/wpt6.svg
new file mode 100644
index 0000000..9339e02
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt6.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt6.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">6</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt7.svg b/data/map-icons/svg/waypoint/wpt7.svg
new file mode 100644
index 0000000..4990ce5
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt7.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt7.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">7</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt8.svg b/data/map-icons/svg/waypoint/wpt8.svg
new file mode 100644
index 0000000..94ec896
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt8.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt8.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">8</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/waypoint/wpt9.svg b/data/map-icons/svg/waypoint/wpt9.svg
new file mode 100644
index 0000000..1432859
--- /dev/null
+++ b/data/map-icons/svg/waypoint/wpt9.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61.463894"
+   height="55.392708"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/waypoint"
+   sodipodi:docname="wpt9.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="64.458826"
+     inkscape:cy="48.770922"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="906"
+     inkscape:window-height="781"
+     inkscape:window-x="485"
+     inkscape:window-y="49" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-254.6964,-283.9156)">
+    <text
+       xml:space="preserve"
+       style="font-size:1.76168227px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="559.90985"
+       y="194.46046"
+       id="text1874"
+       transform="scale(0.571888,1.748596)"><tspan
+         sodipodi:role="line"
+         x="559.90985"
+         y="194.46046"
+         id="tspan2758">.</tspan></text>
+    <path
+       sodipodi:type="arc"
+       style="fill:aqua;fill-opacity:1;stroke:black;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1880"
+       sodipodi:cx="265.71429"
+       sodipodi:cy="289.50504"
+       sodipodi:rx="122.85714"
+       sodipodi:ry="120"
+       d="M 388.57143 289.50504 A 122.85714 120 0 1 1  142.85715,289.50504 A 122.85714 120 0 1 1  388.57143 289.50504 z"
+       transform="matrix(0.248204,0,0,0.228817,219.477,245.3683)" />
+    <text
+       xml:space="preserve"
+       style="font-size:56.51395035px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="270.60794"
+       y="326.9679"
+       id="text1882"
+       transform="scale(0.986846,1.01333)"><tspan
+         sodipodi:role="line"
+         id="tspan1884"
+         x="270.60794"
+         y="326.9679">9</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/wlan.svg b/data/map-icons/svg/wlan.svg
new file mode 100644
index 0000000..f8b159c
--- /dev/null
+++ b/data/map-icons/svg/wlan.svg
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="303.59335"
+   id="svg1"
+   inkscape:export-filename="/home/corey/tower-wireless.png"
+   inkscape:export-xdpi="72.000000"
+   inkscape:export-ydpi="72.000000"
+   inkscape:version="0.44.1"
+   sodipodi:docbase="/home/src/apps/gpsdrive/gpsdrive-work/data/map-icons/svg"
+   sodipodi:docname="wlan.svg"
+   sodipodi:version="0.32"
+   width="177.85829"
+   version="1.0">
+  <metadata
+     id="metadata3">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:title>Radio/Wireless Tower</dc:title>
+        <dc:description />
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>wireless</rdf:li>
+            <rdf:li>tower</rdf:li>
+            <rdf:li>radio</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://www.openclipart.org">
+            <dc:title>Open Clip Art Library</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Corey Burger</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Corey Burger</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:date />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     id="base"
+     inkscape:current-layer="layer1"
+     inkscape:cx="273.29793"
+     inkscape:cy="498.38753"
+     inkscape:grid-bbox="false"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="926"
+     inkscape:window-width="1149"
+     inkscape:window-x="1614"
+     inkscape:window-y="0"
+     inkscape:zoom="0.43415836"
+     pagecolor="#ffffff"
+     showgrid="false" />
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(-19.56857,-188.3279)">
+    <path
+       d="M 358.45099,388.88488 A 11.516535,11.516535 0 1 1 358.45208,388.75969"
+       id="path1061"
+       sodipodi:cx="346.93561"
+       sodipodi:cy="388.72183"
+       sodipodi:end="6.2864724"
+       sodipodi:open="true"
+       sodipodi:rx="11.516535"
+       sodipodi:ry="11.516535"
+       sodipodi:start="0.014158001"
+       sodipodi:type="arc"
+       style="fill:black;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:1.25;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       transform="matrix(1.18265,0,0,1.060409,-302.8232,-162.8958)" />
+    <path
+       d="M 67.300907,454.64112 C 142.98481,454.64112 142.98481,454.64112 142.98481,454.64112"
+       id="path2935"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:9.17551804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 80.696247,422.54226 C 156.38019,422.54226 121.88199,422.54226 132.93827,422.54226"
+       id="path3557"
+       sodipodi:nodetypes="cc"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:9.17551804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 107.15217,259.83437 C 107.15217,260.01884 107.15217,260.20332 107.15217,260.38779 C 107.15217,275.03108 109.21518,402.56676 51.226413,486.18652"
+       id="path1686"
+       sodipodi:nodetypes="ccc"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:11.4693985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 106.98927,259.55768 C 106.98927,259.74215 106.98927,259.92663 106.98927,260.1111 C 106.98927,274.75435 104.92626,402.29007 162.915,485.90988"
+       id="path2308"
+       sodipodi:nodetypes="ccc"
+       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:11.4693985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+    <path
+       d="M 659.80826,385.01245 A 377.16653,377.16653 0 0 1 621.99133,977.71708"
+       id="path4190"
+       sodipodi:cx="408.83701"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.2533709"
+       sodipodi:open="true"
+       sodipodi:rx="377.16653"
+       sodipodi:ry="377.16653"
+       sodipodi:start="5.440435"
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       transform="matrix(0.23406,0,0,0.209868,12.08194,108.9113)" />
+    <path
+       d="M 559.42058,478.0061 A 240.40767,240.40767 0 0 1 534.50785,872.37959"
+       id="path4196"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="240.40767"
+       sodipodi:ry="240.40767"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(0.23406,0,0,0.209868,11.78843,109.1178)" />
+    <path
+       d="M 485.29511,571.71763 A 120.92362,120.92362 0 0 1 472.76415,770.08514"
+       id="path4198"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="120.92362"
+       sodipodi:ry="120.92362"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(0.23406,0,0,0.209868,11.78843,109.1178)" />
+    <path
+       d="M 659.80826,385.01245 A 377.16653,377.16653 0 0 1 621.99133,977.71708"
+       id="path4209"
+       sodipodi:cx="408.83701"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.2533709"
+       sodipodi:open="true"
+       sodipodi:rx="377.16653"
+       sodipodi:ry="377.16653"
+       sodipodi:start="5.440435"
+       sodipodi:type="arc"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       transform="matrix(-0.23406,0,0,0.209868,204.9135,109.0317)" />
+    <path
+       d="M 559.42058,478.0061 A 240.40767,240.40767 0 0 1 534.50785,872.37959"
+       id="path4210"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="240.40767"
+       sodipodi:ry="240.40767"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(-0.23406,0,0,0.209868,205.2077,109.2382)" />
+    <path
+       d="M 485.29511,571.71763 A 120.92362,120.92362 0 0 1 472.76415,770.08514"
+       id="path4212"
+       sodipodi:cx="410.27655"
+       sodipodi:cy="666.55823"
+       sodipodi:end="7.3109281"
+       sodipodi:open="true"
+       sodipodi:rx="120.92362"
+       sodipodi:ry="120.92362"
+       sodipodi:start="5.3816157"
+       sodipodi:type="arc"
+       style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0000d5;stroke-width:12.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+       transform="matrix(-0.23406,0,0,0.209868,205.2077,109.2382)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/wlan/closed.svg b/data/map-icons/svg/wlan/closed.svg
new file mode 100644
index 0000000..de36b7c
--- /dev/null
+++ b/data/map-icons/svg/wlan/closed.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/wlan"
+   sodipodi:docname="closed.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="16.633937"
+     inkscape:cy="15.416722"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1027"
+     inkscape:window-height="898"
+     inkscape:window-x="365"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#090505;stroke-width:0.8495346;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3553"
+       sodipodi:cx="16.004604"
+       sodipodi:cy="15.048378"
+       sodipodi:rx="10.133093"
+       sodipodi:ry="10.575034"
+       d="M 26.137697 15.048378 A 10.133093 10.575034 0 1 1  5.8715115,15.048378 A 10.133093 10.575034 0 1 1  26.137697 15.048378 z"
+       transform="matrix(1.2027317,0,0,1.1520441,-3.2446414,-2.2880163)" />
+  </g>
+</svg>
diff --git a/data/map-icons/svg/wlan/open.svg b/data/map-icons/svg/wlan/open.svg
new file mode 100644
index 0000000..12e3dd6
--- /dev/null
+++ b/data/map-icons/svg/wlan/open.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/wlan"
+   sodipodi:docname="open.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="16.59396"
+     inkscape:cy="16.602718"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1027"
+     inkscape:window-height="898"
+     inkscape:window-x="365"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3523"
+       transform="matrix(1.641902,0,0,1.557643,-10.087029,-8.5837189)">
+      <path
+         transform="matrix(2.4344654e-4,-0.3229747,0.3466886,2.2679447e-4,-84.550573,28.281801)"
+         sodipodi:open="true"
+         sodipodi:end="9.4293051"
+         sodipodi:start="6.2818457"
+         d="M 64.999978,265.18224 A 25,23.928572 0 1 1 15.000256,265.10597"
+         sodipodi:ry="23.928572"
+         sodipodi:rx="25"
+         sodipodi:cy="265.21429"
+         sodipodi:cx="40"
+         id="path3417"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#090505;stroke-width:2.9884491;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.6930215e-3,0.3229709,-0.3466846,1.5772166e-3,115.89082,2.0256076)"
+         sodipodi:open="true"
+         sodipodi:end="9.4293051"
+         sodipodi:start="6.2818457"
+         d="M 64.999978,265.18224 A 25,23.928572 0 1 1 15.000256,265.10597"
+         sodipodi:ry="23.928572"
+         sodipodi:rx="25"
+         sodipodi:cy="265.21429"
+         sodipodi:cx="40"
+         id="path3423"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#090505;stroke-width:2.9884491;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/wlan/pay.svg b/data/map-icons/svg/wlan/pay.svg
new file mode 100644
index 0000000..be0ad21
--- /dev/null
+++ b/data/map-icons/svg/wlan/pay.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/wlan"
+   sodipodi:docname="pay.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="17.045586"
+     inkscape:cy="16.602718"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="735"
+     inkscape:window-x="365"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3523"
+       transform="matrix(1.641902,0,0,1.557643,-10.087029,-8.5837189)">
+      <path
+         transform="matrix(2.4344654e-4,-0.3229747,0.3466886,2.2679447e-4,-84.550573,28.281801)"
+         sodipodi:open="true"
+         sodipodi:end="9.4293051"
+         sodipodi:start="6.2818457"
+         d="M 64.999978,265.18224 A 25,23.928572 0 1 1 15.000256,265.10597"
+         sodipodi:ry="23.928572"
+         sodipodi:rx="25"
+         sodipodi:cy="265.21429"
+         sodipodi:cx="40"
+         id="path3417"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#090505;stroke-width:2.9884491;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.6930215e-3,0.3229709,-0.3466846,1.5772166e-3,115.89082,2.0256076)"
+         sodipodi:open="true"
+         sodipodi:end="9.4293051"
+         sodipodi:start="6.2818457"
+         d="M 64.999978,265.18224 A 25,23.928572 0 1 1 15.000256,265.10597"
+         sodipodi:ry="23.928572"
+         sodipodi:rx="25"
+         sodipodi:cy="265.21429"
+         sodipodi:cx="40"
+         id="path3423"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#090505;stroke-width:2.9884491;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:0.80105239px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="59.298309"
+       y="17.526085"
+       id="text3545"
+       transform="scale(0.5655085,1.7683201)"><tspan
+         sodipodi:role="line"
+         id="tspan3547"
+         x="59.298309"
+         y="17.526085">$</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="20.99449"
+       y="18.630434"
+       id="text3549"><tspan
+         sodipodi:role="line"
+         id="tspan3551"
+         x="20.99449"
+         y="18.630434">$</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="2.2435315"
+       y="19.009241"
+       id="text3205"><tspan
+         sodipodi:role="line"
+         id="tspan3207"
+         x="2.2435315"
+         y="19.009241">$</tspan></text>
+  </g>
+</svg>
diff --git a/data/map-icons/svg/wlan/wep.svg b/data/map-icons/svg/wlan/wep.svg
new file mode 100644
index 0000000..bed57ea
--- /dev/null
+++ b/data/map-icons/svg/wlan/wep.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   version="1.0"
+   sodipodi:docbase="/home/tweety/svn.openstreetmap.org/applications/share/map-icons/svg/wlan"
+   sodipodi:docname="wep.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="38.142505"
+     inkscape:cy="-2.8942351"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="906"
+     inkscape:window-height="596"
+     inkscape:window-x="369"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title>Map Icon for OpenStreetmap and GpsDrive</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#090505;stroke-width:0.8495346;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path3553"
+       sodipodi:cx="16.004604"
+       sodipodi:cy="15.048378"
+       sodipodi:rx="10.133093"
+       sodipodi:ry="10.575034"
+       d="M 26.137697 15.048378 A 10.133093 10.575034 0 1 1  5.8715115,15.048378 A 10.133093 10.575034 0 1 1  26.137697 15.048378 z"
+       transform="matrix(1.2027317,0,0,1.1520441,-3.2446414,-2.2880163)" />
+    <text
+       xml:space="preserve"
+       style="font-size:0.93694562px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="66.171417"
+       y="16.076698"
+       id="text2160"
+       transform="scale(0.5079277,1.9687841)"><tspan
+         sodipodi:role="line"
+         id="tspan2162"
+         x="66.171417"
+         y="16.076698">Wlan WEP</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="10.069057"
+       y="19.422401"
+       id="text2164"><tspan
+         sodipodi:role="line"
+         id="tspan2166"
+         x="10.069057"
+         y="19.422401">W</tspan></text>
+  </g>
+</svg>
author	Christian Perrier <bubulle@debian.org>	2012-10-07 13:27:36 +0100
committer	Christian Perrier <bubulle@debian.org>	2012-10-07 13:27:36 +0100
commit	99f5c8bf63a674faf8c507aea7425b935814548a (patch)
tree	b3202c295c4bb71ec09e3748d49b43a9fec6b4cd /data/map-icons/svg