diff --git a/data/styles/symbols/airport.svg b/data/styles/symbols/airport.svg
index d84bb1ff48..5d9387e732 100644
--- a/data/styles/symbols/airport.svg
+++ b/data/styles/symbols/airport.svg
@@ -1,4 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="24" id="airport" viewBox="0 0 10 10" fill="black" fill-opacity="1" fill-rule="evenodd" stroke="none" height="24">
-   <svg: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 "/>
-</svg>
\ No newline at end of file
+<?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2997"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="airport.svg">
+  <defs
+     id="defs2999" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="26.83354"
+     inkscape:cx="14.219404"
+     inkscape:cy="12.33522"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1108"
+     inkscape:window-height="810"
+     inkscape:window-x="43"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3002">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1028.3622)">
+    <rect
+       ry="4.4000034"
+       rx="4.3999996"
+       y="1029.3622"
+       x="1"
+       height="22.000017"
+       width="22"
+       id="rect3020"
+       style="fill:#f0f0f0;fill-opacity:1;stroke:none" />
+    <rect
+       style="fill:#005ce0;fill-opacity:1;stroke:none"
+       id="rect3018"
+       width="20"
+       height="20"
+       x="2"
+       y="2"
+       transform="translate(0,1028.3622)"
+       rx="4"
+       ry="4" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 19,5 0,2 -3,3 0,10 -2,0 -2,-6 -3,3 0,3 L 8,20 7,18 6,17 4,16 4,15 7,15 10,12 4,10 4,8 14,8 17,5 z"
+       id="path2986"
+       inkscape:connector-curvature="0"
+       transform="translate(0,1028.3622)"
+       sodipodi:nodetypes="cccccccccccccccccccc" />
+  </g>
+</svg>
diff --git a/data/styles/symbols/alpine_hut.svg b/data/styles/symbols/alpine_hut.svg
index eddb4cb2fb..dc72309939 100644
--- a/data/styles/symbols/alpine_hut.svg
+++ b/data/styles/symbols/alpine_hut.svg
@@ -1,21 +1,60 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="37.279999"
    height="37.279999"
    viewBox="0 0 12 12"
-   id="symbol-alpine-hut">
+   id="symbol-alpine-hut"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="alpine_hut.svg">
+  <metadata
+     id="metadata8">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="6.3304723"
+     inkscape:cx="18.639999"
+     inkscape:cy="17.139321"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-alpine-hut" />
   <defs
      id="defs36" />
   <path
      d="M 3.8626611,5.2403431 L 3.8626611,9.4248926 L 8.0472106,9.4248926 L 8.0472106,5.2403431"
      id="path2984"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.96566528;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:0.96566527999999996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
      d="M 2.25,5.8563304 L 6,3.8563304 L 9.75,5.8563304 L 9.4989134,6.1120138 L 8.2452133,5.6063304 L 3.7469743,5.6024242 L 2.4998353,6.1063902 L 2.25,5.8563304 z"
      id="path29"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:0.40000001000000002;stroke-linecap:butt;stroke-linejoin:miter;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
 </svg>
diff --git a/data/styles/symbols/archery-borderless.svg b/data/styles/symbols/archery-borderless.svg
index 24b3031d55..a604ed67f1 100644
--- a/data/styles/symbols/archery-borderless.svg
+++ b/data/styles/symbols/archery-borderless.svg
@@ -1,53 +1,93 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="38"
    height="38"
    viewBox="0 0 300 300"
-   id="symbol-archery-borderless">
+   id="symbol-archery-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="archery-borderless.svg">
+  <metadata
+     id="metadata16">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="6.2105263"
+     inkscape:cx="19"
+     inkscape:cy="17.470339"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-archery-borderless" />
   <defs
      id="defs2474" />
   <path
      d="M 58.261298,71.858418 C 58.258258,80.787624 65.495987,88.027798 74.425237,88.027798 C 83.354477,88.027798 90.592208,80.787624 90.589168,71.858418 C 90.592208,62.929168 83.354477,55.688978 74.425237,55.688978 C 65.495987,55.688978 58.258258,62.929168 58.261298,71.858418 L 58.261298,71.858418 z"
      id="path2387"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <path
      d="M 69.959369,96.772801 C 71.98539,96.431432 74.06469,96.893278 75.755693,98.060241 L 100.59767,114.66154 L 132.88253,108.80052 C 137.17888,108.02087 141.29377,110.87171 142.07343,115.16807 C 142.85307,119.46441 140.00222,123.5793 135.70588,124.35895 L 100.24949,130.77021 C 98.240939,131.13384 96.169626,130.70547 94.470076,129.57498 L 66.978213,111.17239 C 64.254731,109.39894 62.896171,106.13781 63.555056,102.9553 C 64.213929,99.772781 66.755621,97.319131 69.959369,96.772801 z"
      id="path3168"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.78947365000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
      d="M 68.942546,109.29519 C 68.942546,109.29519 68.587219,166.30833 68.587219,166.30833"
      id="path2383"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:34.3404007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#555555;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:34.34040069999999645;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
      d="M 77.80665,173.55893 L 88.87122,200.50364 L 89.26628,236.07501"
      id="path3157"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#555555;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:19.73684120000000064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
      d="M 61.212962,171.91509 L 60.672082,201.03809 L 46.913852,233.84343"
      id="path2388"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:19.7368412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#555555;fill-opacity:1;fill-rule:evenodd;stroke:#505050;stroke-width:19.73684120000000064;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <g
      transform="matrix(0.6666666,0,0,1,-15.302868,9.0566038)"
-     id="g3233">
+     id="g3233"
+     style="stroke:#505050;stroke-opacity:1">
     <path
        d="M 406.57915,94.737891 C 406.57915,118.7182 387.13879,138.15809 363.1579,138.15809 C 339.177,138.15809 319.73665,118.7182 319.73665,94.737891 C 319.73665,70.757583 339.177,51.317695 363.1579,51.317695 C 387.13879,51.317695 406.57915,70.757583 406.57915,94.737891 L 406.57915,94.737891 z"
        id="path3171"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89434481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:7.89434480999999888;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
        d="M 382.89618,94.736115 C 382.89618,105.63685 374.05936,114.47368 363.15862,114.47368 C 352.25788,114.47368 343.42105,105.63685 343.42105,94.736115 C 343.42105,83.835363 352.25788,74.998553 363.15862,74.998553 C 374.05936,74.998553 382.89618,83.835363 382.89618,94.736115 L 382.89618,94.736115 z"
        id="path3175"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.89473677;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:7.89473676999999885;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
   <path
      d="M 106.23634,70.56298 C 122.2236,70.56298 135.18384,90.00286 135.18384,113.98317 L 135.18384,113.98317 C 135.18384,137.96348 122.2236,157.40337 106.23634,157.40337"
      id="path2392"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:6.44570541;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:6.44570541000000041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
      d="M 109.06653,72.261094 C 109.27928,138.06644 108.9052,99.099774 109.06653,159.10148"
      id="path2398"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.57894742;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:none;fill-rule:evenodd;stroke:#505050;stroke-width:1.57894741999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/atm.svg b/data/styles/symbols/atm.svg
index 2f3d74b452..2bfe1c66ea 100644
--- a/data/styles/symbols/atm.svg
+++ b/data/styles/symbols/atm.svg
@@ -1,30 +1,105 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="20"
-   height="20"
-   id="symbol-atm">
+   width="24"
+   height="24"
+   id="symbol-atm"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="atm.svg">
+  <title
+     id="title2983">ATM Map Icon</title>
+  <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" />
+        <dc:title>ATM Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1059"
+     inkscape:window-height="716"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="17.531842"
+     inkscape:cx="22.986746"
+     inkscape:cy="9.3871637"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-atm">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs2387" />
-  <g
-     id="layer1">
-    <path
-       d="M 4.9278227,4.4824438 L 2.8457825,17.656773 L 16.915327,17.656773 L 14.864833,4.4445865 L 4.9278227,4.4824438 z"
-       id="path2425"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.10947382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       width="14.015866"
-       height="3.0304577"
-       x="2.841054"
-       y="1.4384469"
-       id="rect2397"
-       style="stroke-width:2.49099994;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       d="M 9.4571335,15.333227 C 8.7115335,15.333227 6.6238535,15.034987 6.7729735,13.692907 C 6.9220935,12.350827 8.4132935,13.096427 9.4571335,13.245547 L 9.4571335,11.306987 C 8.2641735,11.008747 6.7729735,10.114027 6.7729735,8.4737071 C 6.7729735,6.8333871 8.2641735,5.7895471 9.4571335,5.7895471 C 9.4571335,4.8948271 9.4571335,4.5965871 9.9044935,4.5965871 C 10.351854,4.5965871 10.351854,4.8948271 10.351854,5.7895471 C 11.246573,5.7895471 13.334253,6.0877871 12.886893,7.1316271 C 12.439533,8.1754671 11.097454,7.7281071 10.351854,7.5789871 L 10.351854,9.5175471 C 11.693933,9.8157871 13.185133,10.710507 13.185133,12.350827 C 13.185133,13.991147 11.843053,15.333227 10.351854,15.333227 C 10.351854,16.227947 10.351854,16.526187 9.9044935,16.526187 C 9.4571335,16.526187 9.4571335,16.227947 9.4571335,15.333227 z M 9.4571335,9.2193071 L 9.4571335,7.5789871 C 8.4132935,7.7281071 8.4132935,9.0701871 9.4571335,9.2193071 z M 10.351854,11.605227 L 10.351854,13.245547 C 11.395693,13.096427 11.395693,11.754347 10.351854,11.605227 z"
-       id="path5"
-       style="fill:#ffffff;stroke:none" />
-  </g>
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 3,0 3,6 21,6 21,0 3,0 z M 5,2 19,2 19,5 5,5 5,2 z"
+     id="rect2984"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 19.5,21 17,3 7,3 4.5,21 z"
+     id="path3754"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="-6.6165323"
+     y="15.044866"
+     id="text3759"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan3761"
+       x="-6.6165323"
+       y="15.044866" /></text>
+  <text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="-4.6201649"
+     y="4.6067157"
+     id="text2987"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       id="tspan2989"
+       x="-4.6201649"
+       y="4.6067157" /></text>
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 11.556391,4.875 0,0.875 C 10.878783,5.9226669 10.260423,6.3200773 9.7744362,6.84375 9.119662,7.5492994 8.669173,8.5046298 8.669173,9.541667 c 0,1.037037 0.5226976,1.906736 1.2180451,2.40625 0.4954579,0.35592 1.0744529,0.542591 1.6691729,0.631945 l 0,3.767361 C 11.296538,16.21618 11.031592,16.024783 10.81203,15.788194 10.384097,15.327077 10.112782,14.726852 10.112782,14.208333 a 0.72187669,0.77785556 0 1 0 -1.443609,0 c 0,1.037037 0.450489,1.992367 1.1052632,2.697917 C 10.260423,17.429924 10.878783,17.827333 11.556391,18 l 0,0.875 L 13,18.875 13,18 c 0.677608,-0.172667 1.295968,-0.570076 1.781955,-1.09375 0.654774,-0.70555 1.105263,-1.66088 1.105263,-2.697917 0,-1.037037 -0.522698,-1.906736 -1.218045,-2.40625 C 14.173715,11.446163 13.59472,11.259492 13,11.170138 l 0,-3.8645824 c 0.315372,0.08395 0.595588,0.2188387 0.81203,0.4131944 0.371669,0.3337422 0.631579,0.8290893 0.631579,1.822917 a 0.72187669,0.77785556 0 1 0 1.443609,0 c 0,-1.3395063 -0.461894,-2.3997147 -1.172932,-3.0381947 C 14.206587,6.0475817 13.605539,5.8248594 13,5.7256944 L 13,4.875 l -1.443609,0 z m -0.02256,2.5277777 c 0.0066,-0.00343 0.01593,0.00334 0.02256,0 l 0,3.5972223 c -0.330954,-0.07996 -0.628272,-0.200171 -0.857143,-0.364583 -0.387359,-0.278265 -0.586466,-0.575231 -0.586466,-1.09375 0,-0.518519 0.271315,-1.1187443 0.699248,-1.5798614 0.213967,-0.2305583 0.468905,-0.4282998 0.721805,-0.5590279 z M 13,12.75 c 0.330955,0.07996 0.628272,0.200171 0.857143,0.364583 0.387359,0.278265 0.586466,0.575231 0.586466,1.09375 0,0.518519 -0.271315,1.118744 -0.699248,1.579861 C 13.524799,16.024783 13.259853,16.21618 13,16.347223 L 13,12.75 z"
+     id="path2991"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/bakery.svg b/data/styles/symbols/bakery.svg
index 2567a141df..92eccfe92d 100644
--- a/data/styles/symbols/bakery.svg
+++ b/data/styles/symbols/bakery.svg
@@ -1,19 +1,72 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="22.000002"
-   height="16.000004"
-   id="symbol-bakery">
+   width="24"
+   height="24"
+   id="symbol-bakery"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bakery.svg">
+  <title
+     id="title2987">Bakery Map Icon</title>
+  <metadata
+     id="metadata8">
+    <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>Bakery Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1106"
+     inkscape:window-height="693"
+     id="namedview6"
+     showgrid="true"
+     inkscape:zoom="19.010213"
+     inkscape:cx="11.86441"
+     inkscape:cy="11.966105"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bakery">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4" />
-  <g
-     id="layer1">
-    <path
-       d="M 6,0 C 3,0 0,1.5 0,6 C 0,10.5 5,16 11,16 C 17,16 22,10 22,6 C 22,1 19,0 16,0 C 13,0 12,1.5 11,3.5 C 10,1.5 9,0 6,0 z M 6,2 C 8.5,2 9.5,4 9.5,6 C 9.5,8 7.5,8.75 5.5,10.25 C 2.9713492,9 2,7.3713068 2,6 C 2,3 3.5,2 6,2 z M 20,6 C 20,7.3207023 18.75,9.25 16.5,10.25 C 14,8.75 12.5,8 12.5,6 C 12.5,4 13.5,2 16,2 C 18.5,2 20,3.5 20,6 z M 11,7.5 C 12,9 13,9.75 15,11.25 C 14,11.75 12,11.75 11,11.75 C 9.5,11.75 8,11.75 7,11.25 C 9,9.75 10,9 11,7.5 z"
-       id="path2426"
-       style="fill:#976400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 10.959668,8.1379675 C 9.4392592,8.5453598 8.1497631,8.9507594 7.0458496,9.348434 c 0.046302,0.00278 0.094323,0.010583 0.1369238,0.027992 C 7.6939082,9.5856156 7.590676,11.007704 6.9631193,12.541112 6.335556,14.074544 5.4298997,15.142189 4.9187641,14.933003 4.4076282,14.723819 4.5108613,13.301726 5.1384179,11.768319 5.5931962,10.657088 6.1962029,9.7914838 6.6917156,9.475676 1.6597705,11.351511 0.90615395,13.118478 1.3697601,14.84868 c 0.5717674,2.133864 3.2009778,3.283406 11.6604599,1.016694 8.713537,-2.334785 10.161676,-4.576848 9.589908,-6.7107129 -0.406113,-1.515637 -1.76144,-2.570209 -5.608834,-2.217641 0.294918,0.4517372 0.15158,1.6952321 -0.388923,3.0159259 -0.627557,1.533407 -1.533213,2.601052 -2.044348,2.391867 -0.511137,-0.209185 -0.407904,-1.631278 0.219653,-3.1646845 0.400668,-0.9790163 0.910224,-1.7529336 1.366266,-2.1454706 -1.420483,0.1869807 -3.12694,0.5466894 -5.204274,1.1033096 z m 0.847352,-0.097638 c 0.07269,-0.00786 0.141483,0.01588 0.205376,0.042027 0.511135,0.2091854 0.407902,1.6312771 -0.219654,3.1646852 -0.627557,1.533407 -1.533213,2.601052 -2.0443484,2.391866 -0.5111363,-0.209184 -0.407903,-1.631277 0.2196534,-3.164684 0.470667,-1.1500558 1.100908,-2.0534561 1.60558,-2.3390043 0.08411,-0.047591 0.160703,-0.087035 0.233393,-0.09489 z"
+     id="path2984"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/bank.svg b/data/styles/symbols/bank.svg
index 5e25409f87..1cae24401f 100644
--- a/data/styles/symbols/bank.svg
+++ b/data/styles/symbols/bank.svg
@@ -1,5 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="bank" viewBox="0 0 125 125" height="18.64">
-   <svg:path style="fill:#000000; stroke:none;" d="M 65,0.2965772 L 0,50 L 15,50 L 15,125 L 110,125 L 110,50 L 125,50 L 65,0.2965772 z"/>
-   <svg:path style="fill:#ffffff; stroke:none" d="M 62,102 C 57,102 43,100 44,91 C 45,82 55,87 62,88 L 62,75 C 54,73 44,67 44,56 C 44,45 54,38 62,38 C 62,32 62,30 65,30 C 68,30 68,32 68,38 C 74,38 88,40 85,47 C 82,54 73,51 68,50 L 68,63 C 77,65 87,71 87,82 C 87,93 78,102 68,102 C 68,108 68,110 65,110 C 62,110 62,108 62,102 z M 62,61 L 62,50 C 55,51 55,60 62,61 z M 68,77 L 68,88 C 75,87 75,78 68,77 z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="18.64"
+   id="bank"
+   viewBox="0 0 125 125"
+   height="18.64"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bank.svg">
+  <metadata
+     id="metadata11">
+    <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="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="bank" />
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="M 65,0.2965772 L 0,50 L 15,50 L 15,125 L 110,125 L 110,50 L 125,50 L 65,0.2965772 z"
+     id="path3" />
+  <path
+     style="fill:#ffffff; stroke:none"
+     d="M 62,102 C 57,102 43,100 44,91 C 45,82 55,87 62,88 L 62,75 C 54,73 44,67 44,56 C 44,45 54,38 62,38 C 62,32 62,30 65,30 C 68,30 68,32 68,38 C 74,38 88,40 85,47 C 82,54 73,51 68,50 L 68,63 C 77,65 87,71 87,82 C 87,93 78,102 68,102 C 68,108 68,110 65,110 C 62,110 62,108 62,102 z M 62,61 L 62,50 C 55,51 55,60 62,61 z M 68,77 L 68,88 C 75,87 75,78 68,77 z"
+     id="path5" />
+</svg>
diff --git a/data/styles/symbols/bar.svg b/data/styles/symbols/bar.svg
index f770c2f944..37da8ab0c3 100644
--- a/data/styles/symbols/bar.svg
+++ b/data/styles/symbols/bar.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
 
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -7,139 +7,55 @@
    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"
-   width="16px"
-   height="16px"
-   id="svg5079"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="bar.svg">
-  <title
-     id="title2821">bar icon</title>
-  <defs
-     id="defs5081">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 8 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="16 : 8 : 1"
-       inkscape:persp3d-origin="8 : 5.3333333 : 1"
-       id="perspective5087" />
-    <inkscape:perspective
-       id="perspective5074"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5106"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5037"
-       id="radialGradient5043"
-       cx="11.440678"
-       cy="1.3220339"
-       fx="11.440678"
-       fy="1.3220339"
-       r="9.4067793"
-       gradientTransform="matrix(1,0,0,0.05405406,0,1.2505726)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5037">
-      <stop
-         style="stop-color:#cc960c;stop-opacity:1;"
-         offset="0"
-         id="stop5039" />
-      <stop
-         style="stop-color:#a1510c;stop-opacity:0.92105263;"
-         offset="1"
-         id="stop5041" />
-    </linearGradient>
-    <radialGradient
-       r="9.4067793"
-       fy="1.3220339"
-       fx="11.440678"
-       cy="1.3220339"
-       cx="11.440678"
-       gradientTransform="matrix(1,0,0,0.05405406,0,1.2505726)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5115"
-       xlink:href="#linearGradient5037"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.098901"
-     inkscape:cx="-1.5323749"
-     inkscape:cy="11.666031"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="800"
-     inkscape:window-height="600"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata5084">
-    <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>bar icon</dc:title>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       d="m 0.37954318,0.72509711 15.23348882,0 -7.0622893,5.89980539 0,7.8665235 c 0.018717,0 -0.2853452,0.906451 4.7477673,1.231857 l 0,0.224697 -10.2044268,0 2.494e-4,-0.224697 C 7.968468,15.397877 7.6902189,14.491426 7.6902189,14.491426 l 0,-7.8665235 -7.31067572,-5.89980539 z"
-       id="path3"
-       style="stroke-width:0.40000001" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#radialGradient5115);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2817"
-       sodipodi:cx="11.440678"
-       sodipodi:cy="1.3220339"
-       sodipodi:rx="9.4067793"
-       sodipodi:ry="0.50847459"
-       d="m 20.847457,1.3220339 a 9.4067793,0.50847459 0 1 1 -18.8135586,0 9.4067793,0.50847459 0 1 1 18.8135586,0 z"
-       transform="matrix(0.80264676,0,0,0.89490292,-1.1974094,-0.43687456)" />
-  </g>
-</svg>
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 99.801 100"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bar.svg"><title
+   id="title3768">Bar Map Icon</title><metadata
+   id="metadata11"><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>Bar Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="866"
+   inkscape:window-height="666"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="18.583333"
+   inkscape:cx="12"
+   inkscape:cy="12.15012"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2983"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+<path
+   d="M 57.862,-45.945"
+   id="path5"
+   inkscape:connector-curvature="0" />
+<path
+   style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+   d="M 2 2 L 11 12 L 11 20 L 7 20 C 6.446 20 6 20.446 6 21 C 6 21.554 6.446 22 7 22 L 17 22 C 17.554 22 18 21.554 18 21 C 18 20.446 17.554 20 17 20 L 13 20 L 13 12 L 22 2 L 2 2 z M 4.6875 3 L 19.3125 3 L 16.59375 6 L 7.40625 6 L 4.6875 3 z M 13 8 C 13.552285 8 14 8.4477153 14 9 C 14 9.5522847 13.552285 10 13 10 C 12.447715 10 12 9.5522847 12 9 C 12 8.4477153 12.447715 8 13 8 z "
+   id="path2985" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/baseball-borderless.svg b/data/styles/symbols/baseball-borderless.svg
index 4be6afd408..b47852d53a 100644
--- a/data/styles/symbols/baseball-borderless.svg
+++ b/data/styles/symbols/baseball-borderless.svg
@@ -1,19 +1,58 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="25"
    height="25"
    viewBox="0 0 300 300"
-   id="symbol-baseball-borderless">
+   id="symbol-baseball-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="baseball-borderless.svg">
+  <metadata
+     id="metadata11">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="12.5"
+     inkscape:cy="11.493644"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-baseball-borderless" />
   <defs
      id="defs16" />
   <path
      d="M 39.090816,260.90921 C 26.969728,248.7881 26.969728,224.54591 39.090816,212.42483 C 51.211907,200.30374 75.454099,200.30374 87.575173,212.42483 C 99.696269,224.54591 99.696269,248.7881 87.575173,260.90921 C 75.454099,273.03028 51.211907,273.03028 39.090816,260.90921 z"
      id="path2393"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93193001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93193000999999998px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <path
      d="M 39.090816,212.42483 C 39.090816,212.42483 49.191725,220.50555 63.332998,220.50555 C 77.474263,220.50555 87.575173,212.42483 87.575173,212.42483"
      id="path3303"
@@ -25,9 +64,9 @@
   <path
      d="M 238.67679,297.78461 C 248.21215,290.61173 251.97113,282.83338 249.0123,276.39766 C 247.18129,272.41504 203.85749,230.40681 157.77016,187.92619 C 148.73504,179.59814 132.75765,164.85972 122.26488,155.17413 C 92.598199,127.78968 80.911051,117.12713 57.924089,96.474078 C 29.971921,71.359939 20.516652,61.668152 20.516652,58.130914 C 20.516652,51.433175 13.549793,47.907691 7.0635109,51.323136 C -2.6972564,56.46281 -2.210698,72.179734 7.7091856,72.179734 C 10.699467,72.179734 21.829061,81.902202 34.363659,95.464252 C 37.247465,98.584446 46.163087,108.2609 54.176141,116.96749 C 62.189202,125.67407 78.019156,142.52739 89.353825,154.41931 C 100.68849,166.31123 123.41955,190.79371 139.86732,208.82483 C 156.31507,226.85595 182.39734,254.7509 197.8279,270.81362 C 225.88347,300.01855 225.88347,300.01855 230.82122,299.99903 C 235.04681,299.98232 236.17981,299.66293 238.67679,297.78461 z"
      id="path3446"
-     style="fill:#000000" />
+     style="fill:#50524e;fill-opacity:1" />
   <path
      d="M 136.05791,71.528011 C 136.05791,71.528011 110.08781,82.215411 102.10357,87.325323 C 95.378665,91.629253 93.583495,106.53683 119.94123,110.53921 C 146.29897,114.54161 151.99891,110.96493 172.06465,110.79351 C 180.90387,110.02643 182.23144,113.93417 180.95394,116.48911 L 174.74976,130.29911 C 170.12256,140.59888 177.8852,154.83116 185.86603,160.84728 C 191.64253,165.20174 205.85062,171.0294 221.0414,170.77702 C 235.34544,170.54182 247.07049,166.12689 258.70403,159.40385 C 270.33758,152.68082 287.99159,140.77787 295.29648,124.98796 C 302.60135,109.19805 299.03307,66.353803 297.02348,55.169076 C 294.95827,43.674832 283.84605,25.698909 273.94574,19.351554 C 264.18793,13.095551 254.89028,6.1239371 234.73327,1.9513782 C 214.51057,-2.2347839 197.24572,1.0522656 184.72733,4.3821967 C 172.2847,7.6919741 164.12616,12.703157 156.97115,17.175029 C 149.81617,21.646898 146.41793,27.339809 142.19703,37.378436 C 138.08997,47.146337 136.05791,71.528011 136.05791,71.528011 z M 213.9401,130.67313 C 211.1556,131.94632 208.90381,135.31321 208.97758,137.96949 C 209.0513,140.62273 210.64218,143.54476 212.71176,144.99562 C 214.78134,146.4465 217.14392,146.26288 220.42576,145.53609 C 223.6913,144.81294 231.23928,143.36434 233.79014,141.85107 C 236.37277,140.31895 237.90315,139.57213 238.82636,136.64288 C 239.74267,133.73555 237.91813,129.58958 235.0185,128.56038 C 232.1844,127.55446 228.44994,128.18583 223.80088,128.56798 C 219.65429,128.90883 216.69606,129.413 213.9401,130.67313 z"
      id="path3478"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44016922px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     style="fill:#50524e;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.44016922000000003px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/bicycle_rental.svg b/data/styles/symbols/bicycle_rental.svg
index 91db8a3505..183548d5bb 100644
--- a/data/styles/symbols/bicycle_rental.svg
+++ b/data/styles/symbols/bicycle_rental.svg
@@ -1,55 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="16"
-   height="16"
-   id="symbol-bicycle-rental">
+   width="24"
+   height="24"
+   id="symbol-bicycle-rental"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bicycle_rental.svg">
+  <metadata
+     id="metadata17">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="711"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="5.2015913"
+     inkscape:cx="16.050767"
+     inkscape:cy="2.3147699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bicycle-rental">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2994"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="false" />
+  </sodipodi:namedview>
   <defs
      id="defs2477" />
-  <g
-     transform="matrix(0.2297763,-0.21971,0.21971,0.2297763,-15.777098,7.0450764)"
-     id="g2467">
-    <path
-       d="M 57.120282,25.87914 C 57.120244,24.727187 56.712245,23.767188 55.896282,22.99914 C 55.128246,22.23119 54.168247,21.84719 53.016282,21.84714 C 51.91225,21.84719 50.952251,22.25519 50.136282,23.07114 C 49.368252,23.839188 48.984253,24.775187 48.984282,25.87914 C 48.984253,26.983185 49.368252,27.943184 50.136282,28.75914 C 50.952251,29.527183 51.91225,29.911182 53.016282,29.91114 C 54.168247,29.911182 55.128246,29.527183 55.896282,28.75914 C 56.712245,27.991184 57.120244,27.031185 57.120282,25.87914"
-       id="path3555"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DNR Recreation Symbols;-inkscape-font-specification:DNR Recreation Symbols" />
-    <path
-       d="M 73.608282,55.32714 C 73.608228,52.30316 72.528229,49.735162 70.368282,47.62314 C 68.256233,45.463167 65.688236,44.383168 62.664282,44.38314 C 59.640242,44.383168 57.048245,45.463167 54.888282,47.62314 C 52.776249,49.735162 51.72025,52.30316 51.720282,55.32714 C 51.72025,58.351154 52.776249,60.943151 54.888282,63.10314 C 57.048245,65.215147 59.640242,66.271146 62.664282,66.27114 C 65.688236,66.271146 68.256233,65.215147 70.368282,63.10314 C 72.528229,60.943151 73.608228,58.351154 73.608282,55.32714"
-       id="path3553"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DNR Recreation Symbols;-inkscape-font-specification:DNR Recreation Symbols" />
-    <path
-       d="M 59.640282,37.75914 C 59.640242,36.559176 59.064243,35.959176 57.912282,35.95914 L 53.088282,35.95914 L 49.488282,29.19114 C 48.912253,28.375184 48.120253,27.967184 47.112282,27.96714 C 46.056256,27.967184 45.264256,28.351184 44.736282,29.11914 L 36.960282,36.75114 C 36.336265,37.375175 36.024266,38.239174 36.024282,39.34314 C 36.024266,40.783171 36.480265,41.74317 37.392282,42.22314 L 46.176282,47.04714 L 46.104282,55.83114 C 46.104256,57.271155 46.824255,57.991154 48.264282,57.99114 C 49.752252,57.991154 50.496251,57.271155 50.496282,55.83114 L 50.496282,45.03114 C 50.496251,44.455168 50.232251,43.711168 49.704282,42.79914 L 43.800282,39.63114 L 48.552282,34.80714 L 50.568282,38.69514 C 50.856251,39.223173 51.36025,39.487173 52.080282,39.48714 L 57.840282,39.48714 C 59.040243,39.487173 59.640242,38.911173 59.640282,37.75914"
-       id="path3551"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DNR Recreation Symbols;-inkscape-font-specification:DNR Recreation Symbols" />
-    <path
-       d="M 45.168282,55.32714 C 45.168256,52.30316 44.088258,49.735162 41.928282,47.62314 C 39.816262,45.463167 37.248264,44.383168 34.224282,44.38314 C 31.20027,44.383168 28.608273,45.463167 26.448282,47.62314 C 24.336277,49.735162 23.280278,52.30316 23.280282,55.32714 C 23.280278,58.351154 24.336277,60.943151 26.448282,63.10314 C 28.608273,65.215147 31.20027,66.271146 34.224282,66.27114 C 37.248264,66.271146 39.816262,65.215147 41.928282,63.10314 C 44.088258,60.943151 45.168256,58.351154 45.168282,55.32714"
-       id="path3549"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DNR Recreation Symbols;-inkscape-font-specification:DNR Recreation Symbols" />
-    <path
-       d="M 71.520282,55.32714 C 71.52023,57.775154 70.656231,59.863152 68.928282,61.59114 C 67.200234,63.319149 65.112237,64.183148 62.664282,64.18314 C 60.216241,64.183148 58.128243,63.319149 56.400282,61.59114 C 54.672247,59.863152 53.808248,57.775154 53.808282,55.32714 C 53.808248,52.879159 54.672247,50.791161 56.400282,49.06314 C 58.128243,47.335165 60.216241,46.471166 62.664282,46.47114 C 65.112237,46.471166 67.200234,47.335165 68.928282,49.06314 C 70.656231,50.791161 71.52023,52.879159 71.520282,55.32714"
-       id="path3547"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DNR Recreation Symbols;-inkscape-font-specification:DNR Recreation Symbols" />
-    <path
-       d="M 43.080282,55.32714 C 43.080259,57.775154 42.216259,59.863152 40.488282,61.59114 C 38.760263,63.319149 36.672265,64.183148 34.224282,64.18314 C 31.77627,64.183148 29.688272,63.319149 27.960282,61.59114 C 26.232275,59.863152 25.368276,57.775154 25.368282,55.32714 C 25.368276,52.879159 26.232275,50.791161 27.960282,49.06314 C 29.688272,47.335165 31.77627,46.471166 34.224282,46.47114 C 36.672265,46.471166 38.760263,47.335165 40.488282,49.06314 C 42.216259,50.791161 43.080259,52.879159 43.080282,55.32714"
-       id="text3540"
-       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DNR Recreation Symbols;-inkscape-font-specification:DNR Recreation Symbols" />
-  </g>
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="19"
+     x="20"
+     y="4" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect2998"
+     width="23"
+     height="1"
+     x="0"
+     y="22" />
   <path
-     d="M 7.4758621,9.9693176 C 7.2672762,9.8923866 7.0964376,9.7331476 6.1948997,8.7753276 C 5.6382224,8.1838972 5.1672414,7.7017262 5.1482759,7.7038359 C 5.1293103,7.7059455 4.4008659,7.8977276 3.52951,8.1300186 C 1.79637,8.5920486 1.7791414,8.5945621 1.4958955,8.4266379 C 1.3059193,8.3140086 1.0167497,8.0106276 0.91833345,7.8206897 C 0.80732483,7.606449 0.80340483,7.3988921 0.87102517,5.3157272 C 0.92396,3.6849817 0.93286034,3.5524014 0.99801897,3.4241379 C 1.160301,3.1046876 1.479869,2.8896552 1.7923341,2.8896552 C 1.9291738,2.8896552 2.26017,2.9832672 3.1528652,3.274439 L 4.3325621,3.6592231 L 4.9227014,3.0934048 C 5.5361886,2.5052 5.7009114,2.3915617 5.8863028,2.42864 C 6.0202752,2.4554345 6.2799152,2.6806269 6.3377103,2.8201572 C 6.3964359,2.9619317 6.3627034,3.1780624 6.2636669,3.2945748 C 6.1316576,3.4498786 4.8267279,4.6911841 4.7248362,4.7583772 C 4.5729803,4.8585197 4.4167321,4.8332097 3.7194193,4.5955159 C 3.3560979,4.4716697 3.0440462,4.3794824 3.0259697,4.3906541 C 3.0062797,4.4028234 2.9931034,4.8396421 2.9931034,5.4802207 C 2.9931034,6.4943962 2.9963024,6.5484597 3.0552062,6.5297645 C 3.4051393,6.4186997 4.9963662,5.9936262 5.0630417,5.9933997 C 5.110991,5.9932372 5.2584045,6.0453514 5.3906279,6.1092097 C 5.6163062,6.2182028 5.707039,6.3050583 6.871611,7.5269 C 7.5539283,8.2427714 8.1472783,8.8760469 8.1901666,8.934179 C 8.3501214,9.1509855 8.3277707,9.4171341 8.1294707,9.6569307 C 7.9570672,9.8654117 7.6247603,10.024235 7.4758621,9.9693176 z"
-     id="path2387"
-     style="fill:#0000ff" />
-  <path
-     d="M 3.6765952,15.668049 C 2.366769,15.43556 1.2938417,14.473846 0.90390621,13.182759 C 0.81865345,12.900483 0.80987138,12.819394 0.80681207,12.286207 C 0.80392655,11.78337 0.81453862,11.656466 0.88142793,11.393897 C 1.0358531,10.787712 1.341529,10.258148 1.8003476,9.8019269 C 2.2621741,9.3427145 2.7530586,9.0535628 3.3355231,8.8976431 C 3.6273297,8.819529 3.7313583,8.8093931 4.2344828,8.8100486 C 4.7318597,8.8106969 4.8447159,8.8217476 5.1314303,8.8978741 C 5.6839124,9.0445666 6.0951972,9.2621331 6.4932021,9.6182424 C 7.1369062,10.194188 7.5068845,10.831238 7.6521528,11.613793 C 7.71175,11.934842 7.7017072,12.645506 7.6330048,12.968782 C 7.3647434,14.231076 6.3175193,15.306671 5.0570731,15.614502 C 4.6823434,15.70602 4.0325252,15.731226 3.6765952,15.66805 L 3.6765952,15.668049 z M 4.7977059,15.012525 C 5.8967162,14.802249 6.7907041,13.914894 7.0140531,12.812621 C 7.0924207,12.425862 7.0658334,11.761601 6.9584783,11.424138 C 6.7883762,10.889435 6.4315583,10.35946 6.019689,10.029772 C 5.7503228,9.8141521 5.25426,9.5635714 4.9586207,9.4937838 C 4.2665797,9.3304224 3.5596407,9.4090879 2.9540083,9.7168479 C 2.2752948,10.061746 1.7027938,10.765711 1.5052645,11.49827 C 1.4070938,11.862348 1.3990834,12.593533 1.4896479,12.923822 C 1.7296817,13.799223 2.3487745,14.519136 3.1482759,14.852557 C 3.6318814,15.054238 4.2608659,15.115239 4.7977059,15.012524 L 4.7977059,15.012525 z"
-     id="path2389"
-     style="fill:#0000ff" />
-  <path
-     d="M 10.336386,9.4379497 C 9.2125272,9.2925979 8.1753279,8.5387628 7.6522734,7.4871403 C 7.1910397,6.5598128 7.2105379,5.358201 7.7022676,4.4061217 C 8.133751,3.5706897 8.9847931,2.8792193 9.8724138,2.6428797 C 10.238042,2.5455269 11.188902,2.532281 11.562639,2.6193345 C 12.173221,2.7615555 12.6821,3.0375234 13.145552,3.4777572 C 13.924127,4.2173272 14.275297,5.0967559 14.224473,6.1796807 C 14.185022,7.0202917 13.894291,7.7107031 13.317363,8.3338383 C 12.537297,9.1763814 11.444246,9.5812328 10.336386,9.4379497 L 10.336386,9.4379497 z M 11.24512,8.7822817 C 11.874232,8.6848428 12.402406,8.3916186 12.87746,7.8760614 C 13.562754,7.1323386 13.785149,6.0540986 13.456618,5.0681166 C 13.155412,4.1641403 12.305854,3.4134559 11.365247,3.2201421 C 10.239638,2.9888069 9.0939717,3.4488914 8.4400124,4.3948769 C 8.0767772,4.9203155 7.9389055,5.4263369 7.9676648,6.1285031 C 7.9946528,6.7874103 8.1598903,7.2353031 8.5649928,7.7476124 C 9.2058769,8.5581007 10.204191,8.9435024 11.245119,8.7822814 L 11.24512,8.7822817 z"
-     id="path2391"
-     style="fill:#0000ff" />
-  <path
-     d="M 1.7387583,2.5594193 C 1.3844328,2.4462645 1.1110107,2.2033845 0.94688483,1.856001 C 0.85562276,1.66284 0.84164138,1.5953366 0.84332103,1.356001 C 0.84585724,0.99455586 0.93990379,0.74652517 1.1697928,0.49499 C 1.3732486,0.27237724 1.6713938,0.11155069 1.9436976,0.077528621 C 2.1671986,0.049604138 2.4997186,0.10662 2.6953141,0.20640517 C 2.8956662,0.30861759 3.1573903,0.58833414 3.2624769,0.81255897 C 3.3422555,0.98278345 3.3549162,1.053591 3.3533338,1.3206897 C 3.3517955,1.5802293 3.3366669,1.6633131 3.2609179,1.8282093 C 2.9914148,2.4148831 2.3104645,2.7419959 1.7387583,2.5594193 z"
-     id="path2393"
-     style="fill:#0000ff" />
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.94285715000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 14.4375,10.4375 c -0.553649,-0.01823 -1.090535,0.03358 -1.625,0.125 C 11.743569,10.745351 10.735791,11.133884 9.75,11.75 9.4720262,11.847716 9.3354337,12.223194 9.4856462,12.476677 9.6358588,12.730161 10.030804,12.790653 10.25,12.59375 10.989815,12.131368 11.732521,11.813977 12.5,11.625 l 0,1.40625 -4.8125,0 -0.15625,-0.4375 0.46875,0 c 0.2641563,0.0037 0.507121,-0.235817 0.507121,-0.5 0,-0.264183 -0.2429647,-0.503736 -0.507121,-0.5 L 6,11.5625 c -0.041448,-0.0052 -0.083552,-0.0052 -0.125,0 -0.2618101,0.03271 -0.4702528,0.300695 -0.4375267,0.562503 C 5.4701993,12.386812 5.7381934,12.59524 6,12.5625 l 0.5,0 c 0.0018,0.04622 0.015068,0.0809 0.03125,0.125 L 6.6875,13.125 c -0.035221,0.02691 -0.066839,0.05853 -0.09375,0.09375 L 5.6875,14.375 C 5.169879,14.133942 4.6072784,13.96875 4,13.96875 c -2.2302388,0 -4.0625,1.832261 -4.0625,4.0625 0,2.230238 1.8322612,4.0625 4.0625,4.0625 1.9166115,0 3.5222643,-1.36345 3.9375,-3.15625 l 0.1875,0.03125 c 0.1650688,0.325123 0.4854106,0.5625 0.875,0.5625 0.5522847,0 1,-0.447715 1,-1 0,-0.211944 -0.075023,-0.40075 -0.1875,-0.5625 l 1.0625,-2.0625 1.90625,-1.53125 0.09375,0.25 c -1.141784,0.716515 -1.9375,1.962632 -1.9375,3.40625 0,2.230238 1.832261,4.0625 4.0625,4.0625 0.721809,0 1.444875,-0.03852 2.079202,-0.09375 l -0.0167,-0.46875 c 0,-0.02191 2.29e-4,-0.04072 0,-0.0625 1.02882,-0.621265 1.771616,-1.664506 1.9375,-2.90625 0.294601,-0.02032 0.634923,-0.03125 1,-0.03125 l 0,-1 c -0.357303,0 -0.694288,-0.01014 -1,0 -0.250563,-1.99202 -1.941506,-3.5625 -4,-3.5625 -0.41817,0 -0.80766,0.100266 -1.1875,0.21875 L 13.5,13.40625 l 0,-1.9375 c 0.769683,-0.06836 1.557959,-0.02058 2.375,0.1875 0.253618,0.06545 0.543925,-0.105757 0.609375,-0.359375 C 16.549825,11.043257 16.378618,10.75295 16.125,10.6875 15.56156,10.544007 14.991149,10.455733 14.4375,10.4375 z M 8,14.03125 l 3.5625,0 -1.375,1.09375 -0.09375,0.09375 L 10.0625,15.3125 9.09375,17.25 z m -0.9375,0.25 L 8.25,17.875 C 8.225879,17.90265 8.208502,17.93855 8.1875,17.96875 L 8.0625,17.9375 c -0.02812,-1.212827 -0.6269771,-2.275746 -1.5,-3 z M 4,15.09375 c 0.364637,0 0.7093211,0.06764 1.03125,0.1875 L 3.125,17.75 c -0.2265064,0.280021 -0.014949,0.780066 0.34375,0.8125 l 3.375,0.28125 C 6.4916435,20.080882 5.3529054,21 4,21 2.3642454,21 1.03125,19.667004 1.03125,18.03125 c 0,-1.635755 1.3329954,-2.9375 2.96875,-2.9375 z m 11,0 c 1.506407,0 2.720136,1.108215 2.90625,2.5625 -0.483627,0.08398 -0.898859,0.216983 -1.21875,0.46875 -0.535389,0.421369 -0.700856,1.073019 -0.71875,1.65625 C 15.95822,20.124675 15.96995,20.468115 16,20.8125 15.688186,20.923949 15.351006,21 15,21 c -1.635755,0 -2.9375,-1.332996 -2.9375,-2.96875 0,-0.997191 0.465908,-1.872035 1.21875,-2.40625 l 1.25,3.09375 c 0.09817,0.245437 0.410813,0.379425 0.65625,0.28125 0.245437,-0.09818 0.379425,-0.410813 0.28125,-0.65625 l -1.25,-3.15625 C 14.469063,15.118938 14.727374,15.09375 15,15.09375 z m -9.09375,0.6875 c 0.5945518,0.50219 0.9781493,1.233789 1.03125,2.0625 L 4.46875,17.625 z m 11.96875,2.9375 c -0.139293,0.583918 -0.447081,1.109208 -0.875,1.5 -0.0088,-0.13702 -0.03489,-0.28759 -0.03125,-0.40625 0.01398,-0.455714 0.102175,-0.684872 0.34375,-0.875 0.09741,-0.07666 0.299111,-0.155057 0.5625,-0.21875 z"
+     id="path3000"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sscsccccccscccsccccccsssccssccccsscccccccsccccscscccccccccccccsccccsssscsccssccsccsccccccscc" />
 </svg>
diff --git a/data/styles/symbols/bird.svg b/data/styles/symbols/bird.svg
index f3181c12bc..90eacbd298 100644
--- a/data/styles/symbols/bird.svg
+++ b/data/styles/symbols/bird.svg
@@ -1,26 +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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="16"
-   height="16"
-   id="symbol-bird">
+   width="24"
+   height="24"
+   id="symbol-bird"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bird.svg">
+  <title
+     id="title2988">Birds Park Map Icon</title>
+  <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" />
+        <dc:title>Birds Park Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1178"
+     inkscape:window-height="749"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="20.243129"
+     inkscape:cx="19.9153"
+     inkscape:cy="11.104074"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bird">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs3341" />
   <g
-     id="g3129">
-    <rect
-       width="16"
-       height="16"
-       x="-0.073563218"
-       y="0.036781609"
-       style="fill:#c7f1a3;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2158" />
+     id="g3803"
+     transform="matrix(1.5243069,0,0,1.5715193,7.3028534,-0.3369297)">
     <path
-       d="M 10.291648,10.6739 C 9.8568485,10.26695 9.141758,10.0331 8.711683,9.8611505 C 7.9484035,9.8311505 7.511643,9.8042005 6.8842125,9.5406505 C 6.4365055,9.5824505 6.045705,9.7243505 5.814369,10.0643 C 6.3784825,9.9457005 6.6854945,10.00955 6.9697355,10.44715 C 7.01647,10.5264 7.018352,10.53115 6.9985945,10.52 C 6.695604,10.38205 6.1663205,10.01725 5.787972,10.1333 C 5.2219095,9.9639505 5.072392,10.2987 4.8166119,10.63005 L 4.7506281,10.32155 C 4.5413822,10.3623 4.3806752,10.49575 4.1779141,10.55365 C 4.8452469,9.9696505 5.844733,9.7455005 6.717884,9.4401505 C 6.322932,9.1607005 5.9241325,9.0806005 5.430826,9.0515505 C 5.2533745,9.0456005 5.1884715,9.0590005 5.1175865,9.1161005 C 4.965095,9.2195505 4.9294111,9.4763005 4.817127,9.5859005 C 4.7660172,9.4932005 4.8525216,9.3367005 4.7597417,9.2956505 C 4.5655792,9.2901505 4.3718041,9.4543505 4.1805749,9.5102505 C 4.3595802,9.0417505 5.155623,9.0479005 5.5926105,8.8758505 C 4.9838033,8.5758505 4.3963709,8.2478505 3.8401712,7.8797505 C 2.6148202,7.0590505 1.9210904,5.9154005 1.9237271,4.5844505 C 1.9385081,4.2905505 1.959948,4.1303005 2.0627278,3.5453505 C 2.1273531,3.1775505 2.1318007,3.1400005 2.1264762,3.0075005 C 2.1152461,2.7280005 2.0369996,2.5419505 1.762123,2.1410005 C 1.5823325,1.8787005 1.4937322,1.7320505 1.4336612,1.5972005 C 1.4152416,1.5558505 1.4044683,1.5400005 1.3919162,1.5358005 C 1.382611,1.5326505 1.275733,1.5301005 1.1544093,1.5300505 C 0.62432605,1.5298505 0.33957278,1.5075505 0.086899765,1.4466005 L 0,1.4256005 L 0.05771199,1.3841505 C 0.22636968,1.2629005 0.44263471,1.2073005 0.9593986,1.1523005 C 1.1595541,1.1309505 1.2010235,1.1210505 1.2540862,1.0820005 C 1.3218174,1.0321005 1.3981031,0.91470046 1.4969389,0.70830046 C 1.5734819,0.54840046 1.5889315,0.52515046 1.6593008,0.46355046 C 1.8222327,0.32090046 2.044632,0.21220046 2.3479005,0.12700046 C 2.6539081,0.041050464 2.9587735,0.00015046356 3.2942743,4.635608e-07 C 3.7252748,-0.00019953644 4.00638,0.064300464 4.2771876,0.22540046 C 4.8938312,0.57025046 5.280662,1.0720005 5.6672375,1.5964505 C 6.15611,2.2887005 6.7317105,2.9306005 7.256694,3.6020005 C 8.2925135,4.9134005 8.9135725,6.4226005 9.756456,7.8213505 C 11.401243,10.6983 14.90315,12.5894 16,15.69645 C 15.97815,15.80885 15.964061,15.906 15.960647,15.96785 L 15.958874,16 C 14.289035,14.2067 12.105412,12.1952 10.291648,10.6739 z "
-       style="fill:#000000"
-       id="path3347" />
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path2997"
+       d="M -1.5560836,6.6082327 C -2.8228262,5.3050126 -2.7953466,5.0382957 -3.478862,4.0323588 -3.8203472,3.6064401 -4.2805402,2.0419564 -4.1348979,1.4870513 -2.3093273,3.087641 -0.31427886,5.636444 1.5807833,5.7990076 3.318108,5.5637745 4.5593833,3.2962301 5.6809401,3.3507424 c 0.8986607,0 1.6135586,0.44511 1.9018797,1.3614767 L 9.85978,5.2882015 C 8.9705893,5.7657298 8.5214102,5.7660746 7.6322195,6.2436029 6.9726862,8.4187052 5.2929583,10.617447 2.9392689,10.837754 1.2141556,10.824215 -0.10356506,10.42219 -1.3090862,8.5900782 -1.8003687,7.7173541 -1.7866095,6.8446299 -1.5560836,5.9719058"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 0.25,12.75 -0.46875,0.375 c 0.46241486,0.58865 0.86530691,1.022172 0.875,2.375 l 0.59375,0 c -0.010633,-1.484004 -0.54405818,-2.16959 -1,-2.75 z m 0.09375,-0.125 c -0.80697666,-0.05044 -1.632415,0.0575 -2.4375,0.28125 l 0.1875,0.5625 c 0.7427654,-0.20643 1.47787632,-0.265054 2.21875,-0.21875 0.7042713,0.156331 1.24078,0.467268 1.9702513,1.78125 L 2.7893016,14.675901 C 1.9770564,13.21282 1.2093514,12.829554 0.375,12.65625 l 0,-0.03125 z m 0.5625,-2.5 L 0,12.96875 0.5625,13.15625 1.46875,10.3125 z"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.60000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       id="path3773" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path3799"
+       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.60000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="M 3.1575746,12.375164 2.808918,12.855003 c 0.5885208,0.453502 1.0810391,0.771899 1.435393,2.077528 L 4.8071362,14.784014 C 4.4184227,13.351786 3.7378571,12.822318 3.1575746,12.375164 z m 0.056974,-0.144313 c -0.7778155,0.153082 -1.1622253,-0.03008 -1.8682897,0.387647 l 0.3706521,0.472283 c 0.6514099,-0.385388 0.9133801,-0.107253 1.6274803,-0.247799 0.7074769,-0.02501 1.4124422,0.110551 2.4391741,1.198579 L 6.2153865,13.636736 C 5.0721502,12.425249 4.0872569,12.212119 3.2521444,12.25325 l -0.00797,-0.03022 -0.029622,0.0078 z M 3.1098919,9.6728939 2.9764084,12.649208 3.5574505,12.689802 3.690934,9.713488 z" />
+    <path
+       transform="matrix(0.56097563,0,0,0.63235293,2.546483,1.7004691)"
+       d="m 6.6442301,4.8604174 c 0,0.4638038 -0.4533964,0.8397911 -1.0126893,0.8397911 -0.5592929,0 -1.0126894,-0.3759873 -1.0126894,-0.8397911 0,-0.4638039 0.4533965,-0.8397912 1.0126894,-0.8397912 0.5592929,0 1.0126893,0.3759873 1.0126893,0.8397912 z"
+       sodipodi:ry="0.83979112"
+       sodipodi:rx="1.0126894"
+       sodipodi:cy="4.8604174"
+       sodipodi:cx="5.6315408"
+       id="path3801"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
   </g>
 </svg>
diff --git a/data/styles/symbols/bowls-borderless.svg b/data/styles/symbols/bowls-borderless.svg
index d4e9cfacfc..d95d848371 100644
--- a/data/styles/symbols/bowls-borderless.svg
+++ b/data/styles/symbols/bowls-borderless.svg
@@ -1,22 +1,61 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="38"
    height="38"
    viewBox="0 0 300 300"
-   id="symbol-bowls-borderless">
+   id="symbol-bowls-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bowls-borderless.svg">
+  <metadata
+     id="metadata8">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="6.2105263"
+     inkscape:cx="19"
+     inkscape:cy="17.470339"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bowls-borderless" />
   <defs
      id="defs2474" />
   <path
      d="M 133.81685,208.8622 L 126.35503,240.31878 C 124.99394,245.51199 126.77374,249.59331 131.69442,252.56277 C 135.1066,254.53982 138.69086,254.81182 142.44721,253.37876 C 146.2033,251.94563 148.57756,249.32335 149.57,245.51188 L 158.56393,207.50471 C 159.4585,203.4602 158.48415,199.99258 155.64087,197.10185 L 134.75661,175.03208 L 162.66048,153.398 L 166.54511,167.06433 C 166.79653,168.31994 167.48101,169.46325 168.5985,170.49427 L 195.76983,191.98059 C 196.45337,192.64098 197.12373,193.10574 197.78094,193.37488 C 200.08277,194.31797 202.42725,194.22395 204.81434,193.09278 C 207.20108,191.96165 208.86684,190.24692 209.81164,187.94863 C 211.49695,183.8478 210.63576,180.33295 207.2281,177.40406 L 183.83954,158.62581 L 173.64264,125.97234 C 172.19694,121.54832 169.09517,117.88193 164.33727,114.97315 C 156.00428,110.02673 148.06788,110.41718 140.5281,116.14448 L 102.21218,145.59669 C 99.720069,147.45414 97.815921,150.2193 96.499761,153.89217 L 77.106834,203.17152 L 45.125616,232.63017 C 43.86149,233.83809 42.947508,234.8999 42.383669,235.81558 C 40.605024,238.73157 40.130919,241.74913 40.961422,244.86825 C 41.79188,247.98732 43.667492,250.43472 46.588322,252.2105 C 51.508856,255.17988 55.947032,254.88907 59.902852,251.33808 L 95.031256,219.14089 C 96.295295,217.93294 97.263831,216.5103 97.936863,214.87295 L 110.13221,184.4956 L 133.81685,208.8622 z M 175.35877,116.89965 C 179.79714,118.7181 184.31645,118.70038 188.91668,116.8465 C 193.5166,114.99285 196.76021,111.77017 198.64755,107.17852 C 200.4687,102.74732 200.41134,98.21769 198.47553,93.589598 C 196.53933,88.961767 193.35205,85.738614 188.9137,83.920118 C 184.30948,82.034104 179.73058,82.07567 175.17695,84.044796 C 170.62302,86.014182 167.43547,89.214488 165.6143,93.645672 C 163.72698,98.237322 163.72826,102.78934 165.61814,107.3017 C 167.5077,111.81428 170.75459,115.01359 175.35877,116.89965 L 175.35877,116.89965 z"
      id="path4705"
-     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;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;display:inline;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
   <path
      d="M 249.05661,235.18867 A 16.132076,16.132076 0 1 1 216.79245,235.18867 A 16.132076,16.132076 0 1 1 249.05661,235.18867 z"
      transform="translate(-2.8301887,1.1320755)"
      id="path2385"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/building.svg b/data/styles/symbols/building.svg
index 18e95dbf97..900852864f 100644
--- a/data/styles/symbols/building.svg
+++ b/data/styles/symbols/building.svg
@@ -1,14 +1,55 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="9"
    height="9"
-   id="symbol-building">
-    <path
-       d="M 1,1 L 8,1 L 8,8 L 1,8 L 1,1 z"
-       id="building"
-       style="fill:#6a5a8e;" />
+   id="symbol-building"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="building.svg">
+  <metadata
+     id="metadata8">
+    <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="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="26.222222"
+     inkscape:cx="4.5"
+     inkscape:cy="4.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-building" />
+  <path
+     d="M 1,1 L 8,1 L 8,8 L 1,8 L 1,1 z"
+     id="building"
+     style="fill:#bdad5f;fill-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/bus.svg b/data/styles/symbols/bus.svg
index 760c077b0d..a443de46b5 100644
--- a/data/styles/symbols/bus.svg
+++ b/data/styles/symbols/bus.svg
@@ -1,12 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="27.96" height="27.96" id="symbol-bus" viewBox="0 0 60 60">
-   <svg:g transform="translate(6,20)">
-                <svg:path style="fill:blue;stroke:#000000;stroke-width:0.33102515" d="M 2.2521668,0.37432812 C 16.5855,0.37432812 30.918834,0.37432812 45.252168,0.37432812 C 46.355969,1.6734629 46.462793,3.586312 46.948398,5.196193 C 47.576853,8.2837404 48.414233,11.387465 48.252167,14.563593 C 48.236441,15.635583 48.542361,17.557849 46.939414,17.374328 C 32.043665,17.374328 17.147916,17.374328 2.2521668,17.374328 C 0.65875368,17.30455 0.27106428,15.753005 0.2698071,14.227706 C 0.29303084,10.212217 0.1028761,6.2414586 0.23632812,2.1693926 C 0.39484947,1.3347273 1.358163,0.37476685 2.2521668,0.37432812 z "/>
-                <svg:path style="fill:blue;stroke:#ffffff;stroke-width:0.75587374" d="M 38.812165,16.734328 C 38.920431,18.865451 36.087926,20.19296 34.514352,18.757021 C 32.815686,17.495237 33.558848,14.486315 35.653279,14.167433 C 37.225591,13.803144 38.854105,15.116219 38.812165,16.734328 z "/>
-                <svg:path style="fill:blue;stroke:#ffffff;stroke-width:0.75587374" d="M 15.912166,16.734328 C 16.020431,18.865452 13.187925,20.19296 11.614351,18.757021 C 9.9156863,17.495236 10.658848,14.486315 12.753279,14.167433 C 14.325591,13.803145 15.954103,15.116219 15.912166,16.734328 z "/>
-                <svg:path style="fill:#ffffff;stroke:#000000;stroke-width:0.35478419" d="M 36.357025,1.5513395 C 39.305684,1.5513395 40.910594,1.5513395 43.859255,1.5513395 C 44.243739,1.5513395 44.590387,1.6719809 44.715165,1.9230441 C 45.570116,3.6432751 45.6451,5.7562027 46.029437,7.6473997 C 46.245197,8.9459032 46.072777,9.4244981 44.672637,9.4157048 C 41.844185,9.4192225 39.029953,9.3974155 36.281062,9.3974155 C 35.798111,9.3974155 35.537058,8.9607427 35.537058,8.6449215 C 35.562562,6.3521575 35.570716,3.8641786 35.570716,2.2653878 C 35.570716,1.9157124 35.854648,1.5513395 36.357025,1.5513395 z "/>
-                <svg:rect ry="0.60000002" y="1.54375" x="13.25" height="7.875" width="10" style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.34999999"/>
-                <svg:rect ry="0.60000002" y="1.54375" x="1.9375" height="7.875" width="10" style="fill:#ffffff;stroke:#000000;stroke-width:0.34999999"/>
-                <svg:rect ry="0.60000002" y="1.55" x="24.4375" height="7.875" width="10" style="fill:#ffffff;stroke:#000000;stroke-width:0.34999999"/>
-            </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bus.svg">
+  <title
+     id="title2983">Bus Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <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>Bus Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="19.136028"
+     inkscape:cx="-3.068839"
+     inkscape:cy="11.681623"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="9.4420605"
+     rx="9.4420605"
+     y="2.1459229"
+     x="2.1459229"
+     height="47.2103"
+     width="47.2103"
+     id="rect2995"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#003cd8;fill-opacity:1;stroke:none"
+     id="rect2993"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     transform="scale(2.1459228,2.1459228)"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 25.733857,10.319543 c -0.420925,0.0019 -0.843587,0.01938 -1.273958,0.07043 -3.030592,0.235453 -7.109885,1.205459 -8.745557,2.570788 -1.945872,1.624268 -1.617772,3.192176 -2.479054,11.515721 l -0.03443,1.303002 0,12.220044 1.928155,0 0,1.443866 c 0.0016,0.09613 0,0.332466 0,0.387379 0,1.09826 0.854373,2.007326 1.928153,2.007326 1.073778,0 1.962584,-0.909066 1.962584,-2.007326 0,-0.08389 -0.0015,-0.27228 0,-0.387379 0.0035,-0.261589 -5.63e-4,-0.510227 0,-0.880406 l 0,-0.56346 5.44015,0 2.582348,0 5.440149,0 0,0.56346 c 5.66e-4,0.370179 -0.0035,0.618817 0,0.880406 0.0015,0.115099 0,0.303479 0,0.387379 0,1.09826 0.888807,2.007326 1.962585,2.007326 1.073781,0 1.928155,-0.909066 1.928155,-2.007326 0,-0.05491 -0.0016,-0.291252 0,-0.387379 l 0,-1.443866 1.928154,0 0,-12.220044 -0.03443,-1.303002 C 37.405579,16.152939 37.73368,14.585031 35.787806,12.960768 34.146089,11.59039 30.076247,10.620694 27.042251,10.38998 26.573979,10.33157 26.154788,10.31771 25.733861,10.31955 z m -4.579365,2.500354 9.193162,0 c 0.453443,0 0.791921,0.346194 0.791921,0.809974 0,0.463782 -0.338478,0.84519 -0.791921,0.84519 l -9.193162,0 c -0.453443,0 -0.79192,-0.381408 -0.79192,-0.84519 0,-0.46378 0.338477,-0.809974 0.79192,-0.809974 z m -4.097327,3.134248 7.437165,0 2.513485,0 7.402734,0 c 0.6104,0 1.036458,0.506194 1.101803,1.12692 l 0.826351,7.571497 c 0.06535,0.620727 -0.491403,1.126919 -1.101801,1.126919 l -8.229087,0 -2.513485,0 -8.229085,0 c -0.610399,0 -1.20158,-0.506192 -1.136234,-1.126919 l 0.826351,-7.571497 c 0.06535,-0.620726 0.491403,-1.12692 1.101803,-1.12692 z m 0,14.262585 c 1.073779,0 1.962585,0.873851 1.962585,1.972112 0,1.098259 -0.888806,2.007325 -1.962585,2.007325 -1.07378,0 -1.928154,-0.909066 -1.928154,-2.007325 0,-1.098261 0.854374,-1.972112 1.928154,-1.972112 z m 17.387816,0 c 1.07378,0 1.928155,0.873851 1.928155,1.972112 0,1.098259 -0.854375,2.007325 -1.928155,2.007325 -1.073779,0 -1.928154,-0.909066 -1.928154,-2.007325 0,-1.098261 0.854375,-1.972112 1.928154,-1.972112 z"
+     id="path3057"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/data/styles/symbols/bus_sta.svg b/data/styles/symbols/bus_sta.svg
index 23ef1b5ce0..ebdf3012b9 100644
--- a/data/styles/symbols/bus_sta.svg
+++ b/data/styles/symbols/bus_sta.svg
@@ -1,69 +1,84 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="40.959999"
-   height="40.959999"
-   viewBox="0 0 60 60"
-   id="symbol-bus-station">
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-bus"
+   viewBox="0 0 51.502147 51.502147"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="bus.svg">
+  <title
+     id="title2983">Bus Stop Map Icon</title>
+  <metadata
+     id="metadata23">
+    <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>Bus Stop Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.comz</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
-     id="defs2485" />
-  <g
-     transform="matrix(1.524215,0,0,1.5911274,-437.4375,-1077.4843)"
-     id="g3353">
-    <a
-       id="a3337">
-      <g
-         transform="matrix(0.466,0,0,0.466,295.1017,691.67072)"
-         id="g2468">
-        <path
-           d="M 2.2521668,0.37432812 C 16.5855,0.37432812 30.918834,0.37432812 45.252168,0.37432812 C 46.355969,1.6734629 46.462793,3.586312 46.948398,5.196193 C 47.576853,8.2837404 48.414233,11.387465 48.252167,14.563593 C 48.236441,15.635583 48.542361,17.557849 46.939414,17.374328 C 32.043665,17.374328 17.147916,17.374328 2.2521668,17.374328 C 0.65875368,17.30455 0.27106428,15.753005 0.2698071,14.227706 C 0.29303084,10.212217 0.1028761,6.2414586 0.23632812,2.1693926 C 0.39484947,1.3347273 1.358163,0.37476685 2.2521668,0.37432812 z"
-           id="path2470"
-           style="fill:#0000ff;stroke:#000000;stroke-width:0.33102515" />
-        <path
-           d="M 38.812165,16.734328 C 38.920431,18.865451 36.087926,20.19296 34.514352,18.757021 C 32.815686,17.495237 33.558848,14.486315 35.653279,14.167433 C 37.225591,13.803144 38.854105,15.116219 38.812165,16.734328 z"
-           id="path2472"
-           style="fill:#0000ff;stroke:#ffffff;stroke-width:0.75587374" />
-        <path
-           d="M 15.912166,16.734328 C 16.020431,18.865452 13.187925,20.19296 11.614351,18.757021 C 9.9156863,17.495236 10.658848,14.486315 12.753279,14.167433 C 14.325591,13.803145 15.954103,15.116219 15.912166,16.734328 z"
-           id="path2474"
-           style="fill:#0000ff;stroke:#ffffff;stroke-width:0.75587374" />
-        <path
-           d="M 36.357025,1.5513395 C 39.305684,1.5513395 40.910594,1.5513395 43.859255,1.5513395 C 44.243739,1.5513395 44.590387,1.6719809 44.715165,1.9230441 C 45.570116,3.6432751 45.6451,5.7562027 46.029437,7.6473997 C 46.245197,8.9459032 46.072777,9.4244981 44.672637,9.4157048 C 41.844185,9.4192225 39.029953,9.3974155 36.281062,9.3974155 C 35.798111,9.3974155 35.537058,8.9607427 35.537058,8.6449215 C 35.562562,6.3521575 35.570716,3.8641786 35.570716,2.2653878 C 35.570716,1.9157124 35.854648,1.5513395 36.357025,1.5513395 z"
-           id="path2476"
-           style="fill:#ffffff;stroke:#000000;stroke-width:0.35478419" />
-        <rect
-           width="10"
-           height="7.875"
-           ry="0.60000002"
-           x="13.25"
-           y="1.54375"
-           id="rect2478"
-           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.34999999" />
-        <rect
-           width="10"
-           height="7.875"
-           ry="0.60000002"
-           x="1.9375"
-           y="1.54375"
-           id="rect2480"
-           style="fill:#ffffff;stroke:#000000;stroke-width:0.34999999" />
-        <rect
-           width="10"
-           height="7.875"
-           ry="0.60000002"
-           x="24.4375"
-           y="1.55"
-           id="rect2482"
-           style="fill:#ffffff;stroke:#000000;stroke-width:0.34999999" />
-      </g>
-    </a>
-    <path
-       d="M 304.19644,703.74609 A 11.5625,11.294642 0 1 1 281.07144,703.74609 A 11.5625,11.294642 0 1 1 304.19644,703.74609 z"
-       transform="matrix(1.2520344,0,0,1.2342961,-60.040798,-172.70063)"
-       id="path3305"
-       style="fill:#ffffff;fill-opacity:0;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-  </g>
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="876"
+     inkscape:window-height="731"
+     id="namedview19"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="19.136028"
+     inkscape:cx="13.705802"
+     inkscape:cy="11.531081"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-bus">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#334488;fill-opacity:1;stroke:none"
+     d="m 25.727523,4.2918456 c -0.575781,0.00255 -1.153939,0.026963 -1.742641,0.097989 C 19.839349,4.7174337 14.259303,6.0670571 12.021876,7.9667178 9.3601267,10.226653 9.8089334,12.408173 8.6307892,23.989194 l -0.047098,1.81294 0,17.002439 2.6375135,0 0,2.008932 c 0.0022,0.133747 0,0.46258 0,0.538982 0,1.528072 1.168694,2.792908 2.637512,2.792908 1.468816,0 2.68461,-1.264836 2.68461,-2.792908 0,-0.116727 -0.0021,-0.378837 0,-0.538982 0.0048,-0.363963 -7.71e-4,-0.709908 0,-1.224959 l 0,-0.783973 7.441555,0 3.532382,0 7.441555,0 0,0.783973 c 7.73e-4,0.515051 -0.0048,0.860996 0,1.224959 0.0021,0.160145 0,0.422248 0,0.538982 0,1.528072 1.215794,2.792908 2.68461,2.792908 1.46882,0 2.637514,-1.264836 2.637514,-2.792908 0,-0.0764 -0.0022,-0.405235 0,-0.538982 l 0,-2.008932 2.637513,0 0,-17.00244 -0.0471,-1.812939 C 41.693212,12.408173 42.142019,10.226653 39.480268,7.9667244 37.234571,6.06004 31.667453,4.710847 27.517264,4.3898418 26.876717,4.3085708 26.303307,4.2892846 25.727523,4.2918523 z m -6.264092,3.4788848 12.575283,0 c 0.620263,0 1.083265,0.4816779 1.083265,1.1269618 0,0.6452854 -0.463002,1.1759608 -1.083265,1.1759608 l -12.575283,0 c -0.620262,0 -1.083264,-0.5306754 -1.083264,-1.1759608 0,-0.6452839 0.463002,-1.1269618 1.083264,-1.1269618 z m -5.604714,4.3608556 10.173263,0 3.438185,0 10.126165,0 c 0.834963,0 1.417765,0.704297 1.50715,1.567948 l 1.130363,10.534653 c 0.08939,0.863652 -0.672188,1.567946 -1.507149,1.567946 l -11.256529,0 -3.438185,0 -11.256527,0 c -0.834962,0 -1.643636,-0.704294 -1.554249,-1.567946 l 1.130362,-10.534653 c 0.08939,-0.863651 0.672188,-1.567948 1.507151,-1.567948 z m 0,19.844343 c 1.468817,0 2.68461,1.215839 2.68461,2.74391 0,1.528071 -1.215793,2.792907 -2.68461,2.792907 -1.468819,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168694,-2.74391 2.637513,-2.74391 z m 23.784712,0 c 1.468819,0 2.637514,1.215839 2.637514,2.74391 0,1.528071 -1.168695,2.792907 -2.637514,2.792907 -1.468818,0 -2.637513,-1.264836 -2.637513,-2.792907 0,-1.528071 1.168695,-2.74391 2.637513,-2.74391 z"
+     id="path3057"
+     inkscape:connector-curvature="0" />
+  <path
+     transform="matrix(1.83704,0,0,1.83704,-7.2464453,27.624254)"
+     d="m 12.992518,26.492094 a 2.0613129,2.0613129 0 1 1 -4.1226261,0 2.0613129,2.0613129 0 1 1 4.1226261,0 z"
+     sodipodi:ry="2.0613129"
+     sodipodi:rx="2.0613129"
+     sodipodi:cy="26.492094"
+     sodipodi:cx="10.931205"
+     id="path3833"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
 </svg>
diff --git a/data/styles/symbols/cafe.svg b/data/styles/symbols/cafe.svg
index 01d289a873..0d6e9b2942 100644
--- a/data/styles/symbols/cafe.svg
+++ b/data/styles/symbols/cafe.svg
@@ -1,40 +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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="14"
-   height="14"
-   id="symbol-cafe">
+   width="24"
+   height="24"
+   id="symbol-cafe"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="cafe.svg">
+  <title
+     id="title2988">Cafe Map Icon</title>
+  <metadata
+     id="metadata11">
+    <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>Cafe Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="974"
+     inkscape:window-height="694"
+     id="namedview9"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="21.273311"
+     inkscape:cx="7.3014949"
+     inkscape:cy="10.378331"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-cafe">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs2230" />
-  <g
-     id="g9053">
-    <rect
-       width="14"
-       height="14"
-       ry="2.5999999"
-       x="0"
-       y="0"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.93333334;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4191" />
-    <path
-       d="M 10.960919 10.464368 A 4.027586 4.027586 0 1 1  2.9057474,10.464368 A 4.027586 4.027586 0 1 1  10.960919 10.464368 z"
-       transform="matrix(0.8945367,0,0,0.7056598,-1.1054313,1.2736111)"
-       style="fill:#886600;fill-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path2236" />
-    <rect
-       width="7.205647"
-       height="6.1578946"
-       x="1.4938664"
-       y="2.5"
-       style="fill:#886600;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect2238" />
-    <path
-       d="M 14.418391 6.4367814 A 2.4275863 2.6114943 0 1 1  9.5632184,6.4367814 A 2.4275863 2.6114943 0 1 1  14.418391 6.4367814 z"
-       transform="matrix(0.8886538,0,0,1.0890316,-0.7987018,-0.7693869)"
-       style="fill:none;fill-opacity:1;stroke:#886600;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3214" />
-  </g>
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 6 10 C 6 10.852249 6.0226526 11.569338 6.03125 12.34375 C 5.2814432 12.013146 4.5154593 12 4 12 C 1.9749559 12 0 14.106767 0 16.5 C 0 18.893233 1.9749559 21 4 21 C 5.7837149 21 6.5237898 20.755024 7.21875 20.5 C 7.6437945 21.41527 8.2324115 22.232412 9 23 L 19 23 C 22 20 22 16 22 10 L 6 10 z M 4 14 C 5.2214854 14 5.6808579 14.365859 6.09375 14.65625 C 6.1668745 16.127334 6.2889585 17.462992 6.59375 18.65625 C 6.364901 18.806938 5.9423077 19 4 19 C 2.8798456 19 2 18.134672 2 17 C 2 15.065087 3 14 4 14 z "
+     id="rect2992" />
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 14,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z"
+     id="path3783"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     sodipodi:nodetypes="ccc"
+     inkscape:connector-curvature="0"
+     id="path3790"
+     d="m 18,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z"
+     style="fill:#4d4d4d;stroke:none" />
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 10,9 c 0,-5.9999994 -2.16343,-3.000001 0,-9 0,5.999999 2.16343,4.5 0,9 z"
+     id="path3792"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
 </svg>
diff --git a/data/styles/symbols/campSite.svg b/data/styles/symbols/campSite.svg
index 5b6d81a819..829664c71a 100644
--- a/data/styles/symbols/campSite.svg
+++ b/data/styles/symbols/campSite.svg
@@ -1,4 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="campSite" viewBox="0 0 100 100" fill="blue" fill-opacity="1" height="18.64">
-   <svg:path d="M 35,0 L 50,24 L 65,0 L 80,0 L 60,35 L 100,100 L 0,100 L 40,35 L 20,0 L 35,0 z "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="campSite"
+   viewBox="0 0 128.75537 128.75537"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="campSite.svg"
+   style="fill:#0000ff;fill-opacity:1">
+  <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>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="739"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="41.688476"
+     inkscape:cx="16.507457"
+     inkscape:cy="18.302459"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="campSite">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#50524e;fill-opacity:1;stroke:none"
+     d="m 10,3.53125 -0.875,0.5 2,3.46875 L 4,20 l -2,0 0,2 20,0 0,-2 -2,0 -7.125,-12.5 2,-3.46875 L 14,3.53125 12,7 z m 2,8.625 L 16.53125,20 7.46875,20 z"
+     transform="scale(5.3648071,5.3648071)"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccc" />
+</svg>
diff --git a/data/styles/symbols/cannon.svg b/data/styles/symbols/cannon.svg
index ee20d8d455..064d2f07d5 100644
--- a/data/styles/symbols/cannon.svg
+++ b/data/styles/symbols/cannon.svg
@@ -13,7 +13,7 @@
    viewBox="0 0 12 12"
    height="37.28"
    sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="cannon.svg">
   <metadata
      id="metadata38">
@@ -44,7 +44,7 @@
        sodipodi:type="inkscape:persp3d" />
   </defs>
   <sodipodi:namedview
-     inkscape:window-height="863"
+     inkscape:window-height="856"
      inkscape:window-width="1009"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
@@ -57,13 +57,14 @@
      id="base"
      inkscape:zoom="14.339397"
      inkscape:cx="17.774927"
-     inkscape:cy="15.969733"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
+     inkscape:cy="15.307223"
+     inkscape:window-x="20"
+     inkscape:window-y="11"
      inkscape:current-layer="symbol-shelter"
      showgrid="false"
      inkscape:window-maximized="0" />
   <path
      d="m 1.2052385,7.4832392 -0.198302,0 0,-0.3645544 0.198302,0 0,-2.3150049 1.2486362,0 0,2.3149282 1.8746066,0 0.4255542,-5.8044539 c 0,0 0,-0.34591944 -0.3987174,-0.61128765 l 3.2079831,0 C 7.1377473,0.98379112 7.166699,1.3141542 7.166699,1.3141542 l 0.4255544,5.8044539 1.8724915,0 0,-2.3150051 1.2518081,0 0,2.3150051 0.226328,0 0,0.364554 -0.226328,0 0,2.281969 -1.2518081,0 0,-2.281969 -1.8447292,0 0.1714636,2.0996918 c 0.083684,0.7941801 -1.0492768,0.9595931 -1.6194586,0.9920901 0.255148,0.04998 0.3718808,0.182278 0.3987174,0.314653 0.027895,0.198526 -0.3139768,0.413917 -0.5970186,0.413917 -0.3109363,0 -0.6496346,-0.215391 -0.6258383,-0.413917 0.030933,-0.132376 0.1435689,-0.264752 0.3987176,-0.314653 -0.564894,-0.0325 -1.7010272,-0.19791 -1.6184016,-0.9920901 l 0.1704072,-2.0996918 -1.8447292,0 0,2.281969 -1.2486362,0 0,-2.2818919 0,0 z"
-     id="path3" />
+     id="path3"
+     style="fill:#4f4f4f;fill-opacity:1" />
 </svg>
diff --git a/data/styles/symbols/church.svg b/data/styles/symbols/church.svg
index 8b60ce1927..eb6a3d63d7 100644
--- a/data/styles/symbols/church.svg
+++ b/data/styles/symbols/church.svg
@@ -1,6 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="church" viewBox="0 0 10 10" fill="#000000" height="18.64">
-   <svg:g transform="translate (2.5,0)">
-            <svg:path d="M 0 10 L 0 5 L 5 5 L 5 10 z M 0 2 L 5 2 L 5 3 L 0 3 z M 2 0 L 2 5 L 3 5 L 3 0 z"/>
-          </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="18.64"
+   id="church"
+   viewBox="0 0 10 10"
+   fill="#000000"
+   height="18.64"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="church.svg">
+  <metadata
+     id="metadata11">
+    <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="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="8.5696607"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="church" />
+  <g
+     transform="translate (2.5,0)"
+     id="g3"
+     style="fill:#555753">
+    <path
+       d="M 0 10 L 0 5 L 5 5 L 5 10 z M 0 2 L 5 2 L 5 3 L 0 3 z M 2 0 L 2 5 L 3 5 L 3 0 z"
+       id="path5"
+       style="fill:#555753" />
+  </g>
+</svg>
diff --git a/data/styles/symbols/cinema.svg b/data/styles/symbols/cinema.svg
index 7b3904a742..d7596251a0 100644
--- a/data/styles/symbols/cinema.svg
+++ b/data/styles/symbols/cinema.svg
@@ -1,20 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="23.3" id="cinema" viewBox="0 0 420 420" height="23.3">
-   <svg:g transform="translate(50,0)">
-              <svg:path fill="black" d="M123.7,393.2l-35.9,9L0,50.9l35.9-9L123.7,393.2z"/>
-              <svg:path fill="black" d="M291.5,351.2l-35.9,9L167.8,9l35.9-9L291.5,351.2z"/>
-              <svg:path fill="black" d="M201.9,27.8l9,35.9L19.8,111.5l-9-35.9L201.9,27.8z"/>
-              <svg:path fill="black" d="M234.8,159.2l9,35.9L52.6,242.9l-9-35.9L234.8,159.2z"/>
-              <svg:path fill="black" d="M267.7,290.7l9,35.9L85.5,374.4l-9-35.9L267.7,290.7z"/>
-              <svg:path fill="#FFFFFF" d="M40.5,97.5l-21.3,5.3l-5.3-21.3l21.3-5.3L40.5,97.5z"/>
-              <svg:path fill="#FFFFFF" d="M56.9,163l-21.3,5.3L30.2,147l21.3-5.3L56.9,163z"/>
-              <svg:path fill="#FFFFFF" d="M73.3,228.5l-21.3,5.3l-5.3-21.3l21.3-5.3L73.3,228.5z"/>
-              <svg:path fill="#FFFFFF" d="M89.6,294l-21.3,5.3L63,278l21.3-5.3L89.6,294z"/>
-              <svg:path fill="#FFFFFF" d="M106,359.4l-21.3,5.3l-5.3-21.3l21.3-5.3L106,359.4z"/>
-              <svg:path fill="#FFFFFF" d="M209.1,54.3l-21.3,5.3l-5.3-21.3l21.3-5.3L209.1,54.3z"/>
-              <svg:path fill="#FFFFFF" d="M225.4,119.8l-21.3,5.3l-5.3-21.3l21.3-5.3L225.4,119.8z"/>
-              <svg:path fill="#FFFFFF" d="M241.8,185.3l-21.3,5.3l-5.3-21.3l21.3-5.3L241.8,185.3z"/>
-              <svg:path fill="#FFFFFF" d="M258.2,250.8l-21.3,5.3l-5.3-21.3l21.3-5.3L258.2,250.8z"/>
-              <svg:path fill="#FFFFFF" d="M274.6,316.3l-21.3,5.3l-5.3-21.3l21.3-5.3L274.6,316.3z"/>
-            </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 100 95.76"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="cinema.svg"><title
+   id="title3018">Cinema Map Icon</title><metadata
+   id="metadata11"><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>Cinema Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1064"
+   inkscape:window-height="758"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="17.159503"
+   inkscape:cx="12.984407"
+   inkscape:cy="11.97"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2983"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<path
+   style="fill:#505050;fill-opacity:1;stroke:none"
+   d="M 2 3 L 2 21 L 4 21 L 4 19 L 6 19 L 6 21 L 8 21 L 8 19 L 16 19 L 16 21 L 17.9375 21 L 17.9375 19 L 19.9375 19 L 19.9375 21 L 22 21 L 22 3 L 19.9375 3 L 19.9375 5 L 17.9375 5 L 17.9375 3 L 16 3 L 16 5 L 8 5 L 8 3 L 6 3 L 6 5 L 4 5 L 4 3 L 2 3 z M 4 7 L 6 7 L 6 9 L 4 9 L 4 7 z M 8 7 L 16 7 L 16 17 L 8 17 L 8 7 z M 17.9375 7 L 19.9375 7 L 19.9375 9 L 17.9375 9 L 17.9375 7 z M 4 11 L 6 11 L 6 13 L 4 13 L 4 11 z M 17.9375 11 L 19.9375 11 L 19.9375 13 L 17.9375 13 L 17.9375 11 z M 4 15 L 6 15 L 6 17 L 4 17 L 4 15 z M 17.9375 15 L 19.9375 15 L 19.9375 17 L 17.9375 17 L 17.9375 15 z "
+   id="rect2984" /><rect
+   style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+   id="rect3784"
+   width="8"
+   height="10"
+   x="8"
+   y="7" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/dog_park.svg b/data/styles/symbols/dog_park.svg
index c0e972a9c1..9af0dec84f 100644
--- a/data/styles/symbols/dog_park.svg
+++ b/data/styles/symbols/dog_park.svg
@@ -1,41 +1,61 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="16"
-   height="16"
-   viewBox="0 0 18 18"
-   id="symbol-dog-park"
-   style="stroke:#000000">
-  <defs
-     id="defs10" />
-  <rect
-     width="17"
-     height="17"
-     ry="3"
-     x="0.5"
-     y="0.5"
-     id="rect3165"
-     style="fill:#c7f1a3;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.1;stroke-dasharray:none" />
-  <path
-     d="M 6.46,8.48 C 8.51,7.4 10.33,8.05 10.8,9.7 C 11.33,11.59 12.7,14.29 11.31,14.9 C 10.43,15.29 8.98,12.87 7.42,12.1 C 5.86,11.34 3.25,12.26 3,10.92 C 2.78,9.73 5.15,9.17 6.46,8.48 L 6.46,8.48 z"
-     id="path2176"
-     style="fill:#000000;stroke-width:0" />
-  <path
-     d="M 3.71,6.22 C 4,5.35 4.81,4.93 5.52,5.23 C 6.23,5.64 6.57,6.63 6.28,7.49 C 5.99,8.36 5.18,8.77 4.47,8.42 C 3.76,8.07 3.42,7.08 3.71,6.22 L 3.71,6.22 z"
-     id="path2183"
-     style="fill:#000000;stroke-width:0" />
-  <path
-     d="M 7.90,3.61 C 8.51,2.67 9.49,2.46 10.1,3.15 C 10.7,3.83 10.7,5.15 10.1,6.09 C 9.49,7.04 8.51,7.24 7.9,6.56 C 7.3,5.87 7.3,4.55 7.9,3.61 L 7.9,3.61 z"
-     id="path2185"
-     style="fill:#000000;stroke-width:0" />
-  <path
-     d="M 12,5.23 C 12.94,4.57 13.97,4.72 14.29,5.56 C 14.6,6.4 14.08,7.61 13.13,8.27 C 12.18,8.93 11.15,8.78 10.84,7.94 C 10.53,7.1 11.04,5.89 11.99,5.23 L 11.99,5.23 z"
-     id="path2191"
-     style="fill:#000000;stroke-width:0" />
-  <path
-     d="M 13.09,9.83 C 13.96,9.6 14.78,10.02 14.92,10.78 C 15.05,11.53 14.46,12.33 13.59,12.56 C 12.72,12.79 11.9,12.37 11.76,11.61 C 11.63,10.86 12.22,10.07 13.09,9.83 L 13.09,9.83 z"
-     id="path2193"
-     style="fill:#000000;stroke-width:0" />
-</svg>
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 100 92.316"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="dog_park.svg"><title
+   id="title2998">Dog Run Map Icon</title><metadata
+   id="metadata13"><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>Dog Run Map Icon</dc:title><dc:creator><cc:Agent><dc:title>Yury Melnichek</dc:title></cc:Agent></dc:creator><dc:source>mapsforhumans.com</dc:source></cc:Work></rdf:RDF></metadata><defs
+   id="defs11" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1101"
+   inkscape:window-height="793"
+   id="namedview9"
+   showgrid="true"
+   inkscape:zoom="21.983141"
+   inkscape:cx="12.132272"
+   inkscape:cy="11.794105"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2984"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+
+<path
+   style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+   d="m 12.865719,4.441906 c -0.717438,-0.4142137 -1.746753,0.025465 -2.299038,0.9820509 -0.552284,0.9565851 -0.4184,2.067837 0.299038,2.4820507 0.717439,0.4142138 1.746754,-0.025465 2.299039,-0.982051 0.552284,-0.9565849 0.4184,-2.0678369 -0.299039,-2.4820506 z m 3.464102,2.0000002 C 15.612382,6.0276925 14.583068,6.4673716 14.030783,7.4239571 13.478498,8.380542 13.612382,9.491793 14.329821,9.9060076 15.047259,10.320221 16.076574,9.8805415 16.628859,8.9239558 17.181144,7.967372 17.04726,6.8561192 16.329821,6.4419062 z M 7.9016181,5.039982 C 7.1841786,4.6257687 6.1548643,5.0654477 5.6025797,6.022033 5.0502951,6.9786178 5.1841788,8.0898702 5.9016177,8.5040838 6.6190566,8.9182973 7.6483714,8.4786179 8.2006556,7.522033 8.7529408,6.5654477 8.6190566,5.4541956 7.9016181,5.039982 z m 10.3923049,6 c -0.717439,-0.414214 -1.746753,0.02547 -2.299039,0.98205 -0.552284,0.956586 -0.418401,2.067838 0.299039,2.482051 0.717439,0.414214 1.746752,-0.02547 2.299038,-0.98205 0.552284,-0.956586 0.4184,-2.067838 -0.299038,-2.482051 z m -5.857777,-0.582378 c -2.429199,-1.5208456 -2.7320503,0.732051 -4.0980757,1.098077 -1.8623558,0.499016 -3.7014316,0.13941 -4.5034403,1.52853 -1.0511927,1.820718 3.4641021,1.999999 5.196153,3 1.73205,0.999999 4.14496,4.820718 5.196152,3 0.740049,-1.281802 -0.225471,-2.784761 -0.692712,-4.52853 -0.366026,-1.366026 1.106621,-2.717784 -1.098077,-4.098077 z"
+   id="path2986"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="sssssssssssssssssssssssssss" /></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/drinking_water.svg b/data/styles/symbols/drinking_water.svg
index e57fa1291d..5267d56eaf 100644
--- a/data/styles/symbols/drinking_water.svg
+++ b/data/styles/symbols/drinking_water.svg
@@ -1,5 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="drinking_water" viewBox="0 0 20 20" stroke="none" fill-opacity="1" fill-rule="nonzero" height="18.64">
-   <svg:rect fill="white" width="20" height="20" x="0" y="0" rx="4" ry="4"/>
-   <svg:path fill="blue" d="M 9.598,0 L 2.402,0 C 1.072,0 0,1.078 0,2.402 L 0,9.597 C 0,10.922 1.072,12 2.402,12 L 9.597,12 C 10.928,12 12,10.922 12,9.598 L 12,2.402 C 12,1.078 10.928,0 9.598,0 z M 7.879,6.777 C 8.161,6.621 8.286,6.606 8.295,6.662 L 8.417,6.771 C 8.541,6.896 8.716,6.847 8.894,6.669 L 8.224,10.512 L 6.067,10.512 L 5.381,6.771 C 5.505,6.896 5.735,6.882 5.858,6.777 C 6.13,6.543 6.099,6.496 6.274,6.662 L 6.395,6.771 C 6.443,6.819 6.513,6.831 6.581,6.842 L 6.565,6.189 L 6.815,6.183 L 6.83,6.792 C 6.842,6.784 6.862,6.787 6.873,6.776 C 7.13,6.527 7.161,6.574 7.29,6.662 L 7.401,6.771 C 7.526,6.896 7.737,6.855 7.879,6.777 z M 6.536,4.958 L 6.786,4.952 L 6.805,5.685 L 6.555,5.691 L 6.536,4.958 z M 7.211,5.543 L 7.23,6.277 L 6.98,6.283 L 6.961,5.549 L 7.211,5.543 z M 6.961,4.383 L 7.211,4.377 L 7.23,5.111 L 6.98,5.117 L 6.961,4.383 z M 1.354,2.887 L 1.354,1.186 L 4.777,1.619 C 5.803,1.794 7.523,2.088 7.523,4.127 L 6.347,4.127 C 6.347,3.376 5.785,3.212 4.548,3.119 L 1.354,2.887 z M 8.979,11.393 L 5.319,11.393 L 4.249,5.504 L 4.741,5.415 C 4.741,5.415 5.666,10.512 5.736,10.893 L 8.558,10.893 C 8.625,10.508 9.5,5.443 9.5,5.443 L 9.993,5.528 L 8.979,11.393 z " transform="scale(1.67,1.67)"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="18.64"
+   id="drinking_water"
+   viewBox="0 0 20 20"
+   stroke="none"
+   fill-opacity="1"
+   fill-rule="nonzero"
+   height="18.64"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="drinking_water.svg">
+  <metadata
+     id="metadata11">
+    <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="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.2805082"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="drinking_water" />
+  <path
+     d="m 13.15793,11.31759 c 0.47094,-0.26052 0.67969,-0.28557 0.69472,-0.19205 l 0.20374,0.18203 c 0.20708,0.20875 0.49933,0.12692 0.79659,-0.17034 l -1.1189,6.41781 -3.60219,0 -1.14562,-6.24747 c 0.20708,0.20875 0.59118,0.18537 0.79659,0.01002 0.45424,-0.39078 0.40247,-0.46927 0.69472,-0.19205 l 0.20207,0.18203 c 0.08016,0.08016 0.19706,0.1002 0.31062,0.11857 l -0.02672,-1.09051 0.4175,-0.01002 0.02505,1.01703 c 0.02004,-0.01336 0.05344,-0.0084 0.07181,-0.02672 0.42919,-0.41583 0.48096,-0.33734 0.69639,-0.19038 l 0.18537,0.18203 c 0.20875,0.20875 0.56112,0.14028 0.79826,0.01002 z"
+     id="path2998"
+     style="fill:#0028d0" />
+  <path
+     d="m 10.91512,8.27986 0.4175,-0.01002 0.03173,1.22411 -0.4175,0.01002 -0.03173,-1.22411 z"
+     id="path2996"
+     style="fill:#0028d0" />
+  <path
+     d="m 12.04237,9.25681 0.03173,1.22578 -0.4175,0.01002 -0.03173,-1.22578 0.4175,-0.01002 z"
+     id="path2994"
+     style="fill:#0028d0" />
+  <path
+     d="M 11.62487,7.31961 12.04237,7.30959 12.0741,8.53537 11.6566,8.54539 11.62487,7.31961 z"
+     id="path2992"
+     style="fill:#0028d0" />
+  <path
+     d="m 2.26118,4.82129 0,-2.84067 5.71641,0.72311 c 1.71342,0.29225 4.58582,0.78323 4.58582,4.18836 l -1.96392,0 c 0,-1.25417 -0.93854,-1.52805 -3.00433,-1.68336 L 2.26118,4.82129 z"
+     id="path2990"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 14.99493,19.02631 -6.1122,0 -1.7869,-9.83463 0.82164,-0.14863 c 0,0 1.54475,8.51199 1.66165,9.14826 l 4.71274,0 C 14.40375,17.54836 15.865,9.08981 15.865,9.08981 l 0.82331,0.14195 -1.69338,9.79455 z"
+     id="path5"
+     style="fill:#505050;fill-opacity:1" />
+</svg>
diff --git a/data/styles/symbols/earthquakeCamp.svg b/data/styles/symbols/earthquakeCamp.svg
index 4e8e07233f..4c7301c9a9 100644
--- a/data/styles/symbols/earthquakeCamp.svg
+++ b/data/styles/symbols/earthquakeCamp.svg
@@ -1,4 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-earthquake-camp" viewBox="0 0 100 100" fill="red" fill-opacity="1" height="18.64">
-   <svg:path d="M 35,0 L 50,24 L 65,0 L 80,0 L 60,35 L 100,100 L 0,100 L 40,35 L 20,0 L 35,0 z "/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="campSite"
+   viewBox="0 0 128.75537 128.75537"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="campSite.svg"
+   style="fill:#0000ff;fill-opacity:1">
+  <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" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="739"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="41.688476"
+     inkscape:cx="16.507457"
+     inkscape:cy="13.50497"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="campSite">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#50524e;fill-opacity:1;stroke:none"
+     d="m 10,3.53125 -0.875,0.5 2,3.46875 L 4,20 l -2,0 0,2 20,0 0,-2 -2,0 -7.125,-12.5 2,-3.46875 L 14,3.53125 12,7 z m 2,8.625 L 16.53125,20 7.46875,20 z"
+     transform="scale(5.3648071,5.3648071)"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccc" />
 </svg>
diff --git a/data/styles/symbols/fastfood.svg b/data/styles/symbols/fastfood.svg
index a5be065aeb..f01473bda9 100644
--- a/data/styles/symbols/fastfood.svg
+++ b/data/styles/symbols/fastfood.svg
@@ -1,98 +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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="20"
-   height="21"
-   id="symbol-fastfood">
+   width="24"
+   height="24"
+   id="symbol-fastfood"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="fastfood.svg">
+  <metadata
+     id="metadata27">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1017"
+     inkscape:window-height="702"
+     id="namedview25"
+     showgrid="true"
+     inkscape:zoom="16.927381"
+     inkscape:cx="10.834908"
+     inkscape:cy="14.050916"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-fastfood">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4" />
-  <g
-     id="layer1">
-    <path
-       d="M 4.7704932,5.7308535 L 4.7491622,5.398899 L 13.943099,5.4173411 L 13.921768,5.7492956 L 4.7704932,5.7308535 z"
-       id="path3219"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.07853948px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 10.956669,5.1222706 L 11.553955,5.1222706 L 12.684532,0.49335315 L 12.151241,0.40114369 L 10.956669,5.1222706 z"
-       id="path3221"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.07853948px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <g
-       transform="matrix(8.446899e-2,0,0,7.302621e-2,-20.592828,-25.715203)"
-       id="g3384"
-       style="stroke:#ffffff;stroke-width:2.54648995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         d="M 469.78406,612.37761 L 361.12954,612.44075 C 361.12954,612.44075 364.41253,627.84557 375.01913,629.86588 L 456.27328,629.80274 C 466.56421,627.97183 469.78406,612.37761 469.78406,612.37761 z"
-         id="path3225"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.54648995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       transform="matrix(8.446899e-2,0,0,7.1973653e-2,-20.592828,-25.080303)"
-       id="g3417">
-      <path
-         d="M 399.4036,593.0403 L 408.60901,434.39906 L 300.51808,434.6516 L 310.00185,592.42205 C 319.99812,606.17973 390.06838,604.90794 399.4036,593.0403 z"
-         id="path3415"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.99539524px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <g
-       transform="matrix(8.4325274e-2,0,0,8.9930135e-2,-20.533086,-35.763483)"
-       id="g3237"
-       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.29666948;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         d="M 472.75139,586.17678 C 472.75139,586.17678 480.32754,590.97501 479.56992,597.28846 C 478.81231,603.60191 472.49885,607.89506 472.49885,607.89506"
-         id="path3233"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.29666948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 473.50901,586.42932 L 358.63078,586.42932 C 358.63078,586.42932 351.05463,591.22755 351.81225,597.541 C 352.56986,603.85445 358.88332,608.1476 358.88332,608.1476 L 472.75139,607.89506"
-         id="path3235"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.29666948;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       transform="matrix(8.446899e-2,0,0,7.302621e-2,-20.592828,-25.715203)"
-       id="g3283"
-       style="stroke:#ffffff;stroke-width:2.54648995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         d="M 245.71961,516.98133 L 262.8922,619.25928"
-         id="path3279"
-         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.54648995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 262.38712,619.25928 C 293.44931,626.83542 319.96582,619.00674 319.96582,619.00674 L 336.3808,516.72879 C 335.62318,516.72879 295.46962,560.67043 245.71961,516.47626"
-         id="path3281"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.54648995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <path
-       d="M 12.898227,14.048122 L 16.102545,14.035265 C 18.965639,14.551019 19.093599,16.822228 19.098931,16.82696 L 9.8805148,16.841155 C 9.8911782,16.831692 9.8911782,16.831692 9.8911782,16.831692 C 9.8911782,16.831692 10.019139,14.559144 12.898227,14.048122 z"
-       id="path3265"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 0.82452262,12.286435 L 0.22849844,10.171891 L 0.90966905,9.992355 L 1.7824195,12.88489 C 1.7824195,12.88489 1.5269803,12.844992 0.82452262,12.286435 z"
-       id="path3318"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.08159832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 2.5095742,13.125016 L 3.6389069,9.2346007 L 3.0209706,8.8668495 L 1.8064045,12.873397 C 1.8064045,12.873397 2.3178009,13.163727 2.5095742,13.125016 z"
-       id="path3320"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.08041666px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 2.7877416,13.248256 L 3.5971927,9.789015 L 4.3214383,9.8084487 L 3.5545899,13.364859 C 3.5545899,13.364859 3.1711649,13.345425 2.7877416,13.248256 z"
-       id="path3322"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.08056697px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 7.3512252,12.248309 L 7.7557329,9.708903 L 6.9467176,9.4940307 L 6.54221,12.75619 L 7.3512252,12.248309 z"
-       id="path3324"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.15000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 5.7353623,13.08496 L 5.6891732,10.299604 L 6.4513052,10.142681 L 6.4513052,12.771117 L 5.7353623,13.08496 z"
-       id="path3326"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.15619853;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 5.6452278,13.148145 L 5.392971,8.9065434 L 4.4756731,9.0614872 L 4.8884564,13.380561 L 5.6452278,13.148145 z"
-       id="path3328"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.1555775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 3.7049295,13.364922 L 4.1307479,10.962027 L 4.7694753,10.72949 L 4.4501116,13.345543 L 3.7049295,13.364922 z"
-       id="path3330"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.08043166px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 1,9 2,14 7.15625,0 C 9.419098,22.480223 8.8124702,21.732528 8.4375,20.84375 7.5942733,20.483493 7,19.566824 7,18.5 c 0,-0.908906 0.4443422,-1.687469 1.09375,-2.125 0.4228592,-2.323133 2.235702,-4.077159 4.4375,-4.09375 L 13,9 1,9 z"
+     id="path3006"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3776"
+     width="12"
+     height="1"
+     x="1"
+     y="7" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3778"
+     width="1"
+     height="6.3245554"
+     x="2.6666665"
+     y="1.0540925"
+     transform="matrix(1,0,0.31622776,0.9486833,0,0)" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 13,13 c -1.753503,0 -3.207349,1.250399 -3.75,3 L 18.018145,16 22.75,16 C 22.207349,14.250399 20.753503,13 19,13 z m -3,4 c -1.108,0 -2,0.669 -2,1.5 0,0.831 0.892,1.5 2,1.5 l 12,0 c 1.108,0 2,-0.669 2,-1.5 C 24,17.669 23.108,17 22,17 L 21,17 17.988607,20 15,17 z m -0.375,4 c 0.708999,1.243658 1.953067,2.0625 3.375,2.0625 l 6,0 c 1.421933,0 2.666001,-0.818842 3.375,-2.0625 z"
+     id="rect3782"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="scccsssssssscccscsscc" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3806"
+     width="4"
+     height="1"
+     x="0"
+     y="1" />
+  <path
+     style="fill:#505050;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="m 16,17 4,0 -2,2 z"
+     id="path3808"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/football-borderless.svg b/data/styles/symbols/football-borderless.svg
index d172706ca3..d481224523 100644
--- a/data/styles/symbols/football-borderless.svg
+++ b/data/styles/symbols/football-borderless.svg
@@ -1,19 +1,58 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="25"
    height="25"
    viewBox="0 0 210 210"
-   id="symbol-football-borderless">
+   id="symbol-football-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="football-borderless.svg">
+  <metadata
+     id="metadata13">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="12.5"
+     inkscape:cy="12.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-football-borderless" />
   <defs
      id="defs4" />
   <path
      d="M 199.97001,24.393446 C 213.95651,40.415139 210.25187,118.62186 156.03758,164.14699 C 104.58191,207.35563 23.283639,203.40372 8.7254719,185.85744 C -5.1284962,169.15621 5.1037227,89.585406 56.318384,46.091373 C 110.88831,-0.25504222 186.24668,8.6732148 199.97001,24.393446 z"
      id="path2416"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <path
      d="M 32.587862,109.87932 C 44.642263,85.645396 97.973979,41.906691 123.71906,33.354119"
      id="path3199"
diff --git a/data/styles/symbols/fountain.svg b/data/styles/symbols/fountain.svg
index cd491ed7b0..f1dc1f6257 100644
--- a/data/styles/symbols/fountain.svg
+++ b/data/styles/symbols/fountain.svg
@@ -1,50 +1,138 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="16"
-   height="16"
-   id="symbol-fountain">
+   width="24"
+   height="24"
+   id="symbol-fountain"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="fountain.svg">
+  <title
+     id="title3793">Fontain Map Icon</title>
+  <metadata
+     id="metadata15">
+    <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>Fontain Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="954"
+     inkscape:window-height="715"
+     id="namedview13"
+     showgrid="true"
+     inkscape:zoom="59.020365"
+     inkscape:cx="10.188923"
+     inkscape:cy="17.70163"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-fountain">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2992"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4" />
-  <g
-     id="layer1">
-    <g
-       id="g3168">
-      <path
-         d="M 3.2529464,7.3806995 C 4.1459174,8.419622 5.948665,9.1306994 8.0341964,9.1306995 C 10.119732,9.1306995 11.922479,8.4196219 12.81545,7.3806995 L 3.2529464,7.3806995 z"
-         id="path3157"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.17531611;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         d="M 5.5599604,15.915262 C 6.0175796,15.261941 6.9414303,14.814785 8.0101986,14.814785 C 9.0789672,14.814785 10.002817,15.261941 10.460436,15.915262 L 5.5599604,15.915262 z"
-         id="path3162"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.09952369;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         width="1.1454332"
-         height="7.1681948"
-         x="7.4637899"
-         y="8.3145123"
-         id="rect3164"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g3179">
-      <path
-         d="M 8,7.2966693 L 8,0.35331834"
-         id="path3173"
-         style="opacity:1;fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.34216636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.68433273, 0.34216636;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         d="M 6.6139528,2.6058216 A 1.7181498,1.6442509 0 1 1 3.1776532,2.6058215"
-         transform="matrix(0.8971578,0,0,-0.9374795,2.0653273,5.6279995)"
-         id="path3175"
-         style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.36310223;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.72620447, 0.36310224;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         d="M 6.6139528,2.6058216 A 1.7181498,1.6442509 0 1 1 3.1776532,2.6058215"
-         transform="matrix(-0.8971578,0,0,-0.9374795,13.936168,5.6286118)"
-         id="path3177"
-         style="fill:none;fill-rule:evenodd;stroke:#0000ff;stroke-width:0.36310223;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.72620447, 0.36310224;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-  </g>
+  <path
+     style="fill:#666666;fill-opacity:1;stroke:none"
+     d="M 2.3125,13.96875 C 3.3359946,15.57196 6.7842055,16.770079 11,16.9375 L 11,20 c -2.1751852,0.179862 -3.9425821,0.950853 -4.65625,1.96875 l 11.3125,0 C 16.942582,20.950853 15.175185,20.179862 13,20 l 0,-3.0625 c 4.215794,-0.167421 7.664005,-1.36554 8.6875,-2.96875 l -19.375,0 z"
+     id="path2994"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="m 11.200837,13.02345 c 0.333395,-1.317805 -1.185445,-1.164101 -1.5706543,-2.382908 -0.4102838,-1.298141 1.4292853,-0.6510476 1.8399953,0.648446 0.152524,0.497253 0.392188,0.965414 -0.269341,1.734462 z"
+     id="path3009"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3779"
+     d="M 11.191984,10.131575 C 10.35981,8.45608 9.612405,9.2948682 8.4470001,8.0467458 7.2057362,6.7173808 8.757443,6.6692499 10,8 c 0.472822,0.511229 0.972794,0.9507861 1.191984,2.131575 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="M 8.1012699,6.4420982 C 5.6570561,5.9582206 6.8398826,6.990305 5,7 3.0403563,7.0103267 3.0253687,5.9272864 4.9870542,5.9169491 5.7405085,5.9160494 6.3916072,5.8518731 8.1012699,6.4420982 z"
+     id="path3781"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3783"
+     d="m 12.657263,13.02345 c -0.333395,-1.317805 1.185445,-1.164101 1.570654,-2.382908 0.410284,-1.298141 -1.429285,-0.6510476 -1.839995,0.648446 -0.152524,0.497253 -0.392188,0.965414 0.269341,1.734462 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="M 12.666116,10.131575 C 13.49829,8.45608 14.245695,9.2948682 15.4111,8.0467458 16.652364,6.7173808 15.100657,6.6692499 13.8581,8 13.385278,8.511229 12.885306,8.9507861 12.666116,10.131575 z"
+     id="path3785"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3787"
+     d="M 15.860472,6.7307405 C 18.249588,6.0233172 17.167077,7.1601755 19,7 20.95223,6.829399 20.867185,5.7495989 18.91292,5.9203781 c -0.750321,0.068651 -1.404564,0.064848 -3.052448,0.8103624 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
+  <path
+     style="fill:#0000ff;fill-opacity:1;stroke:none"
+     d="M 12,9 C 11,6 10.612405,6.2948682 9.4470001,5.0467458 8.2057362,3.7173808 9.5541233,3.398157 10.79668,4.7289071 11.269502,5.2401361 12,7.480345 12,9 z"
+     id="path3789"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3791"
+     d="M 12,9 C 13,6 13.387595,6.2948682 14.553,5.0467458 15.794264,3.7173808 14.242557,3.3303838 13,4.6611339 12.527178,5.1723629 12,7 12,9 z"
+     style="fill:#0000ff;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/data/styles/symbols/golfCourse.svg b/data/styles/symbols/golfCourse.svg
index 9ef7e294e8..fbbd510702 100644
--- a/data/styles/symbols/golfCourse.svg
+++ b/data/styles/symbols/golfCourse.svg
@@ -1,4 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="46.6" id="golfCourse" viewBox="0 0 100 100" fill="#000000" fill-rule="evenodd" fill-opacity="1" stroke="none" height="46.6">
-   <svg:path 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 "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   enable-background="new 0 0 54.298 99.999"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="noun_project_227.svg"><metadata
+   id="metadata11"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1071"
+   inkscape:window-height="689"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="5.879542"
+   inkscape:cx="5.7853844"
+   inkscape:cy="18.676904"
+   inkscape:window-x="64"
+   inkscape:window-y="111"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid3001"
+     empspacing="2"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true" /></sodipodi:namedview>
+
+
+<g
+   id="g3775"
+   transform="translate(6,0)"><path
+     style="fill:#4d4d4d"
+     inkscape:connector-curvature="0"
+     id="path3"
+     d="m 3.924553,4.2657567 c -0.9771678,0 -1.7656886,0.7802156 -1.7656886,1.7400611 0,0.9631676 0.7885208,1.7417221 1.7656886,1.7417221 0.9712355,0 1.7604682,-0.7787918 1.7604682,-1.7417221 C 5.6847839,5.0459723 4.8957885,4.2657567 3.924553,4.2657567 z" /><path
+     style="fill:#4d4d4d"
+     inkscape:connector-curvature="0"
+     id="path5"
+     d="M 12.870693,7.7083868 C 12.804488,7.3325165 12.496721,7.1191911 12.477975,7.1054282 L 2.1125925,0.27142315 1.1496622,1.6664619 C 0.97026953,1.9414831 1.0485758,2.3071499 1.3235971,2.4860679 1.5971946,2.6671216 1.9621494,2.5935611 2.1415421,2.3187772 L 2.7051102,1.5126968 11.123987,7.0676988 4.2266255,8.3092097 C 3.7382789,8.3913127 3.384714,8.8796593 3.493631,9.3578024 l 1.5011082,5.8027346 -4.85499112,7.281775 c -0.29020792,0.497126 -0.11437467,1.134018 0.38773487,1.419005 0.50709265,0.288547 1.14920435,0.112951 1.44131065,-0.383938 0,0 5.0633333,-7.614695 5.0820794,-7.662628 0,0 0.2612583,1.05666 0.2612583,1.061881 l -0.7598085,5.712564 c -0.095391,0.568788 0.2904453,1.099847 0.8642169,1.195476 0.5737717,0.09539 1.1185938,-0.285225 1.2139851,-0.850454 l 0.7859106,-5.876295 c 0.023967,-0.150443 -0.00688,-0.479804 -0.041052,-0.625027 L 7.643628,9.552619 12.148614,8.7413182 c 0.481465,-0.085188 0.807504,-0.5495679 0.722079,-1.0329314 z" /><path
+     transform="matrix(1.3901428,0,0,1.3901428,-6.9473684,-7.8507215)"
+     d="m 16.507203,20.024641 c 0,0.397286 -0.322064,0.719351 -0.719351,0.719351 -0.397286,0 -0.71935,-0.322065 -0.71935,-0.719351 0,-0.397286 0.322064,-0.719351 0.71935,-0.719351 0.397287,0 0.719351,0.322065 0.719351,0.719351 z"
+     sodipodi:ry="0.71935058"
+     sodipodi:rx="0.71935058"
+     sodipodi:cy="20.024641"
+     sodipodi:cx="15.787852"
+     id="path2999"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" /><path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3005"
+     d="m 14,21 c 0.666667,0.383578 1.333333,0.409954 2,0 -0.333333,0.666667 -1,1.312846 -1,3 0,-1.687154 -0.666667,-2.333333 -1,-3 z"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none" /></g></svg>
\ No newline at end of file
diff --git a/data/styles/symbols/hairdresser.svg b/data/styles/symbols/hairdresser.svg
index dd5d365f8c..3ba4ea3272 100644
--- a/data/styles/symbols/hairdresser.svg
+++ b/data/styles/symbols/hairdresser.svg
@@ -9,14 +9,12 @@
    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="16px"
-   height="16px"
+   width="24"
+   height="24"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.2 r9819"
    sodipodi:docname="hairdresser.svg">
-  <title
-     id="title3712">hairdresser</title>
   <defs
      id="defs2818">
     <inkscape:perspective
@@ -34,18 +32,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="0.11633656"
-     inkscape:cy="9.8019802"
+     inkscape:zoom="22.627417"
+     inkscape:cx="2.0006907"
+     inkscape:cy="11.925233"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="800"
-     inkscape:window-height="551"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1109"
+     inkscape:window-height="756"
+     inkscape:window-x="168"
+     inkscape:window-y="37"
+     inkscape:window-maximized="0"
+     inkscape:snap-from-guide="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -54,15 +61,21 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>hairdresser</dc:title>
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
-            <dc:title>pavi</dc:title>
+            <dc:title>Yury Melnichek</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:description>Hair dressing shop</dc:description>
+        <dc:description />
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+        <dc:date>11-11-11</dc:date>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title></dc:title>
+          </cc:Agent>
+        </dc:publisher>
       </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
@@ -84,107 +97,178 @@
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2826"
-       width="14.235643"
-       height="1.3965346"
-       x="1.0361387"
-       y="5.2331681"
-       ry="0.69826728"
-       rx="0.40673271" />
-    <rect
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2833"
-       width="0.045049507"
-       height="1.7118812"
-       x="5.7663364"
-       y="3.9267328"
-       ry="0.022524754" />
-    <rect
-       ry="0.022524754"
-       y="2.0346534"
-       x="7.7485147"
-       height="3.5589108"
-       width="0.58564359"
-       id="rect2845"
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2847"
-       width="0.58564359"
-       height="3.5589108"
-       x="9.8658419"
-       y="2.0346534"
-       ry="0.022524754" />
-    <rect
-       ry="0.022524754"
-       y="1.9896041"
-       x="11.983169"
-       height="3.5589108"
-       width="0.58564359"
-       id="rect2853"
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="0.022524754"
-       y="2.0797026"
-       x="5.7212868"
-       height="3.5589108"
-       width="0.58564359"
-       id="rect2857"
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="0.022524754"
-       y="2.1247523"
-       x="3.6940589"
-       height="3.5589108"
-       width="0.58564359"
-       id="rect2861"
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="0.022524754"
-       y="2.1247523"
-       x="1.7569304"
-       height="3.5589108"
-       width="0.58564359"
-       id="rect2865"
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="0.022524754"
-       y="1.9445544"
-       x="14.010396"
-       height="3.5589108"
-       width="0.58564359"
-       id="rect2867"
-       style="opacity:0.93925231;color:#000000;fill:#ff2804;fill-opacity:0.98550726;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     inkscape:groupmode="layer"
+     transform="translate(0,8)">
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.3158417,13.522276 13.65,9.197524"
-       id="path2877" />
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="M 4.5,9 C 3.1192882,9 2,10.119288 2,11.5 2,12.880712 3.1192882,14 4.5,14 5.8807118,14 7,12.880712 7,11.5 7,10.119288 5.8807118,9 4.5,9 z m 0,1.25 c 0.6903559,0 1.25,0.559644 1.25,1.25 0,0.690356 -0.5596441,1.25 -1.25,1.25 -0.6903559,0 -1.25,-0.559644 -1.25,-1.25 0,-0.690356 0.5596441,-1.25 1.25,-1.25 z"
+       id="path2999"
+       inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.4059407,10.954454 13.7401,13.206929"
-       id="path2881" />
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="M 11.5,9 C 10.119288,9 9,10.119288 9,11.5 9,12.880712 10.119288,14 11.5,14 12.880712,14 14,12.880712 14,11.5 14,10.119288 12.880712,9 11.5,9 z m 0,1.25 c 0.690356,0 1.25,0.559644 1.25,1.25 0,0.690356 -0.559644,1.25 -1.25,1.25 -0.690356,0 -1.25,-0.559644 -1.25,-1.25 0,-0.690356 0.559644,-1.25 1.25,-1.25 z"
+       id="path3003"
+       inkscape:connector-curvature="0" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.93925231;color:#000000;fill:#ececec;fill-opacity:0.98550726;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3685"
-       sodipodi:cx="-5.8339109"
-       sodipodi:cy="10.54901"
-       sodipodi:rx="1.4190594"
-       sodipodi:ry="1.4866337"
-       d="m -4.4148515,10.54901 a 1.4190594,1.4866337 0 1 1 -2.8381188,0 1.4190594,1.4866337 0 1 1 2.8381188,0 z"
-       transform="matrix(0.91014726,0,0,0.79301936,9.1839756,2.0708171)" />
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3007"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.5,0,0,0.5,10,2)" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3009"
+       width="2"
+       height="18"
+       x="20"
+       y="-5"
+       ry="0.1013614" />
     <path
-       transform="matrix(0.91014726,0,0,0.79301936,9.1839756,5.359431)"
-       d="m -4.4148515,10.54901 a 1.4190594,1.4866337 0 1 1 -2.8381188,0 1.4190594,1.4866337 0 1 1 2.8381188,0 z"
-       sodipodi:ry="1.4866337"
-       sodipodi:rx="1.4190594"
-       sodipodi:cy="10.54901"
-       sodipodi:cx="-5.8339109"
-       id="path3689"
-       style="opacity:0.93925231;color:#000000;fill:#ececec;fill-opacity:0.98550726;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0.5,0,0,0.5,10,-16)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3017"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
        sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3019"
+       width="5.5"
+       height="1"
+       x="15.5"
+       y="-6"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3021"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,-11)" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       d="m 2,2 4,11 -1,5 1,1 2,-5 2,5 1,-1 -1,-5 4,-11 -6,9 z"
+       transform="translate(0,-8)"
+       id="path3057"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+    <rect
+       ry="0.061943077"
+       y="-4"
+       x="15.5"
+       height="1"
+       width="6.5"
+       id="rect3005"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       transform="matrix(0.25,0,0,0.25,10,-9)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3008"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3010"
+       width="6.5"
+       height="1"
+       x="15.5"
+       y="-2"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3012"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,-7)" />
+    <rect
+       ry="0.061943077"
+       y="0"
+       x="15.5"
+       height="1"
+       width="6.5"
+       id="rect3014"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       transform="matrix(0.25,0,0,0.25,10,-5)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3016"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3018"
+       width="6.5"
+       height="1"
+       x="15.5"
+       y="2"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3020"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,-3)" />
+    <rect
+       ry="0.061943077"
+       y="4"
+       x="15.5"
+       height="1"
+       width="6.5"
+       id="rect3022"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+    <path
+       transform="matrix(0.25,0,0,0.25,10,-1)"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       sodipodi:ry="2"
+       sodipodi:rx="2"
+       sodipodi:cy="22"
+       sodipodi:cx="22"
+       id="path3024"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       sodipodi:type="arc" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="rect3026"
+       width="6.5"
+       height="1"
+       x="15.5"
+       y="6"
+       ry="0.061943077" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+       id="path3028"
+       sodipodi:cx="22"
+       sodipodi:cy="22"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 24,22 c 0,1.104569 -0.895431,2 -2,2 -1.104569,0 -2,-0.895431 -2,-2 0,-1.104569 0.895431,-2 2,-2 1.104569,0 2,0.895431 2,2 z"
+       transform="matrix(0.25,0,0,0.25,10,1)" />
   </g>
 </svg>
diff --git a/data/styles/symbols/handball-borderless.svg b/data/styles/symbols/handball-borderless.svg
index 000c1ecc58..1fd796d33e 100644
--- a/data/styles/symbols/handball-borderless.svg
+++ b/data/styles/symbols/handball-borderless.svg
@@ -1,32 +1,71 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
    width="35"
    height="35"
-   id="symbol-handball-borderless">
+   id="symbol-handball-borderless"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="handball-borderless.svg">
+  <metadata
+     id="metadata11">
+    <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
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="6.7428571"
+     inkscape:cx="17.5"
+     inkscape:cy="17.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-handball-borderless" />
   <defs
      id="defs3341" />
   <path
      d="M 16.589448,18.010913 C 16.589448,18.010913 13.05624,20.70255 12.293558,21.213292 C 11.518624,21.732245 11.098373,21.944279 10.465907,21.31787 C 9.8428713,20.700812 10.366579,20.423544 10.948589,19.848537 C 11.518144,19.285823 15.103458,16.441775 15.103458,16.441775 L 16.589448,18.010913 z "
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path8185" />
   <path
      d="M 17.58643,18.809652 C 17.58643,18.809652 9.2457335,28.998698 8.7472953,29.652571 C 8.2420429,30.315382 8.4440585,30.700868 8.8533125,31.016895 C 9.2532074,31.325705 9.812923,31.249828 10.238458,30.722454 C 10.656681,30.204128 18.913822,19.966775 18.913822,19.966775 L 17.58643,18.809652 z "
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path8187" />
   <path
      d="M 17.464983,5.1398254 C 17.465947,5.6035435 17.210058,6.0324156 16.793918,6.2645464 C 16.377778,6.4966772 15.864772,6.4966772 15.448632,6.2645464 C 15.032492,6.0324156 14.776603,5.6035435 14.777567,5.1398254 C 14.776603,4.6761073 15.032492,4.2472351 15.448632,4.0151044 C 15.864772,3.7829736 16.377778,3.7829736 16.793918,4.0151044 C 17.210058,4.2472351 17.465947,4.6761073 17.464983,5.1398254 z "
-     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.33762848;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:0.33762848000000001;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path8189" />
   <path
      d="M 24.984297,10.22404 C 26.426958,10.959748 29.698074,14.081862 29.698074,14.081862 C 30.780527,15.400055 30.801967,16.833131 29.168881,17.689998 C 27.612294,18.506724 25.533288,19.331673 24.498495,19.658419 C 23.473319,19.982137 23.00366,19.969339 22.866867,19.293586 C 22.730668,18.620778 23.45578,18.204887 24.125677,17.910469 C 24.821232,17.604793 25.497399,17.429284 26.915888,16.531386 C 28.348685,15.624426 27.906069,15.352546 26.851746,14.458703 C 25.789469,13.558116 24.484784,13.291543 23.69671,14.394588 C 22.590858,15.873326 20.915653,18.522663 20.569765,18.952821 C 20.229438,19.376051 19.876684,19.693889 19.351934,19.439065 C 18.831567,19.186368 16.130816,17.021808 15.755227,16.432973 C 15.396489,15.870577 15.364756,15.728135 15.823321,15.096226 C 16.276477,14.471757 17.250359,13.300122 17.250359,13.300122 C 18.445397,11.80368 19.659172,11.143585 16.963382,10.68032 C 14.271343,10.217701 13.67584,8.2056826 13.531733,6.6850334 C 13.396458,5.257585 14.079132,4.9809583 14.393516,5.4552365 C 14.711822,5.9354331 14.679835,7.3830144 15.840412,8.1609147 C 17.021706,8.9527009 20.222949,8.3886395 21.960419,8.8990018 C 23.697888,9.4093653 23.554,9.4946379 24.984297,10.22404 z "
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#505050;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path8191" />
   <path
      d="M 27.071176,7.0635363 C 27.071176,8.2591549 26.101953,9.2284166 24.906342,9.2284166 C 23.710761,9.2284166 22.741538,8.2591549 22.741538,7.0635363 C 22.741538,5.8679176 23.710761,4.8986559 24.906342,4.8986559 C 26.101953,4.8986559 27.071176,5.8679176 27.071176,7.0635363 L 27.071176,7.0635363 z "
-     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path8193" />
 </svg>
diff --git a/data/styles/symbols/helipad.svg b/data/styles/symbols/helipad.svg
index c06a8bd8d9..299a8ed754 100644
--- a/data/styles/symbols/helipad.svg
+++ b/data/styles/symbols/helipad.svg
@@ -1,18 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" id="symbol-helipad" viewBox="0 0 700 700" width="37.28" height="37.28">
-   <svg:g transform="translate(5,210)">
-            <svg:path style="fill:#000000;  fill-rule:nonzero; stroke:none; stroke-width:0.28; stroke-linecap:butt; stroke-linejoin:bevel" d="M 66.47 1.85 C 25.07 2.03 1.85 23.27 1.85 67.01 L 1.85 517.01       C 1.85 558.05 22.73 579.29 64.13 579.29 L 515.93 579.29 C 557.33 579.29 578.21 559.13 578.21 517.01       L 578.21 67.01 C 578.21 24.35 557.33 2.03 514.67 1.85 C 514.67 1.85 66.29 1.85 66.47 1.85 Z"/>
-            <svg:path style="fill:none;  fill-rule:nonzero; stroke:#000000; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:miter" d="M 66.47 1.85 C 25.07 2.03 1.85 23.27 1.85 67.01 L 1.85 517.01       C 1.85 558.05 22.73 579.29 64.13 579.29 L 515.93 579.29 C 557.33 579.29 578.21 559.13 578.21 517.01       L 578.21 67.01 C 578.21 24.35 557.33 2.03 514.67 1.85 C 514.67 1.85 66.29 1.85 66.47 1.85"/>
-            <svg:path style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 85.91 282.11 C 114.89 282.29 138.29 258.89 138.11 230.09 C 138.29 201.29 114.89 177.89 85.91 177.89       C 57.29 177.89 33.89 201.29 33.71 230.09 C 33.89 258.89 57.29 282.29 85.91 282.11 Z"/>
-            <svg:path style="fill:#000000;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 85.91 263.21 C 104.45 263.21 119.21 248.45 119.21 230.09 C 119.21 211.73 104.45 196.79 85.91 196.79       C 67.73 196.79 52.79 211.73 52.79 230.09 C 52.79 248.45 67.73 263.21 85.91 263.21 Z"/>
-            <svg:path style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 253.85 397.31 C 214.07 397.31 214.07 450.95 253.85 450.95 L 484.61 450.95       C 523.31 450.95 523.31 397.31 484.61 397.31 L 253.85 397.31 Z"/>
-            <svg:polygon style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" points="321.89,212.63 321.89,163.85 301.55,163.85 301.55,212.63      321.89,212.63 "/>
-            <svg:polygon style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" points="353.57,165.11 353.57,154.67 270.41,154.67 270.41,165.11      353.57,165.11 "/>
-            <svg:path style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 360.77 147.47 L 493.79 147.47 C 511.61 147.47 511.61 172.85 493.79 172.85       L 360.77 172.85 C 343.49 172.85 343.49 147.47 360.77 147.47 Z"/>
-            <svg:path style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 130.19 147.47 L 261.77 147.47 C 279.59 147.47 279.59 172.85 261.77 172.85       L 130.19 172.85 C 111.47 172.85 111.11 147.47 130.19 147.47 Z"/>
-            <svg:path style="fill:#FFFFFF;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 274.55 362.75 C 257.45 362.75 248.99 350.33 246.11 339.71 L 232.79 306.23       L 80.69 245.75 C 62.33 238.73 66.83 211.37 87.71 211.37 L 417.83 211.37       C 454.55 211.37 475.07 233.51 484.61 256.91 L 511.07 321.35 C 520.61 343.49 504.59 362.75 480.83 362.75       L 274.55 362.75 Z"/>
-            <svg:polygon style="fill:#000000;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" points="357.89,289.13 357.89,232.07 322.25,232.07 322.25,289.13      357.89,289.13 "/>
-            <svg:polygon style="fill:#000000;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" points="414.23,232.07 414.23,289.13 378.95,289.13 378.95,232.07      414.23,232.07 "/>
-            <svg:path style="fill:#000000;  fill-rule:nonzero; stroke:none; stroke-width:3.42; stroke-linecap:butt; stroke-linejoin:bevel" d="M 435.83 234.41 C 446.81 237.11 457.79 247.01 464.99 263.21 L 476.33 289.31       L 435.83 289.31 L 435.83 234.41 Z"/>
-          </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="symbol-helipad"
+   viewBox="0 0 700 700"
+   width="37.28"
+   height="37.28"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="helipad.svg">
+  <metadata
+     id="metadata35">
+    <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="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview31"
+     showgrid="false"
+     inkscape:zoom="6.3304723"
+     inkscape:cx="18.639999"
+     inkscape:cy="15.323264"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-helipad" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path9"
+     d="m 104.97375,323.96689 c 34.77389,0.19188 62.85219,-24.75254 62.6362,-55.45335 0.21599,-30.70082 -27.86231,-55.64523 -62.6362,-55.64523 -34.341912,0 -62.420207,24.94441 -62.636193,55.64523 0.215986,30.70081 28.294281,55.64523 62.636193,55.45335 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path11"
+     d="m 104.97375,303.81948 c 22.24666,0 39.95758,-15.73417 39.95758,-35.30594 0,-19.57177 -17.71092,-35.49782 -39.95758,-35.49782 -21.814672,0 -39.741584,15.92605 -39.741584,35.49782 0,19.57177 17.926912,35.30594 39.741584,35.30594 z"
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path13"
+     d="m 306.48952,446.77015 c -47.7331,0 -47.7331,57.18027 0,57.18027 l 276.89518,0 c 46.43719,0 46.43719,-57.18027 0,-57.18027 l -276.89518,0 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <polygon
+     id="polygon15"
+     points="321.89,163.85 301.55,163.85 301.55,212.63 321.89,212.63 321.89,212.63 "
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <polygon
+     id="polygon17"
+     points="353.57,154.67 270.41,154.67 270.41,165.11 353.57,165.11 353.57,165.11 "
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path19"
+     d="m 434.78573,180.44057 159.61431,0 c 21.3827,0 21.3827,27.0551 0,27.0551 l -159.61431,0 c -20.73474,0 -20.73474,-27.0551 0,-27.0551 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path21"
+     d="m 158.10653,180.44057 157.88641,0 c 21.3827,0 21.3827,27.0551 0,27.0551 l -157.88641,0 c -22.46264,0 -22.89461,-27.0551 0,-27.0551 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path23"
+     d="m 331.32801,409.92917 c -20.51875,0 -30.67014,-13.23973 -34.12593,-24.56065 L 281.21905,349.67882 98.710138,285.20711 c -22.030667,-7.48333 -16.630995,-36.6491 8.423482,-36.6491 l 396.11995,0 c 44.06133,0 68.68383,23.60125 80.13113,48.54566 l 31.75008,68.69308 c 11.4473,23.60125 -7.77553,44.13242 -36.2858,44.13242 l -247.52097,0 z"
+     style="fill:#505050;fill-rule:nonzero;stroke:none;fill-opacity:1" />
+  <polygon
+     id="polygon25"
+     points="357.89,232.07 322.25,232.07 322.25,289.13 357.89,289.13 357.89,289.13 "
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <polygon
+     id="polygon27"
+     points="414.23,289.13 378.95,289.13 378.95,232.07 414.23,232.07 414.23,232.07 "
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+     transform="matrix(1.1999271,0,0,1.0660006,1.8880147,23.237473)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path29"
+     d="m 524.85226,273.11866 c 13.1752,2.8782 26.3504,13.43161 34.98987,30.70082 l 13.60718,27.82261 -48.59705,0 0,-58.52343 z"
+     style="fill:#ffffff;fill-rule:nonzero;stroke:none" />
+</svg>
diff --git a/data/styles/symbols/hospital.svg b/data/styles/symbols/hospital.svg
index ed1886fa9e..2625496981 100644
--- a/data/styles/symbols/hospital.svg
+++ b/data/styles/symbols/hospital.svg
@@ -1,5 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" width="15" id="hospital" viewBox="0 0 14 14" stroke="#E60202" stroke-width="3px" fill="none" height="15">
-   <svg:path d="M 2,7 L 12,7 M 7,2 L 7,12"/>
-   <svg:circle stroke-width="0.7px" cx="7" cy="7"  r="6.5"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hospital"
+   viewBox="0 0 22.4 22.4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="hospital.svg"
+   style="fill:none;stroke:#e60202;stroke-width:3px">
+  <metadata
+     id="metadata11">
+    <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="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="859"
+     inkscape:window-height="654"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="15.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="11.25"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hospital">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#c70000;fill-opacity:1;stroke:none"
+     d="M 12 2 C 6.4771525 2 2 6.4771525 2 12 C 2 17.522847 6.4771525 22 12 22 C 17.522847 22 22 17.522847 22 12 C 22 6.4771525 17.522847 2 12 2 z M 12 4 C 16.418278 4 20 7.581722 20 12 C 20 16.418278 16.418278 20 12 20 C 7.581722 20 4 16.418278 4 12 C 4 7.581722 7.581722 4 12 4 z M 10 6 L 10 10 L 6 10 L 6 14 L 10 14 L 10 18 L 14 18 L 14 14 L 18 14 L 18 10 L 14 10 L 14 6 L 10 6 z "
+     transform="scale(0.93333333,0.93333333)"
+     id="path2990" />
 </svg>
diff --git a/data/styles/symbols/hotel.svg b/data/styles/symbols/hotel.svg
index e8903b108d..99ab2f5104 100644
--- a/data/styles/symbols/hotel.svg
+++ b/data/styles/symbols/hotel.svg
@@ -1,4 +1,163 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="hotel" viewBox="0 0 90 90" fill="black" fill-opacity="1" stroke="black" stroke-width="1px" stroke-miterlimit="4" height="18.64">
-   <svg:path 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 "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hotel"
+   viewBox="0 0 115.87983 115.87983"
+   stroke-miterlimit="4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="hotel.svg"
+   style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-miterlimit:4">
+  <title
+     id="title3008">Hotel Map Icon</title>
+  <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" />
+        <dc:title>Hotel Map Icon</dc:title>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title></dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source></dc:source>
+        <dc:description>mapsforhumans.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="928"
+     inkscape:window-height="643"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="-4.4230507"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hotel">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="rect2988"
+     width="2"
+     height="12"
+     x="2"
+     y="8"
+     transform="scale(4.8283262,4.8283262)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="path2990"
+     sodipodi:cx="3"
+     sodipodi:cy="20"
+     sodipodi:rx="1"
+     sodipodi:ry="1"
+     d="m 4,20 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+     transform="scale(4.8283262,4.8283262)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="path2992"
+     sodipodi:cx="3"
+     sodipodi:cy="8"
+     sodipodi:rx="1"
+     sodipodi:ry="1"
+     d="M 4,8 A 1,1 0 1 1 2,8 1,1 0 1 1 4,8 z"
+     transform="scale(4.8283262,4.8283262)" />
+  <rect
+     y="57.939915"
+     x="96.566528"
+     height="38.62661"
+     width="9.6566525"
+     id="rect2994"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none" />
+  <path
+     transform="matrix(4.8283262,0,0,4.8283262,86.909873,0)"
+     d="m 4,20 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+     sodipodi:ry="1"
+     sodipodi:rx="1"
+     sodipodi:cy="20"
+     sodipodi:cx="3"
+     id="path2996"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+  <path
+     transform="matrix(4.8283262,0,0,4.8283262,86.909873,19.313305)"
+     d="M 4,8 A 1,1 0 1 1 2,8 1,1 0 1 1 4,8 z"
+     sodipodi:ry="1"
+     sodipodi:rx="1"
+     sodipodi:cy="8"
+     sodipodi:cx="3"
+     id="path2998"
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="rect3000"
+     width="17"
+     height="2"
+     x="3"
+     y="14"
+     transform="scale(4.8283262,4.8283262)" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     id="rect3006"
+     width="28.969957"
+     height="14.484979"
+     x="24.141632"
+     y="48.28326"
+     ry="4.8283262" />
+</svg>
diff --git a/data/styles/symbols/information-guidepost.svg b/data/styles/symbols/information-guidepost.svg
index b914b40a51..a29b2e82dc 100644
--- a/data/styles/symbols/information-guidepost.svg
+++ b/data/styles/symbols/information-guidepost.svg
@@ -1,7 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" version="1.1" baseProfile="full"
-   width="20" height="40" id="symbol-information-guidepost">
- <line x1="9.5" y1="0" x2="9.5" y2="20" stroke="#000000" stroke-width="1.5" />
- <polygon points="15 1  5 1  2 3  5 5  15 5" style="fill:#000000;stroke-width:0" />
- <polygon points="5 7  15 7  18 9  15 11  5 11" style="fill:#000000;stroke-width:0" />
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="information.svg">
+  <metadata
+     id="metadata11">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="0.67716277"
+     inkscape:cx="11.200531"
+     inkscape:cy="9.5781699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="9"
+     x="10.5"
+     y="10" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3090"
+     sodipodi:cx="11.5"
+     sodipodi:cy="8.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="matrix(1.2,0,0,1.2666667,-1.8,-3.866667)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,10 4,0 0,1 -2,1 -2,-1 z"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z"
+     id="rect2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
 </svg>
diff --git a/data/styles/symbols/information-office.svg b/data/styles/symbols/information-office.svg
index bcd900a27e..9be6d36f03 100644
--- a/data/styles/symbols/information-office.svg
+++ b/data/styles/symbols/information-office.svg
@@ -1,7 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" version="1.1" baseProfile="full"
-   width="20" height="20" id="symbol-information-office">
- <rect x="0" y="0" width="20" height="20" style="fill:#DA251D;stroke-width:0" />
- <rect x="5.5" y="8" width="8" height="10" style="fill:#FFFFFF;stroke-width:0" />
- <ellipse cx="9.5" cy="4" rx="4" ry="3" style="fill:#FFFFFF;stroke-width:0" />
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="information-guidepost.svg">
+  <metadata
+     id="metadata11">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="0.67716277"
+     inkscape:cx="11.200531"
+     inkscape:cy="9.5781699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="9"
+     x="10.5"
+     y="10" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3090"
+     sodipodi:cx="11.5"
+     sodipodi:cy="8.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="matrix(1.2,0,0,1.2666667,-1.8,-3.866667)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,10 4,0 0,1 -2,1 -2,-1 z"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z"
+     id="rect2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
 </svg>
diff --git a/data/styles/symbols/information.svg b/data/styles/symbols/information.svg
index 63c4decef9..11f19f5747 100644
--- a/data/styles/symbols/information.svg
+++ b/data/styles/symbols/information.svg
@@ -1,5 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="information" viewBox="0 0 200 200" height="18.64">
-   <svg:rect style="fill:blue;fill-opacity:1" width="200" height="200" x="0" y="0" rx="40" ry="40"/>
-   <svg:path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd" d="M 114.9996,71.691476 L 114.9996,160.4199 L 126.82978,160.4199 L 126.82978,170.98263 L 124.71757,170.98263 L 73.170217,170.98263 L 73.170217,160.4199 L 85.000937,160.4199 L 85.000937,82.254149 L 73.170217,82.254149 L 73.170217,71.691412 L 75.282973,71.691412 L 114.99957,71.691412 L 114.9996,71.691476 z M 84.155594,43.805631 C 84.155594,40.002758 85.529241,36.587522 88.275447,33.559351 C 91.021656,30.531181 94.578158,29.017365 98.943844,29.017365 L 101.0566,29.017365 C 104.71822,29.017365 108.09842,30.35543 111.19668,33.031558 C 114.29548,35.707143 115.84433,39.29868 115.84433,43.805631 C 115.84433,47.607949 114.5068,51.023202 111.83067,54.051372 C 109.15455,57.079542 105.56355,58.593358 101.0566,58.593358 L 98.943844,58.593358 C 95.28222,58.593358 91.902019,57.255293 88.803763,54.579704 C 85.704967,51.90358 84.155578,48.312043 84.155578,43.805631 L 84.155594,43.805631 z "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="information.svg">
+  <metadata
+     id="metadata11">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="0.67716277"
+     inkscape:cx="11.200531"
+     inkscape:cy="9.5781699"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2996"
+     width="3"
+     height="9"
+     x="10.5"
+     y="10" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path3090"
+     sodipodi:cx="11.5"
+     sodipodi:cy="8.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 13,8.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="matrix(1.2,0,0,1.2666667,-1.8,-3.866667)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,10 4,0 0,1 -2,1 -2,-1 z"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 9,18 2,-1 2,0 2,1 0,1 -6,0 z"
+     id="rect2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+</svg>
diff --git a/data/styles/symbols/kindergarten.svg b/data/styles/symbols/kindergarten.svg
index f45743bc6f..f273273266 100644
--- a/data/styles/symbols/kindergarten.svg
+++ b/data/styles/symbols/kindergarten.svg
@@ -1,43 +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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="18.639999"
-   height="18.639999"
-   viewBox="0 0 440 440"
-   id="symbol-kindergarten">
+   width="24"
+   height="24"
+   viewBox="0 0 566.52362 566.52362"
+   id="symbol-kindergarten"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="kindergarten.svg">
+  <title
+     id="title3798">Kindergarden Map Icon</title>
+  <metadata
+     id="metadata14">
+    <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>Kindergarden Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1105"
+     inkscape:window-height="761"
+     id="namedview12"
+     showgrid="true"
+     inkscape:zoom="18.694831"
+     inkscape:cx="12.886667"
+     inkscape:cy="11.002651"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-kindergarten">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs24" />
-  <g
-     id="g2387">
-    <path
-       d="M 223,8.7 L 107,369.7"
-       id="path5"
-       style="fill:none;stroke:#a52a2a;stroke-width:20" />
-    <path
-       d="M 223,8.7 L 292,435"
-       id="path7"
-       style="fill:none;stroke:#a52a2a;stroke-width:18.90410042" />
-    <path
-       d="M 223,8.7 L 372,285.7"
-       id="path9"
-       style="fill:none;stroke:#a52a2a;stroke-width:20" />
-    <path
-       d="M 66,57.7 C 66,57.7 349,124.7 350,127.7 C 351,130.7 347,349.7 347,349.7 L 60,252.7 L 66,57.7 z"
-       id="path11" />
-    <path
-       d="M 316.6454,223.51043 C 316.64719,243.06739 300.79408,254.05468 281.23767,248.05042 C 261.68127,242.04616 245.82816,221.32434 245.82995,201.76848 C 245.82816,182.21153 261.68127,171.22423 281.23767,177.2285 C 300.79408,183.23276 316.64719,203.95457 316.6454,223.51043 L 316.6454,223.51043 z"
-       id="path2450"
-       style="fill:#ff0000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 158.1029,143.73825 C 158.10469,163.2952 142.25158,174.2825 122.69517,168.27824 C 103.13877,162.27398 87.285663,141.55216 87.287447,121.9963 C 87.285663,102.43935 103.13877,91.452053 122.69517,97.456314 C 142.25158,103.46058 158.10469,124.18239 158.1029,143.73825 L 158.1029,143.73825 z"
-       id="path3222"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="M 223.12315,253.22312 C 223.12494,272.78008 207.27183,283.76737 187.71542,277.76311 C 168.15902,271.75885 152.30591,251.03703 152.3077,231.48117 C 152.30591,211.92422 168.15902,200.93692 187.71542,206.94119 C 207.27183,212.94545 223.12494,233.66726 223.12315,253.22312 L 223.12315,253.22312 z"
-       id="path3224"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 400.61683,50.55645 c -33.87051,-19.555139 -93.03314,19.50722 -132.14344,87.24825 -5.15304,8.92534 -9.9092,18.02346 -13.84439,26.92982 -84.99776,-49.07348 -100.91432,-17.0031 -115.13655,7.63052 -16.00263,27.71737 -32.60848,45.39683 74.40378,107.18039 l -30.2441,52.38432 c -32.57265,0.0582 -63.99821,16.42754 -81.45668,46.66649 -26.073521,45.16068 -10.600332,102.90741 34.56034,128.98095 45.16068,26.07352 102.90742,10.60033 128.98095,-34.56035 17.45846,-30.23894 15.9219,-65.63893 -0.31398,-93.8768 l 30.2441,-52.38432 c 96.17953,55.52928 114.0202,38.56274 130.02283,10.84537 14.22223,-24.63361 31.93568,-55.66658 -50.96004,-103.52645 5.74553,-7.86113 11.24666,-16.52915 16.39971,-25.45448 39.11029,-67.74103 43.35798,-138.508556 9.48747,-158.06371 z m -23.60516,40.885325 c 11.29018,6.518385 6.9041,35.252075 -19.16943,80.412755 -26.07353,45.16068 -44.56022,56.04379 -55.8504,49.5254 -11.29017,-6.51838 -11.10846,-27.96988 14.96507,-73.13056 26.07353,-45.16067 48.7646,-63.325981 60.05476,-56.807595 z M 192.18036,175.52752 c 11.29016,6.51838 15.15846,20.95507 8.64008,32.24523 -6.51839,11.29018 -20.95508,15.15848 -32.24524,8.64009 -11.29018,-6.51838 -15.15847,-20.95505 -8.64009,-32.24523 6.51839,-11.29018 20.95507,-15.15848 32.24525,-8.64009 z m 204.42659,118.02575 c 11.29018,6.51839 15.15848,20.95507 8.64009,32.24525 -6.51838,11.29018 -20.95507,15.15847 -32.24523,8.64008 -11.29017,-6.51839 -15.15847,-20.95507 -8.64009,-32.24524 6.51838,-11.29017 20.95506,-15.15846 32.24523,-8.64009 z m -169.49744,10.31636 20.07384,12.44142 -27.80954,48.16751 c -21.10617,15.07123 -56.7379,3.85232 -76.29304,37.72284 -19.55514,33.87051 8.53667,86.69928 5.47759,84.93312 -33.87049,-19.55514 -45.4754,-62.8652 -25.92025,-96.73571 12.59036,-21.80714 36.47535,-36.53733 60.46691,-38.34227 12.84919,-1.55036 32.7927,-25.33013 39.57853,-40.52092 z"
+     id="path3005"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sscsccsssccscssssssssssssssssscccsssccc" />
 </svg>
diff --git a/data/styles/symbols/library.svg b/data/styles/symbols/library.svg
index 01af26c214..c983a0ff77 100644
--- a/data/styles/symbols/library.svg
+++ b/data/styles/symbols/library.svg
@@ -1,12 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-library" viewBox="0 0 640 640" height="18.64">
-   <svg:g transform="translate(160,10)">
-            <svg:path fill="#FFFFFF" stroke="#000000" stroke-width="32.0585" d="M136,165.5l5.1,414l162.2-163.5V46.6 L136,165.5z"/>
-            <svg: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"/>
-            <svg:path fill="none" stroke="#000000" stroke-width="26.7171" d="M175.9,229.4l79.8-48.9"/>
-            <svg:path fill="none" stroke="#000000" stroke-width="26.7171" d="M182.3,289.9l69.5-42.5"/>
-            <svg:path fill="none" stroke="#000000" stroke-width="26.7171" d="M184.9,351.6l75.9-48.9"/>
-            <svg: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"/>
-            <svg: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"/>
-          </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-library"
+   viewBox="0 0 824.03436 824.03436"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="library.svg">
+  <title
+     id="title3759">Library Map Icon</title>
+  <metadata
+     id="metadata23">
+    <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>Library Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1066"
+     inkscape:window-height="687"
+     id="namedview19"
+     showgrid="true"
+     inkscape:zoom="22.071489"
+     inkscape:cx="11.463617"
+     inkscape:cy="11.749295"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-library">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3000"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 6.5 3.5 C 4.75 3.5 3 4 2 5 L 0 6 L 0 21 L 2 20 C 4 18 9 18 11 20 L 12 20 C 14 18 19 18 21 20 L 23 21 L 23 6 L 21 5 C 19 3 14 3 12 5 L 11 5 C 10 4 8.25 3.5 6.5 3.5 z M 2 6 L 2 18 C 4 16 9.0000003 16 11 18 L 11 6 L 12 6 L 12 18 C 14 16 19 16 21 18 L 21 6 L 22 6.6875 L 22 19.5625 L 21 19 C 19 17 14 17 12 19 L 11 19 C 9 17 4 17 2 19 L 1 19.5625 L 1 6.6875 L 2 6 z "
+     transform="scale(34.334765,34.334765)"
+     id="rect3002" />
+</svg>
diff --git a/data/styles/symbols/museum.svg b/data/styles/symbols/museum.svg
index b08dd28259..8800cc153a 100644
--- a/data/styles/symbols/museum.svg
+++ b/data/styles/symbols/museum.svg
@@ -1,10 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-museum" viewBox="0 0 200 220" height="18.64">
-   <svg:g fill="lightgray" stroke-width="3" stroke="#000000">
-                <svg: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 "/>
-                <svg: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 "/>
-                <svg: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 "/>
-                <svg: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 "/>
-                <svg: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 "/>
-            </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-museum"
+   viewBox="0 0 257.51074 283.26181"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="museum.svg">
+  <title
+     id="title3768">Museum Map Icon</title>
+  <metadata
+     id="metadata19">
+    <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>Museum Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="973"
+     inkscape:window-height="641"
+     id="namedview15"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="11.927728"
+     inkscape:cy="12.018669"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-museum">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2983"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="M 12,1 3.0000001,8.0000003 5,8 l 1,0 0,10 -1,0 -1,0 0,2 -2,0 0,2 20,0 0,-2 -2,0 0,-2 -2,0 0,-10 3.000001,3e-7 z m -3,7 1.5,0 0,10 -1.5,0 z m 4.5,0 1.5,0 0,10 -1.5,0 z"
+     transform="matrix(11.802575,0,0,11.802575,-12.875535,0)"
+     id="path2985"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccc" />
+</svg>
diff --git a/data/styles/symbols/parking.svg b/data/styles/symbols/parking.svg
index 8e93f009e9..cfced222c1 100644
--- a/data/styles/symbols/parking.svg
+++ b/data/styles/symbols/parking.svg
@@ -1,6 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" version="1.1" baseProfile="full"
-   width="20" height="20" id="symbol-parking">
- <rect x="0" y="0" width="20" height="20" rx="2" ry="2" style="stroke-width:0;fill:#0000ff" />
- <path d="M4,17 L4,3 10,3 C14,3 16,5 16,7.5 C16,10 14,12 10,12 L8.5,12 8.5,17 z M8.5,9 L10,9 C13,9 13,6 10,6 L8.5,6 8.5,9 z" style="stroke-width:0;fill:#ffffff" />
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="parking.svg">
+  <title
+     id="title2985">Parking Map Icon</title>
+  <metadata
+     id="metadata11">
+    <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>Parking Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="16.026026"
+     inkscape:cx="15.149227"
+     inkscape:cy="12.641088"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 7,5 0,10 c 0,0 0,4 0,5 l 3,0 0,-5 3,0 c 2.761424,0 5,-2.238576 5,-5 0,-2.7614237 -2.238576,-5 -5,-5 l -3,0 z m 3,2.53125 3,0 c 1.10457,0 2,1.1126809 2,2.46875 0,1.356069 -0.89543,2.46875 -2,2.46875 l -3,0 L 10,10 z"
+     id="rect3766"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccssscccsssccc" />
 </svg>
diff --git a/data/styles/symbols/parking_roof.svg b/data/styles/symbols/parking_roof.svg
index 0a80683002..64890ea396 100644
--- a/data/styles/symbols/parking_roof.svg
+++ b/data/styles/symbols/parking_roof.svg
@@ -1,28 +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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   version="1.0"
-   width="18"
-   height="18"
-   id="parking_roof">
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   id="symbol-parking"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="parking_roof.svg">
+  <title
+     id="title3061">Parking Map Icon</title>
+  <metadata
+     id="metadata11">
+    <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>Parking Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
      id="defs9" />
-  <g
-     transform="matrix(0.5,0,0,0.5,-40,0)"
-     id="g3">
-    <path
-       d="M 82,0 L 114,0 C 115.108,0 116,0.892 116,2 L 116,34 C 116,35.108 115.108,36 114,36 L 82,36 C 80.892,36 80,35.108 80,34 L 80,2 C 80,0.892 80.892,0 82,0 z "
-       style="fill:#0000ff"
-       id="path4291" />
-    <path
-       d="M 96.181368,24.062684 L 96.231738,31.870441 L 89.548973,31.870441 L 89.548973,10.378121 L 98.699998,10.378121 C 100.96677,10.378121 102.72981,10.629985 103.90517,11.133711 C 105.16449,11.721391 106.08798,12.476981 106.75962,13.568388 C 107.43125,14.659794 107.68312,15.91911 107.85103,17.26238 C 107.85103,19.277285 107.09544,20.956372 105.66821,22.215688 C 104.24099,23.391049 102.31004,24.062684 99.959318,24.062684 L 96.265328,24.062684 L 96.181368,24.062684 z M 96.097418,19.445194 L 98.364178,19.445194 C 100.29513,19.445194 101.21863,18.689604 101.21863,17.094471 C 101.21863,16.003064 100.37909,15.331429 98.532088,15.331429 L 96.130998,15.331429 L 96.097418,19.445194 z "
-       style="fill:#ffffff"
-       id="path4293" />
-    <path
-       d="M 98.276478,2.598089 L 86.167828,5.255891 L 86.167828,8.932056 L 98.276478,6.276769 L 110.38181,8.932056 L 110.38181,5.255891 L 98.276478,2.598089 z "
-       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2229" />
-  </g>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="894"
+     inkscape:window-height="612"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="16.026026"
+     inkscape:cx="4.2918878"
+     inkscape:cy="12.641088"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-parking">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <rect
+     ry="4.3999996"
+     rx="4.3999996"
+     y="1"
+     x="1"
+     height="22"
+     width="22"
+     id="rect2987"
+     style="fill:#f2f2f2;fill-opacity:1;stroke:none" />
+  <rect
+     style="fill:#0044d8;fill-opacity:1;stroke:none"
+     id="rect2985"
+     width="20"
+     height="20"
+     x="2"
+     y="2"
+     rx="4"
+     ry="4" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="m 7,5.53125 0,10 c 0,0 0,4 0,5 l 3,0 0,-5 3,0 c 2.761424,0 5,-2.238576 5,-5 0,-2.7614237 -2.238576,-5 -5,-5 l -3,0 z m 3,2.53125 3,0 c 1.10457,0 2,1.1126809 2,2.46875 C 15,11.887319 14.10457,13 13,13 l -3,0 0,-2.46875 z"
+     id="rect3766"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccssscccsssccc" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect2988"
+     width="9"
+     height="2"
+     x="2.0734718"
+     y="5.0376801"
+     inkscape:transform-center-x="4.0878472"
+     inkscape:transform-center-y="2.1306115"
+     transform="matrix(0.96592583,-0.25881905,0.25881905,0.96592583,0,0)" />
+  <rect
+     transform="matrix(-0.96592583,-0.25881905,-0.25881905,0.96592583,0,0)"
+     inkscape:transform-center-y="2.1306115"
+     inkscape:transform-center-x="-4.0878472"
+     y="-1.173977"
+     x="-21.108747"
+     height="2"
+     width="9"
+     id="rect2990"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" />
 </svg>
diff --git a/data/styles/symbols/peak.svg b/data/styles/symbols/peak.svg
index a16112d452..ace28dc96c 100644
--- a/data/styles/symbols/peak.svg
+++ b/data/styles/symbols/peak.svg
@@ -1,4 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="9" id="symbol-peak" viewBox="0 0 100 100" height="9">
-	   <svg:path fill="lightgrey" stroke="black" stroke-width="5" d="M 0,90 L 50,10 L 100,90 Z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-peak"
+   viewBox="0 0 266.66667 266.66667"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="peak.svg">
+  <title
+     id="title2986">Paeak Map Icon</title>
+  <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" />
+        <dc:title>Paeak Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1069"
+     inkscape:window-height="768"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="22.244238"
+     inkscape:cx="13.766949"
+     inkscape:cy="11.783898"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-peak">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;stroke:none"
+     d="m 44.444445,244.44445 c 78.080345,0 99.245945,0 177.777775,0 L 133.33333,66.666668 z"
+     id="path2990"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+</svg>
diff --git a/data/styles/symbols/petrolStation.svg b/data/styles/symbols/petrolStation.svg
index 99a3770b56..177d5926ef 100644
--- a/data/styles/symbols/petrolStation.svg
+++ b/data/styles/symbols/petrolStation.svg
@@ -1,4 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="petrolStation" viewBox="0 0 115 115" fill="#000000" fill-rule="evenodd" stroke-width="3px" height="18.64">
-   <svg:path 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 "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="petrolStation"
+   viewBox="0 0 148.06867 148.06867"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="petrolStation.svg"
+   style="fill:#000000;fill-rule:evenodd;stroke-width:3px">
+  <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>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1007"
+     inkscape:window-height="805"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="55.819055"
+     inkscape:cx="19.310836"
+     inkscape:cy="16.308998"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="petrolStation">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 8,2 C 6.892,2 6,2.892 6,4 l 0,16 -2,0 0,2 4,0 6,0 4,0 0,-2 -2,0 0,-8.3125 0.90625,0 0,3.3125 c 0,1.34138 0.07746,2.435661 0.53125,3.3125 0.453788,0.876839 1.400607,1.375 2.5625,1.375 1.145833,0 2.044441,-0.400462 2.5625,-1.09375 0.518059,-0.693288 0.651489,-1.527561 0.59375,-2.375 C 23.04548,14.592976 22.312386,12.90606 21.6875,11.8125 21.522922,10.478631 21.597868,9.0328279 21.625,7.78125 21.638939,7.1382039 21.649387,6.5536634 21.5625,6 21.475612,5.4463366 21.419011,4.9263158 21,4.517915 20.779494,4.3704534 20.708528,4.3959549 20.625,4.34375 L 17.46875,3.40625 16.625,3.21875 16.625,4 18.59375,4.9375 C 18.530571,5.1099864 18.4848,5.3354003 18.5,5.65625 18.512448,6.2337778 18.517865,6.7133596 19.1875,7 l 1.03125,0.3125 c 0.0097,0.1479256 0.03471,0.2780241 0.03125,0.4375 -0.02668,1.2304822 -0.147519,2.785591 0.0625,4.34375 l 0,0.125 0.09375,0.125 c 0.541113,0.915284 1.254827,2.66363 1.34375,3.96875 0.04446,0.65256 -0.08331,1.162039 -0.3125,1.46875 -0.229189,0.306711 -0.583334,0.53125 -1.4375,0.53125 -0.838108,0 -1.069224,-0.186177 -1.3125,-0.65625 C 18.444224,17.186177 18.3125,16.270974 18.3125,15 l 0,-4 0,-0.6875 -0.71875,0 L 16,10.3125 16,4 C 16,2.892 15.108,2 14,2 z m 1.0625,1.4375 3.9375,0 c 1.59375,0 1.59375,0 1.59375,2 l 0,2 c 0,2 0,2 -1.59375,2 l -3.9375,0 c -1.59375,0 -1.59375,0 -1.59375,-2 l 0,-2 c 0,-2 0,-2 1.59375,-2 z m 10.46875,1.9375 0.4375,0.21875 c 0.08298,0.1178774 0.275427,0.2295513 0.21875,0.625 -0.0065,0.045158 0.0022,0.1075691 0,0.15625 C 19.873321,6.3342149 19.610294,6.2535262 19.53125,6 z"
+     transform="scale(6.1695279,6.1695279)"
+     id="rect2988"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssccccccccccssssscsscccccccccscccsssssccccssssssssssssccsccc" />
+</svg>
diff --git a/data/styles/symbols/pharmacy.svg b/data/styles/symbols/pharmacy.svg
index 47bbbb49bd..4b8ac0e6d5 100644
--- a/data/styles/symbols/pharmacy.svg
+++ b/data/styles/symbols/pharmacy.svg
@@ -1,5 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-pharmacy" viewBox="0 0 36 36" height="18.64">
-   <svg:rect style="fill:limegreen" x="0" y="0" width="36" height="36" rx="2" ry="2"/>
-   <svg: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)"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="hospital"
+   viewBox="0 0 22.4 22.4"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="pharmacy.svg"
+   style="fill:none;stroke:#e60202;stroke-width:3px">
+  <title
+     id="title2987">Pharmacy Map Icon</title>
+  <metadata
+     id="metadata11">
+    <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>Pharmacy Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="859"
+     inkscape:window-height="654"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="15.733333"
+     inkscape:cx="7.5"
+     inkscape:cy="11.25"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="hospital">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#43b413;fill-opacity:1;stroke:none"
+     d="M 12 2 C 6.4771525 2 2 6.4771525 2 12 C 2 17.522847 6.4771525 22 12 22 C 17.522847 22 22 17.522847 22 12 C 22 6.4771525 17.522847 2 12 2 z M 12 4 C 16.418278 4 20 7.581722 20 12 C 20 16.418278 16.418278 20 12 20 C 7.581722 20 4 16.418278 4 12 C 4 7.581722 7.581722 4 12 4 z M 10 6 L 10 10 L 6 10 L 6 14 L 10 14 L 10 18 L 14 18 L 14 14 L 18 14 L 18 10 L 14 10 L 14 6 L 10 6 z "
+     transform="scale(0.93333333,0.93333333)"
+     id="path2990" />
+</svg>
diff --git a/data/styles/symbols/playground.svg b/data/styles/symbols/playground.svg
index 019510efdf..447e8c728d 100644
--- a/data/styles/symbols/playground.svg
+++ b/data/styles/symbols/playground.svg
@@ -1,60 +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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="18"
-   height="18"
-   id="symbol-playground">
+   width="24"
+   height="24"
+   id="symbol-playground"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="playground.svg">
+  <title
+     id="title3792">Playground Map Icon</title>
+  <metadata
+     id="metadata17">
+    <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>Playground Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="924"
+     inkscape:window-height="651"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="17.02075"
+     inkscape:cx="18.645217"
+     inkscape:cy="13.242113"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-playground">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2994"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4" />
-  <g
-     transform="matrix(6.7201909e-2,0,0,6.7227152e-2,-14.47422,-27.17495)"
-     id="g2168">
-    <rect
-       width="250"
-       height="250"
-       ry="48.57143"
-       x="224.28572"
-       y="413.07645"
-       id="rect3165"
-       style="fill:#c7f1a3;fill-opacity:1;stroke:#000000;stroke-width:17.79999924;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.10000002;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 247.27748,532.72088 L 451.29396,572.95821"
-       id="path2383"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:14.19999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.10000002;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       d="M 349.28571,554.13022 L 327.77308,599.29833 L 370.79835,599.29833 L 349.28571,554.13022 z"
-       id="path2385"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.83189112px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <g
-       id="g3189" />
-    <g
-       transform="matrix(0.8785919,0.3718702,-0.3462376,0.9436356,143.99832,-69.706166)"
-       id="g3185">
-      <path
-         d="M 338.53918,463.22191 C 329.58668,464.8893 317.58246,511.84896 317.58246,511.84896 L 352.1962,507.06244 C 352.1962,507.06244 347.86669,522.57427 344.01118,534.07986 C 341.60652,541.25572 349.61825,543.57042 353.65106,535.609 C 361.10006,520.90345 366.70326,504.64933 366.70326,504.64933 C 366.70326,504.64933 347.9936,461.46108 338.53918,463.22191 z"
-         id="path3181"
-         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33470964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 286.86472,449.50504 C 286.86828,454.63621 283.15421,458.79796 278.57144,458.79796 C 273.98867,458.79796 270.2746,454.63621 270.27816,449.50504 C 270.2746,444.37387 273.98867,440.21212 278.57144,440.21212 C 283.15421,440.21212 286.86828,444.37387 286.86472,449.50504 z"
-         transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)"
-         id="path3183"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:5.9000001;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
-    <g
-       transform="matrix(-0.9492779,-9.5302988e-2,-0.1490016,0.9940458,828.53274,98.070173)"
-       id="g3193">
-      <path
-         d="M 338.53918,463.22191 C 329.58668,464.8893 317.58246,511.84896 317.58246,511.84896 L 352.1962,507.06244 C 352.1962,507.06244 347.86669,522.57427 344.01118,534.07986 C 341.60652,541.25572 349.61825,543.57042 353.65106,535.609 C 361.10006,520.90345 366.70326,504.64933 366.70326,504.64933 C 366.70326,504.64933 347.9936,461.46108 338.53918,463.22191 z"
-         id="path3195"
-         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33470964px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         d="M 286.86472,449.50504 C 286.86828,454.63621 283.15421,458.79796 278.57144,458.79796 C 273.98867,458.79796 270.2746,454.63621 270.27816,449.50504 C 270.2746,444.37387 273.98867,440.21212 278.57144,440.21212 C 283.15421,440.21212 286.86828,444.37387 286.86472,449.50504 z"
-         transform="matrix(-1.664894,-0.163643,-0.2881576,1.3383147,941.37379,-110.14043)"
-         id="path3197"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke-width:5.9000001;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
-  </g>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 20.184986,7.9991413 c -0.8002,-0.2144127 -1.622705,0.2604607 -1.837118,1.0606597 -0.214412,0.800199 0.260461,1.622705 1.06066,1.837118 0.800199,0.214412 1.622705,-0.260461 1.837118,-1.06066 0.214412,-0.8002 -0.260461,-1.622705 -1.06066,-1.8371177 z m -0.776458,2.8977777 -0.482963,-0.12941 c -0.535122,-0.143386 -1.081359,0.171984 -1.224744,0.707107 l -0.517638,1.931852 -0.965926,-0.258819 c -0.533467,-0.142942 -1.081803,0.17364 -1.224745,0.707106 l -0.776457,2.897778 c -0.142942,0.533466 0.17364,1.081803 0.707106,1.224745 0.533467,0.142942 1.081803,-0.173641 1.224745,-0.707107 l 0.517638,-1.931852 c -0.143385,0.535123 0.171984,1.081359 0.707107,1.224745 l 0.965926,0.258819 c 0.535123,0.143386 1.081359,-0.171984 1.224745,-0.707107 l 1.035276,-3.863703 c 0.143386,-0.535123 -0.171984,-1.081359 -0.707107,-1.224745 l -0.482963,-0.129409 z"
+     id="path2996"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="-6.3864785"
+     inkscape:transform-center-y="-0.9351855" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3014"
+     width="20"
+     height="2"
+     x="4.5675287"
+     y="9.5023184"
+     rx="1"
+     ry="1"
+     transform="matrix(0.96592583,0.25881905,-0.25881905,0.96592583,0,0)" />
+  <path
+     id="path3017"
+     d="M 7.1449869,4.5050842 C 7.9451859,4.7194968 8.4200598,5.5420023 8.205647,6.3422015 7.9912344,7.1424005 7.1687288,7.6172743 6.3685297,7.4028616 5.5683307,7.188449 5.0934569,6.3659434 5.3078696,5.5657443 5.5222823,4.7655452 6.3447878,4.2906715 7.1449869,4.5050842 z M 6.3685297,7.4028616 6.8514927,7.5322712 C 7.3866156,7.6756569 7.7019852,8.221893 7.5585994,8.757016 l -0.5176381,1.931852 0.9659259,0.258819 c 0.5334663,0.142942 0.8500486,0.691278 0.7071068,1.224745 L 7.9375368,15.070209 C 7.7945949,15.603675 7.2462583,15.920258 6.7127919,15.777316 6.1793256,15.634374 5.8627433,15.086037 6.0056852,14.552571 l 0.5176381,-1.931852 c -0.1433858,0.535123 -0.689622,0.850493 -1.2247449,0.707107 L 4.3326526,13.069007 C 3.7975297,12.925621 3.48216,12.379385 3.6255458,11.844262 L 4.660822,7.9805589 C 4.8042077,7.445436 5.3504439,7.1300664 5.8855668,7.2734521 l 0.4829629,0.1294095 z"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0"
+     inkscape:transform-center-x="5.1833137"
+     inkscape:transform-center-y="-3.782195" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 12,16 2,4 -4,0 z"
+     id="rect3021"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
 </svg>
diff --git a/data/styles/symbols/postbox.svg b/data/styles/symbols/postbox.svg
index 0d9651ba9d..1e6490de83 100644
--- a/data/styles/symbols/postbox.svg
+++ b/data/styles/symbols/postbox.svg
@@ -1,2 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="13.98" id="postbox" viewBox="0 0 36 36" xml:space="preserve" height="13.98"><svg:ellipse style="fill:red" cx="18" cy="18" rx="18" ry="18"/><svg:ellipse style="fill:#ffffff" cx="18" cy="18" rx="16" ry="16"/><svg:path style="fill:red" 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)"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="postoffice"
+   viewBox="0 0 46.351933 46.351933"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="postoffice.svg">
+  <metadata
+     id="metadata11">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1125"
+     inkscape:window-height="669"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="7.2917032"
+     inkscape:cx="8.9629805"
+     inkscape:cy="8.9363231"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="postoffice">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 3.5625 7 L 11 14 L 13 14 L 20.4375 7 L 3.5625 7 z M 2 8.4375 L 2 18 L 8.03125 13.375 L 2 8.4375 z M 22 8.46875 L 16.03125 13.34375 L 22 18 L 22 8.46875 z M 15.25 14 L 14 15 L 10 15 L 8.90625 14.09375 L 3 19 L 21 19 L 15.25 14 z "
+     id="rect2990"
+     transform="scale(1.9313305,1.9313305)" />
+</svg>
diff --git a/data/styles/symbols/postoffice.svg b/data/styles/symbols/postoffice.svg
index a38ccb6d55..d1989792ca 100644
--- a/data/styles/symbols/postoffice.svg
+++ b/data/styles/symbols/postoffice.svg
@@ -1,5 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="postoffice" viewBox="0 0 36 36" height="18.64">
-   <svg:ellipse style="fill:red" cx="18" cy="18" rx="18" ry="18"/>
-   <svg: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)"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="postoffice"
+   viewBox="0 0 46.351933 46.351933"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="postoffice.svg">
+  <metadata
+     id="metadata11">
+    <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="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1125"
+     inkscape:window-height="669"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="7.2917032"
+     inkscape:cx="8.9629805"
+     inkscape:cy="8.9363231"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="postoffice">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 3.5625 7 L 11 14 L 13 14 L 20.4375 7 L 3.5625 7 z M 2 8.4375 L 2 18 L 8.03125 13.375 L 2 8.4375 z M 22 8.46875 L 16.03125 13.34375 L 22 18 L 22 8.46875 z M 15.25 14 L 14 15 L 10 15 L 8.90625 14.09375 L 3 19 L 21 19 L 15.25 14 z "
+     id="rect2990"
+     transform="scale(1.9313305,1.9313305)" />
+</svg>
diff --git a/data/styles/symbols/pub.svg b/data/styles/symbols/pub.svg
index ad28ad9079..7bffd548f2 100644
--- a/data/styles/symbols/pub.svg
+++ b/data/styles/symbols/pub.svg
@@ -1,9 +1,188 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="13.98" id="pub" viewBox="0 0 580 580" height="13.98">
-   <svg:g style="fill-rule: nonzero;stroke-linecap:butt;">
-                <svg:path style="fill:black;stroke:none;stroke-width:0.28;stroke-linejoin:bevel" d="M 67.775772,2.6625614 C 26.556032,2.6625614 3.3361722,24.082427 3.1561722,67.642152 L 3.1561722,517.81932 C 3.3361722,558.67906 24.216042,580.09892 65.435782,580.09892 L 517.23294,580.09892 C 558.63267,580.09892 579.51254,559.75905 579.51254,517.81932 L 579.51254,67.642152 C 579.51254,25.16242 558.63267,2.6625614 515.97294,2.6625614 C 515.97294,2.6625614 67.775772,2.4825625 67.775772,2.6625614 z "/>
-                <svg:path style="fill:none;stroke:black;stroke-width:3.41997862;stroke-linejoin:miter" d="M 67.775772,2.6625614 C 26.556032,2.6625614 3.3361722,24.082427 3.1561722,67.642152 L 3.1561722,517.81932 C 3.3361722,558.67906 24.216042,580.09892 65.435782,580.09892 L 517.23294,580.09892 C 558.63267,580.09892 579.51254,559.75905 579.51254,517.81932 L 579.51254,67.642152 C 579.51254,25.16242 558.63267,2.6625614 515.97294,2.6625614 C 515.97294,2.6625614 67.775772,2.4825625 67.775772,2.6625614"/>
-                <svg:path style="fill:white;stroke:none;stroke-width:3.42000008;stroke-linejoin:bevel" d="M 106.47552,104.54192 L 468.63324,104.54192 L 311.31423,299.12069 L 311.31423,423.67991 L 398.43368,423.67991 C 427.7735,423.85991 427.9535,467.95963 398.43368,467.77963 L 180.99505,467.77963 C 151.65524,467.95963 151.65524,423.85991 180.99505,423.67991 L 266.85451,423.67991 L 266.85451,298.2207 L 106.47552,104.54192 z "/>
-                <svg:path style="fill:black;stroke:none;stroke-width:3.42000008;stroke-linejoin:bevel" d="M 316.5342,241.88105 C 332.1941,241.88105 344.79402,229.28113 344.61402,213.80123 C 344.79402,198.32133 332.1941,185.72141 316.5342,185.54141 C 301.0543,185.72141 288.45438,198.32133 288.45438,213.80123 C 288.45438,229.28113 301.0543,241.88105 316.5342,241.88105 z "/>
-            </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   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"
+   version="1.1"
+   width="24"
+   id="pub"
+   viewBox="0 0 995.70819 995.70819"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="pub.svg">
+  <title
+     id="title2989">Pub Map Icon</title>
+  <metadata
+     id="metadata17">
+    <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>Pub Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1060"
+     inkscape:window-height="751"
+     id="namedview13"
+     showgrid="true"
+     inkscape:zoom="18.302216"
+     inkscape:cx="12.670859"
+     inkscape:cy="11.153348"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="pub">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2994"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#000094;fill-opacity:1;stroke:none"
+     d="m 207.43921,-207.43921 c 0,45.8262 -37.14948,82.97568 -82.97569,82.97568 -45.826199,0 -82.975679,-37.14948 -82.975679,-82.97568 0,-45.8262 37.14948,-82.97568 82.975679,-82.97568 45.82621,0 82.97569,37.14948 82.97569,82.97568 z"
+     id="path3038"
+     inkscape:connector-curvature="0" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#path3038"
+     id="use3042"
+     transform="translate(82.975677,-82.975678)"
+     width="995.70819"
+     height="995.70819"
+     style="fill:#000094" />
+  <use
+     height="995.70819"
+     width="995.70819"
+     transform="translate(248.92704,-82.975678)"
+     id="use3046"
+     xlink:href="#path3038"
+     y="0"
+     x="0"
+     style="fill:#000094" />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#path3038"
+     id="use3050"
+     transform="translate(414.8784,-82.975678)"
+     width="995.70819"
+     height="995.70819"
+     style="fill:#000094" />
+  <use
+     height="995.70819"
+     width="995.70819"
+     transform="translate(497.85408,4.9999996e-7)"
+     id="use3054"
+     xlink:href="#path3038"
+     y="0"
+     x="0"
+     style="fill:#000094" />
+  <rect
+     style="fill:#000094;fill-opacity:1;stroke:none"
+     id="rect3079"
+     width="2"
+     height="1"
+     x="4"
+     y="-7"
+     transform="scale(41.487841,41.487841)" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 12 7 L 10.3125 8 L 8.15625 8 C 6.9559165 8 6 6.9901462 6 8.15625 L 6 9.125 C 5.3123393 9.1444418 4.6271197 9.1867936 3.96875 9.40625 C 3.479908 9.5691975 2.9797615 9.8251279 2.625 10.28125 C 2.2702386 10.737372 2.09375 11.35 2.09375 12 L 2.09375 16 C 2.09375 16.575 2.170219 17.090439 2.40625 17.5625 C 2.6422807 18.034561 3.065071 18.407278 3.53125 18.59375 C 4.2229406 18.870426 5.0469768 18.873739 6 18.875 L 6 20.90625 C 6 22.072354 6.9559165 23 8.15625 23 L 16.84375 23 C 18.044083 23 19 22.072354 19 20.90625 L 19 8.15625 C 19 6.9901462 18.044083 8 16.84375 8 L 13 7 L 12 7 z M 8 9 L 9 9 L 9 21 L 8 21 L 8 9 z M 10 9 L 11 9 L 11 21 L 10 21 L 10 9 z M 12 9 L 13 9 L 13 21 L 12 21 L 12 9 z M 14 9 L 15 9 L 15 21 L 14 21 L 14 9 z M 16 9 L 17 9 L 17 21 L 16 21 L 16 9 z M 5.59375 10.9375 C 5.7170152 10.9302 5.8678932 10.9416 6 10.9375 L 6 17.0625 C 5.1248155 17.038273 4.4502311 16.998843 4.21875 16.90625 C 4.0599288 16.842722 4.0452195 16.840439 4 16.75 C 3.9547807 16.659561 3.90625 16.425 3.90625 16 L 3.90625 12 C 3.90625 11.65 3.979761 11.512628 4.0625 11.40625 C 4.145239 11.299872 4.270092 11.180803 4.53125 11.09375 C 4.792408 11.0067 5.166852 10.962612 5.59375 10.9375 z "
+     transform="scale(41.487841,41.487841)"
+     id="rect2990" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-opacity:1;stroke-width:1.30000000999999998;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path3784"
+     sodipodi:cx="16"
+     sodipodi:cy="5"
+     sodipodi:rx="3"
+     sodipodi:ry="3"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="scale(41.487841,41.487841)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3788"
+     sodipodi:cx="16"
+     sodipodi:cy="5"
+     sodipodi:rx="3"
+     sodipodi:ry="3"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="matrix(41.487841,0,0,41.487841,-290.41488,4.9999994e-7)" />
+  <path
+     transform="matrix(27.658561,0,0,27.658561,76.061048,69.146397)"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     sodipodi:ry="3"
+     sodipodi:rx="3"
+     sodipodi:cy="5"
+     sodipodi:cx="16"
+     id="path3790"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.95000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.94999999000000002;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3792"
+     sodipodi:cx="16"
+     sodipodi:cy="5"
+     sodipodi:rx="3"
+     sodipodi:ry="3"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     transform="matrix(27.658561,0,0,27.658561,-193.60993,110.63424)" />
+  <path
+     transform="matrix(27.658561,0,0,27.658561,345.73201,110.63424)"
+     d="m 19,5 a 3,3 0 1 1 -6,0 3,3 0 1 1 6,0 z"
+     sodipodi:ry="3"
+     sodipodi:rx="3"
+     sodipodi:cy="5"
+     sodipodi:cx="16"
+     id="path3794"
+     style="fill:#ffffff;fill-opacity:1;stroke:#505050;stroke-width:1.79999999000000011;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     sodipodi:type="arc" />
+</svg>
diff --git a/data/styles/symbols/recycling.svg b/data/styles/symbols/recycling.svg
index 5708524ec3..10666e0a5e 100644
--- a/data/styles/symbols/recycling.svg
+++ b/data/styles/symbols/recycling.svg
@@ -1,9 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="recycling" viewBox="0 0 80 80" stroke="none" fill="limegreen" height="18.64">
-   <svg: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"/>
-   <svg: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 "/>
-   <svg: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 "/>
-   <svg: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 "/>
-   <svg: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 "/>
-   <svg: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 "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="recycling"
+   viewBox="0 0 103.0043 103.0043"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="recycling.svg"
+   style="fill:#32cd32;stroke:none">
+  <metadata
+     id="metadata19">
+    <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="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="995"
+     inkscape:window-height="758"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="recycling">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     d="M 68.061158,52.349648 86.91611,40.992571 95.406351,57.42174 c 1.984732,8.931293 -9.151819,12.128917 -18.193375,11.577602 L 68.061158,52.349648 z"
+     id="path3"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 63.760905,64.037512 -9.923658,17.531798 9.923658,17.86259 0.220526,-7.167091 9.041556,0 c 3.307886,0.330788 7.608139,-1.874469 9.262082,-4.96183 l 11.577602,-21.50126 c -3.748938,3.859201 -8.710767,4.851567 -14.444437,4.851567 l -15.32654,0 -0.330789,-6.615773 z"
+     id="path5"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="M 41.598067,42.315726 22.52259,31.289438 32.666774,15.852636 C 39.39281,9.7881775 47.772788,17.94763 51.631989,26.107083 L 41.487804,42.315726 z"
+     id="path7"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 53.837247,40.441257 20.178106,0.110262 10.695499,-17.311271 -6.395247,3.197623 -4.410515,-7.938927 c -1.323154,-2.977097 -5.292618,-5.733668 -8.82103,-5.623406 l -24.368096,0.220526 c 5.182355,1.54368 8.490242,5.40288 11.246814,10.36471 l 7.497875,13.452072 -5.623406,3.528412 z"
+     id="path9"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="M 7.8576275,41.433622 13.811823,45.9544 8.298679,55.878059 c -2.8668348,5.292618 1.984732,10.033922 4.961829,11.577603 2.977098,1.653943 7.608138,1.874469 12.018654,1.874469 L 33.107826,56.760162 38.951758,59.847523 28.697311,41.213097 7.8576275,41.433622 z"
+     id="path11"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+  <path
+     d="m 8.7397305,65.581192 12.6802305,22.93468 c 2.536046,3.197623 7.387613,3.969463 12.349442,3.8592 l 13.341808,0 0,-21.721787 -25.360462,-0.220526 c -3.8592,0.220526 -9.041555,-0.551314 -13.0110185,-4.851567 z"
+     id="path13"
+     inkscape:connector-curvature="0"
+     style="fill:#505050;fill-opacity:1" />
+</svg>
diff --git a/data/styles/symbols/religion.svg b/data/styles/symbols/religion.svg
index ea86a6419d..16073dae06 100644
--- a/data/styles/symbols/religion.svg
+++ b/data/styles/symbols/religion.svg
@@ -1,8 +1,71 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="20%" height="20%" version="1.1" viewBox="-513.936996459961 -261.96849822998 1330.2361907959 1582.20468902588" style="background-color:#FFFFFF" xlink:xlink="" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
-  <defs />
-  <g>
-    <path d="M-503.936996459961 1310.2361907959 L-503.936996459961 50.3936996459961 L-302.362197875977 -251.96849822998 L-100.787399291992 50.3936996459961 L-100.787399291992 755.905494689941 C-67.1915995279946 655.118095397949 -16.7978998819987 571.128595987954 50.3936996459961 503.936996459961 C151.181098937988 403.149597167969 251.96849822998 352.755897521973 352.755897521973 352.755897521973 C453.543296813965 352.755897521973 554.330696105957 403.149597167969 655.118095397949 503.936996459961 C722.309694925942 571.128595987954 772.703394571938 655.118095397949 806.299194335938 755.905494689941 L806.299194335938 1310.2361907959 L-503.936996459961 1310.2361907959 Z" opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-dasharray="none" fill="#000000" fill-opacity="1" />
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   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"
+   width="100%"
+   height="100%"
+   version="1.1"
+   viewBox="-513.937 -261.9685 24 24"
+   xlink:xlink=""
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="religion.svg">
+  <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:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1109"
+     inkscape:window-height="765"
+     id="namedview10"
+     showgrid="true"
+     inkscape:zoom="38.351275"
+     inkscape:cx="9.0782648"
+     inkscape:cy="14.715805"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <g
+     id="g6"
+     transform="matrix(0.0120788,0,0,0.01207881,-503.85004,-255.79459)"
+     style="fill:#505050;fill-opacity:1">
+    <path
+       d="m -503.937,1310.2362 0,-1241.844529 201.5748,-331.158451 212.373143,331.158451 0,687.513819 C -56.393257,655.1181 -16.7979,571.1286 50.3937,503.937 151.1811,403.1496 264.92082,352.7559 365.70822,352.7559 c 100.7874,0 188.62248,50.3937 289.40988,151.1811 67.19159,67.1916 131.98357,151.1811 165.57937,251.96849 l 0,554.33071 z"
+       id="path8"
+       inkscape:connector-curvature="0"
+       style="fill:#505050;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="cccccsssccc" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/data/styles/symbols/restaurant.svg b/data/styles/symbols/restaurant.svg
index bd8995fbcb..4cfd72de98 100644
--- a/data/styles/symbols/restaurant.svg
+++ b/data/styles/symbols/restaurant.svg
@@ -1,5 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="20" id="symbol-restaurant" viewBox="10 0 90 115" fill="black" stroke="none" height="20">
-  <svg:path d="m 24.13,1.85 c -5.30,0.08 -3.62,21.26 -2.80,30.61 0.04,2.49 0.78,6.85 8.74,6.73 -0.24,64.88 -2.05,75.51 7.24,75.38 9.29,-0.14 7.12,-10.71 3.38,-75.53 7.96,-0.12 9.20,-5.13 9.16,-7.62 C 50.35,22.05 50.67,1.46 45.36,1.54 40.06,1.62 45.65,31.08 41.02,31.77 34.61,25.54 40.06,1.62 34.75,1.70 29.44,1.77 35.18,31.55 29.88,31.63 24,32 29,2 24,2 z" />
-  <svg:path d="m 77,45 c 0,56 3,69 -5,69 -10,0 -5,-12 -5,-69 C 44,43 58,1 70,0 84,0 97,44 77,45 z" />
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-restaurant"
+   viewBox="10 0 108 138"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="restaurant.svg"
+   style="fill:#000000;stroke:none">
+  <title
+     id="title2986">Restaraunt Map Icon</title>
+  <metadata
+     id="metadata11">
+    <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>Restaraunt Map Icon</dc:title>
+        <dc:identifier></dc:identifier>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>mapsforhumans.com</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1160"
+     inkscape:window-height="714"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="20.583333"
+     inkscape:cx="3.5951416"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-restaurant">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="m 38.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,34.5 c 0,1.587819 1.28718,2.875 2.875,2.875 l 11.5,0 11.5,0 C 62.71282,51.75 64,50.462819 64,48.875 l 0,-34.5 C 64,12.787181 62.71282,11.5 61.125,11.5 c -1.58782,0 -2.875,1.287181 -2.875,2.875 l 0,31.625 -5.75,0 0,-31.625 c 0,-1.587819 -1.28718,-2.875 -2.875,-2.875 -1.58782,0 -2.875,1.287181 -2.875,2.875 L 46.75,46 41,46 41,14.375 C 41,12.787181 39.71282,11.5 38.125,11.5 z"
+     id="use3040"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="m 87,11.5 c -6.35127,0 -11.5,10.898725 -11.5,17.25 l 0,28.75 c 0,6.351272 8.221604,23 11.5,23 l 0,40.25 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-57.5 0,-40.25 C 98.5,16.648725 93.35127,11.5 87,11.5 z"
+     id="path3083"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssscssscss" />
+  <path
+     style="fill:#4d4d4d;fill-opacity:1;stroke:none"
+     d="m 43.875,51.75 0,69 c 0,3.17564 2.57436,5.75 5.75,5.75 3.17564,0 5.75,-2.57436 5.75,-5.75 l 0,-69 z"
+     id="path3094"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cssscc" />
 </svg>
diff --git a/data/styles/symbols/school.svg b/data/styles/symbols/school.svg
index 7137d6e18d..09cb5a6450 100644
--- a/data/styles/symbols/school.svg
+++ b/data/styles/symbols/school.svg
@@ -1,14 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-school" viewBox="0 0 440 440" height="18.64">
-   <svg:g transform="translate(60,4)">
-            <svg:path fill="none" stroke="brown" stroke-width="20" d="M163,4.7l-116,361"/>
-            <svg:path fill="none" stroke="brown" stroke-width="18.9041" d="M163,4.7L232,431"/>
-            <svg:path fill="none" stroke="brown" stroke-width="20" d="M163,4.7l149,277"/>
-            <svg:path d="M6,53.7c0,0,283,67,284,70s-3,222-3,222l-287-97L6,53.7z"/>
-            <svg:path fill="none" stroke="white" 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"/>
-            <svg:path fill="none" stroke="white" 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"/>
-            <svg:path fill="none" stroke="white" 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"/>
-            <svg:path fill="none" stroke="white" 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"/>
-            <svg:path fill="none" stroke="white" 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"/>
-          </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-school"
+   viewBox="0 0 566.52362 566.52362"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="school.svg">
+  <metadata
+     id="metadata27">
+    <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="defs25" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="960"
+     inkscape:window-height="705"
+     id="namedview23"
+     showgrid="true"
+     inkscape:zoom="14.105278"
+     inkscape:cx="14.618427"
+     inkscape:cy="10.269576"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-school">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3004"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#505050;stroke-width:37.76824188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 94.420608,283.26181 70.815442,-94.4206 94.42061,23.60515 23.60515,47.2103"
+     id="path3039"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#505050;stroke-width:37.76824188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 188.84121,472.10302 -23.60516,-94.4206 47.21031,-94.42061 47.2103,118.02576 70.81545,-23.60516"
+     id="path3809"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0"
+     id="path3811"
+     d="m 330.47211,236.05151 23.60515,47.2103 70.81546,-47.2103 70.81545,23.60515 23.60515,70.81545"
+     style="fill:none;stroke:#505050;stroke-width:35.40772629;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     inkscape:connector-curvature="0"
+     id="path3813"
+     d="m 401.28756,472.10302 -23.60515,-70.81545 70.81546,-70.81546 23.60515,94.42061 47.2103,0"
+     style="fill:none;stroke:#505050;stroke-width:37.76824188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3815"
+     sodipodi:cx="6"
+     sodipodi:cy="4"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="M 8,4 A 2,2 0 1 1 4,4 2,2 0 1 1 8,4 z"
+     transform="matrix(23.605151,0,0,23.605151,-1.3333333e-6,23.605149)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3817"
+     sodipodi:cx="18"
+     sodipodi:cy="8"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="m 20,8 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+     transform="matrix(23.605151,0,0,23.605151,-3.3333333e-6,-23.605153)" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:23.60515022px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 377.68241,354.07727 118.02576,23.60515 -70.81545,-141.63091 0,0 z"
+     id="path3819"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:#505050;stroke-width:23.60515022px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 188.84121,330.47212 47.2103,0 -23.60515,-118.02576 -47.2103,-23.60515 -23.60515,47.2103 z"
+     id="path3821"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+</svg>
diff --git a/data/styles/symbols/subway.svg b/data/styles/symbols/subway.svg
index 6f951815d3..1c46805f1a 100644
--- a/data/styles/symbols/subway.svg
+++ b/data/styles/symbols/subway.svg
@@ -1,21 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema"
-     xmlns:xlink="http://www.w3.org/1999/xlink"
-     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns="http://www.w3.org/2000/svg"
-     xmlns:svg="http://www.w3.org/2000/svg"
-     xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:cc="http://web.resource.org/cc/"
-     xmlns:dc="http://purl.org/dc/elements/1.1/"
-     version="1.1"
-     baseProfile="full"
-     id="subway"
-     viewBox="0 0 60 60"
-     width="16"
-     height="16">
-
-  <circle cx="30" cy="30" r="30" style="fill:#ffff00;fill-opacity:1;stroke:#008000;stroke-width:4.5"/>
-  <text x="30" y="48" style="font-size: 50px; font-weight: bold; fill: #008000; text-anchor: middle;">
-    S
-  </text>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="subway"
+   viewBox="0 0 90 90"
+   width="24"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="subway.svg">
+  <metadata
+     id="metadata11">
+    <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="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1007"
+     inkscape:window-height="688"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="subway">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="path2990"
+     sodipodi:cx="12"
+     sodipodi:cy="10"
+     sodipodi:rx="8"
+     sodipodi:ry="8"
+     d="M 20,10 A 8,8 0 1 1 4,10 8,8 0 1 1 20,10 z"
+     transform="matrix(2.34375,0,0,2.34375,16.875,21.5625)" />
+  <path
+     transform="matrix(1.9147246,0,0,1.875,22.023305,26.25)"
+     d="M 20,10 A 8,8 0 1 1 4,10 8,8 0 1 1 20,10 z"
+     sodipodi:ry="8"
+     sodipodi:rx="8"
+     sodipodi:cy="10"
+     sodipodi:cx="12"
+     id="path2992"
+     style="fill:#4444dd;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
 </svg>
diff --git a/data/styles/symbols/supermarket.svg b/data/styles/symbols/supermarket.svg
index 423c7867f6..17932e2c39 100644
--- a/data/styles/symbols/supermarket.svg
+++ b/data/styles/symbols/supermarket.svg
@@ -1,18 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-supermarket" viewBox="0 0 30 30" height="18.64">
-   <svg:g transform="translate(0.5,1.5)">
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-            <svg: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"/>
-          </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-supermarket"
+   viewBox="0 0 38.626611 38.626611"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="supermarket.svg">
+  <metadata
+     id="metadata35">
+    <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="defs33" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1025"
+     inkscape:window-height="749"
+     id="namedview31"
+     showgrid="true"
+     inkscape:zoom="15.33316"
+     inkscape:cx="1.4984643"
+     inkscape:cy="11.843158"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-supermarket">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3012"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="m 7.4436697,1.6094425 -4.2247855,0 c -1.1618445,0.082504 -1.6094421,0.540388 -1.6094421,1.7157589 0,1.0073373 0.5141533,1.4862134 1.6094421,1.5031254 l 1.7168339,-1e-7 c 0.534088,1e-7 0.8018467,0.2634093 0.8714825,0.7933188 L 9.4538062,28.978387 C 9.6669683,29.773918 10.080335,30.5794 11.188865,30.5794 l 19.390535,0 c 1.034227,0 1.609442,-0.556661 1.609442,-1.609442 0,-0.920663 -0.514494,-1.609442 -1.415076,-1.609442 l -18.30059,0 -0.50295,-3.218884 17.278115,0 c 1.411146,0.208141 1.445555,-0.348826 1.800506,-1.42463 1.373998,-4.14029 2.838517,-8.313734 4.056809,-11.867386 0.02055,-2.2220062 -0.173155,-2.1629918 -1.307372,-2.802405 l -1.156786,-1e-7 -23.1860257,0 L 8.5158889,2.7241044 C 8.3348035,2.0482847 8.0471154,1.6094425 7.4436697,1.6094425 z m 2.5147533,9.6566525 4.526556,0 0,3.218884 -4.023605,0 z m 7.74544,0 4.828326,0 0,3.218884 -4.828326,0 z m 8.047211,0 5.783932,0 -1.106491,3.218884 -4.677441,0 z m -14.78675,6.437768 3.520655,0 0,3.218885 -3.017704,0 z m 6.739539,0 4.828326,0 0,3.218885 -4.828326,0 z m 8.047211,0 3.570949,0 -1.106491,3.218885 -2.464458,0 z"
+     id="rect3022"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3034"
+     sodipodi:cx="7.5"
+     sodipodi:cy="21.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 9,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="scale(1.6094421,1.6094421)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3036"
+     sodipodi:cx="18.5"
+     sodipodi:cy="21.5"
+     sodipodi:rx="1.5"
+     sodipodi:ry="1.5"
+     d="m 20,21.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+     transform="scale(1.6094421,1.6094421)" />
+</svg>
diff --git a/data/styles/symbols/synagogue.svg b/data/styles/symbols/synagogue.svg
index 945eacf973..7ae1216767 100644
--- a/data/styles/symbols/synagogue.svg
+++ b/data/styles/symbols/synagogue.svg
@@ -1,4 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="synagogue" viewBox="0 0 22 22" stroke="blue" fill="none" stroke-width="1.5px" stroke-linecap="butt" stroke-linejoin="miter" height="18.64">
-   <svg:path d="M 11,1 L 19,15 L 3,15 L 11,1 z M 11,20 L 3,6 L 19,6 L 11,20 z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="synagogue"
+   viewBox="0 0 28.326181 28.326181"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="synagogue.svg"
+   style="fill:none;stroke:#0000ff;stroke-width:1.5px;stroke-linecap:butt;stroke-linejoin:miter">
+  <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>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1026"
+     inkscape:window-height="663"
+     id="namedview5"
+     showgrid="true"
+     inkscape:zoom="12.660945"
+     inkscape:cx="9.3199997"
+     inkscape:cy="9.3199997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="synagogue">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#505050;stroke-width:1.54331827;stroke-linejoin:miter;stroke-opacity:1"
+     inkscape:transform-center-x="0.088171942"
+     inkscape:transform-center-y="-2.3923052"
+     d="M 24.785408,19.979639 3.5641532,19.97964 14.38291,2.3605151 z"
+     id="path2994"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     sodipodi:nodetypes="cccc"
+     inkscape:connector-curvature="0"
+     id="path3773"
+     d="M 24.785408,8.3465427 3.5641532,8.346541 14.38291,25.965666 z"
+     inkscape:transform-center-y="2.3923048"
+     inkscape:transform-center-x="0.088171942"
+     style="fill:none;stroke:#505050;stroke-width:1.54331827;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
diff --git a/data/styles/symbols/telephone.svg b/data/styles/symbols/telephone.svg
index b21177a1eb..0a99b2c5f3 100644
--- a/data/styles/symbols/telephone.svg
+++ b/data/styles/symbols/telephone.svg
@@ -1,29 +1,90 @@
 <?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://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.0"
-   width="6.6034"
-   height="18.5255"
-   viewBox="0 0 8.2542304 23.156885"
-   id="symbol-telephone">
+   width="24"
+   height="24"
+   viewBox="0 0 29.999928 30.000014"
+   id="symbol-telephone"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="telephone.svg">
+  <title
+     id="title3019">Phone Map Icon</title>
+  <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" />
+        <dc:title>Phone Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1028"
+     inkscape:window-height="685"
+     id="namedview8"
+     showgrid="true"
+     inkscape:zoom="18.511647"
+     inkscape:cx="12.010175"
+     inkscape:cy="12.44076"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-telephone">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs2403" />
-  <g
-     transform="translate(-1.6609657e-2,-1.4674477e-2)"
-     id="layer1">
-    <path
-       d="M 3.9607174,0.50115248 C 4.3360902,0.26684998 4.7497811,0.085136977 5.1888925,0.014674477 C 5.2044328,1.9416248 5.1889763,3.8692043 5.1965966,5.7963467 C 5.2132818,6.0925669 5.2095177,6.3896084 5.2031714,6.6861388 C 4.9060066,6.6789229 4.6102369,6.8214031 4.4382158,7.0648966 C 4.1625094,7.4372585 4.0684471,7.9041353 3.9902056,8.3512729 C 3.8240084,9.4338522 3.7863404,10.531802 3.7968277,11.625581 C 3.8107824,12.769493 3.9100304,13.912648 4.0856242,15.043074 C 4.1678889,15.480367 4.2436306,15.942733 4.5066333,16.313593 C 4.6624449,16.540688 4.93458,16.659505 5.2060548,16.658235 C 5.2086918,18.826259 5.207049,20.994308 5.2068761,23.162361 C 4.7522919,23.138212 4.3240871,22.950031 3.9411933,22.714259 C 2.9590412,22.099296 2.2299437,21.152763 1.6885087,20.142252 C 0.75739212,18.377442 0.34032162,16.390945 0.14313212,14.41957 C 0.040421916,13.340057 0.0032815162,12.254633 0.020761316,11.170769 C 0.064050616,8.9565237 0.29745822,6.7167014 1.0294575,4.6145276 C 1.3509143,3.7047663 1.772997,2.8238181 2.3461122,2.0445338 C 2.7873369,1.4408197 3.3245203,0.89886968 3.9607174,0.50115248 z"
-       id="path11"
-       style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 5.6938067,0.024896877 C 6.3251935,0.026302977 6.9566952,0.022393377 7.58803,0.026377177 C 7.9018443,0.032239677 8.1784566,0.27751538 8.2479997,0.57926118 C 8.2537101,0.78966478 8.2651301,1.2104713 8.2708397,1.4208742 L 8.2708397,5.4524625 C 8.2289291,5.7196857 8.3162081,6.0107549 8.1930671,6.2621817 C 8.0854939,6.5133793 7.8212231,6.6865832 7.5479728,6.6859028 C 6.9299494,6.6881459 6.3118495,6.6857589 5.6938097,6.6866671 C 5.6934558,4.4660721 5.6934595,2.245489 5.6938067,0.024896877 z"
-       id="path15"
-       style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 5.6938134,16.65539 C 6.3239907,16.656645 6.9542734,16.653093 7.5844046,16.6567 C 7.9002445,16.660914 8.1794085,16.907734 8.248396,17.211665 C 8.2540069,17.418668 8.2652288,17.832675 8.2708397,18.039677 L 8.2708397,21.934241 C 8.2298595,22.228339 8.3264253,22.562543 8.1527584,22.826703 C 8.0199204,23.054619 7.755154,23.176189 7.4963977,23.169957 C 6.895564,23.173406 6.2946553,23.17002 5.6938067,23.171279 C 5.6934632,20.999302 5.6934499,18.827347 5.6938134,16.65539 z"
-       id="path19"
-       style="opacity:1;fill:#000000;fill-rule:nonzero;stroke:none" />
-  </g>
+  <path
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     d="M 24.35657,5.0367984 C 22.588802,3.26903 16.401615,2.3851462 9.3305439,9.4562181 2.2594726,16.527289 3.1433558,22.714476 4.9111242,24.482244 l 6.1871878,-6.187188 c -0.883884,-0.883884 -0.883885,-2.651651 1.767767,-5.303303 2.651652,-2.651652 4.41942,-2.651651 5.303304,-1.767767 L 24.35657,5.0367984 z m 0.883884,0.8838835 -6.187188,6.1871871 0.883884,0.883884 0.883884,0.883884 c 0.489673,0.489673 1.278096,0.489672 1.767768,0 l 4.41942,-4.4194189 c 0.489671,-0.489672 0.489672,-1.2780957 -1e-6,-1.7677687 L 26.124338,6.8045661 25.240454,5.9206819 z M 11.982196,19.17894 l -6.1871883,6.187188 0.8838842,0.883884 0.8838834,0.883883 c 0.4896729,0.489673 1.2780956,0.489673 1.7677684,0 l 4.4194193,-4.419419 c 0.489672,-0.489671 0.489673,-1.278096 0,-1.767768 L 12.86608,20.062824 11.982196,19.17894 z"
+     id="rect2991"
+     inkscape:connector-curvature="0" />
 </svg>
diff --git a/data/styles/symbols/theatre.svg b/data/styles/symbols/theatre.svg
index 429433d867..9d847670c8 100644
--- a/data/styles/symbols/theatre.svg
+++ b/data/styles/symbols/theatre.svg
@@ -1,20 +1,122 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="23.3" id="theatre" viewBox="0 0 550 550" height="23.3">
-   <svg:g stroke="none" transform="translate(55,0)" fill-opacity="1" fill-rule="nonzero">
-                <svg: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"/>
-                <svg: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"/>
-                <svg: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"/>
-                <svg: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"/>
-                <svg:path fill="none" stroke="#FFFFFF" stroke-width="10" d="M248.4,124l14-43l15,27"/>
-                <svg:path fill="none" stroke="#FFFFFF" stroke-width="10" d="M336.4,110l7-32l35,23"/>
-                <svg:path fill="none" stroke="#FFFFFF" stroke-width="10" d="M317.4,146l-7,72l22-1L317.4,146z"/>
-                <path xmlns="" fill="none" stroke="#FFFFFF" stroke-width="10" d="M305.4,297c0,0,2-55,27-57s37,16,41,30"/>
-                <svg: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"/>
-                <svg:path fill="none" stroke="#000000" stroke-width="10" d="M51.4,150c0,0-2-15,25-15s31,17,31,17"/>
-                <svg:path fill="none" stroke="#000000" stroke-width="10" d="M153.4,168c0,0,6-11,12-14s22,5,22,5"/>
-                <svg:path d="M51.4,193l23-19c0,0,12-2,25,2s7,14,7,14L51.4,193z"/>
-                <svg:path d="M164.4,199c0,0,14-13,27-10s16,19,16,19s-7,6-26,1S164.4,199,164.4,199z"/>
-                <svg:path d="M125.4,188l-25,83h29L125.4,188z"/>
-                <svg: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"/>
-            </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="theatre"
+   viewBox="0 0 566.52362 566.52362"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="theatre.svg">
+  <metadata
+     id="metadata37">
+    <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="defs35" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="977"
+     inkscape:window-height="658"
+     id="namedview33"
+     showgrid="true"
+     inkscape:zoom="13.240134"
+     inkscape:cx="12.362941"
+     inkscape:cy="14.034139"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="theatre">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <g
+     id="g3816"
+     transform="matrix(0.84170782,-0.22553493,0.22553493,0.84170782,5.8561786,169.6283)">
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="rect3016"
+       d="M -3.6666666e-6,23.605152 C 132.18885,89.699577 198.28327,89.699577 330.47213,23.605152 l 0,99.141638 c 0,132.18885 -33.04721,330.47212 -165.23607,330.47212 C 33.047209,453.21891 -3.6666666e-6,254.93564 -3.6666666e-6,122.74679 z"
+       style="fill:#505050;fill-opacity:1;stroke:none" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="rect3019"
+       d="m 99.14164,171.19876 c 42.57148,13.39036 33.23879,17.62116 33.04721,50.68966 -61.944948,-13.64168 -62.935868,-14.77107 -99.141643,0 0,-15.73317 32.925183,-50.68966 66.094433,-50.68966 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 231.33048,171.19876 c -33.04721,17.64245 -33.04721,17.64245 -33.04721,50.68966 50.48458,-18.28979 63.53582,-14.62664 99.14165,0 0,-15.73317 -32.92519,-50.68966 -66.09444,-50.68966 z"
+       id="path3024"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="rect3026"
+       d="m 231.33048,354.07726 c -29.3753,-33.45907 -102.81355,-37.44952 -132.18884,0 0,-66.09442 132.18884,-66.09442 132.18884,0 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+  </g>
+  <g
+     id="g3809"
+     transform="matrix(0.84170782,0.22553493,-0.22553493,0.84170782,-24.211815,-67.593688)"
+     inkscape:transform-center-x="1.9163805"
+     inkscape:transform-center-y="3.1686007">
+    <path
+       style="fill:#505050;fill-opacity:1;stroke:none"
+       d="m 377.68241,23.605152 c 132.18886,66.094425 198.28328,66.094425 330.47214,0 l 0,99.141638 c 0,132.18885 -33.04721,330.47212 -165.23607,330.47212 -132.18885,0 -165.23607,-198.28327 -165.23607,-330.47212 z"
+       id="path3029"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path3037"
+       d="m 401.28756,70.815452 c 113.30474,51.568178 169.9571,51.568178 283.26184,0 l 0,77.352268 c 0,103.13635 -28.32619,276.72499 -141.63093,276.72499 -113.30473,0 -141.63091,-173.58864 -141.63091,-276.72499 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+       style="fill:#505050;fill-opacity:1;stroke:none"
+       d="m 472.10302,221.88842 c 42.57148,-13.39036 33.23879,-17.62116 33.04721,-50.68966 -61.94495,13.64168 -62.93587,14.77107 -99.14165,0 0,15.73317 32.92519,50.68966 66.09444,50.68966 z"
+       id="path3031"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#505050;fill-opacity:1;stroke:none"
+       d="m 609.0129,304.50645 c -29.3753,33.45907 -102.81355,37.44952 -132.18884,0 0,66.09442 132.18884,66.09442 132.18884,0 z"
+       id="path3035"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3807"
+       d="m 590.12877,221.88842 c -42.57148,-13.39036 -33.23879,-17.62116 -33.04721,-50.68966 61.94495,13.64168 62.93587,14.77107 99.14165,0 0,15.73317 -32.92519,50.68966 -66.09444,50.68966 z"
+       style="fill:#505050;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/data/styles/symbols/toilets.svg b/data/styles/symbols/toilets.svg
index 5cc6b0f398..59972928fd 100644
--- a/data/styles/symbols/toilets.svg
+++ b/data/styles/symbols/toilets.svg
@@ -1,9 +1,96 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="toilets" viewBox="0 0 200 200" height="18.64">
-   <svg:rect style="fill:blue;fill-opacity:1" width="200" height="200" x="0" y="0" rx="40" ry="40"/>
-   <svg:rect style="fill:#ffffff;stroke:#ffffff;stroke-width:5px;stroke-linejoin:round;stroke-opacity:1" y="30.489416" x="100.1455" height="141.07143" width="11.428572"/>
-   <svg:path style="fill:#ffffff;stroke:#ffffff;stroke-opacity:1" d="M 162.85978,41.739417 C 162.85978,48.366834 157.4872,53.739417 150.85978,53.739417 C 144.23236,53.739417 138.85978,48.366834 138.85978,41.739417 C 138.85978,35.112 144.23236,29.739417 150.85978,29.739417 C 157.4872,29.739417 162.85978,35.112 162.85978,41.739417 L 162.85978,41.739417 z "/>
-   <svg:path style="fill:#ffffff;stroke:#ffffff;stroke-linejoin:round;stroke-opacity:1" d="M 69.645503,42.989417 C 69.645503,49.616834 64.27292,54.989417 57.645503,54.989417 C 51.018086,54.989417 45.645503,49.616834 45.645503,42.989417 C 45.645503,36.362 51.018086,30.989417 57.645503,30.989417 C 64.27292,30.989417 69.645503,36.362 69.645503,42.989417 z "/>
-   <svg:path style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 54.920897,128.44734 L 59.466584,128.44734 L 60.224198,168.6009 L 67.547804,168.6009 L 68.305419,128.1948 L 80.427249,127.94226 L 67.295266,79.707479 L 70.8308,77.687174 L 81.437402,112.53743 L 89.266084,108.24428 L 73.356181,61.777271 L 41.283838,60.767119 L 24.868859,109.25444 L 31.939927,112.03236 L 43.556681,77.687174 L 46.839677,78.19225 L 33.707694,127.43718 L 44.819372,127.68972 L 46.334601,168.85344 L 53.658207,168.85344 L 54.920897,128.44734 z "/>
-   <svg:path style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" d="M 133.96533,60.514581 L 164.77498,60.262042 L 174.87651,68.090725 L 176.64428,113.29505 L 167.80544,113.04251 L 166.79529,77.182098 L 162.2496,76.677021 L 162.37587,168.97971 L 153.91584,169.23224 L 152.14808,114.3052 L 147.85493,114.05266 L 146.84478,169.61105 L 139.01609,169.10598 L 138.51102,77.434636 L 133.71279,77.434636 L 134.21787,112.53743 L 125.63157,112.78997 L 124.87396,68.595801 L 133.96533,60.514581 z "/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="toilets"
+   viewBox="0 0 257.51074 257.51074"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="toilets.svg">
+  <metadata
+     id="metadata19">
+    <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="defs17" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="935"
+     inkscape:window-height="697"
+     id="namedview15"
+     showgrid="true"
+     inkscape:zoom="8.4875217"
+     inkscape:cx="23.553524"
+     inkscape:cy="13.222152"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="toilets">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:22.83884811000000070;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="m 29.108405,75.107298 c -6.198355,10e-7 -10.742861,4.097492 -13.706217,8.717811 -2.963356,4.62032 -4.672574,10.38228 -4.672574,16.765021 l 0,58.67758 c 0.511608,4.36116 4.326807,7.98184 8.410633,7.98184 4.083827,0 7.899026,-3.62068 8.410633,-7.98184 l 0,-58.67758 c 0,-2.849692 0.782822,-5.162827 1.557525,-6.370707 0.340944,-0.531583 0.55023,-0.941724 0.62301,-1.005901 l 4.361069,0 c -0.250261,48.650038 -0.62301,92.668558 -0.62301,142.837988 0.328596,5.73507 5.252975,10.71879 10.591168,10.71879 5.338192,0 10.262571,-4.98372 10.591167,-10.71879 l 0,-64.37769 8.722138,0 0,64.37769 c 0.328596,5.73507 5.252974,10.71879 10.591167,10.71879 5.338193,0 10.262572,-4.98372 10.591168,-10.71879 C 84.935971,188.9957 83.8758,136.67802 83.933272,93.213522 l 4.361069,0 c 0.062,0.05075 0.327205,0.241995 0.62301,0.6706 0.655536,0.949829 1.557525,2.954509 1.557525,5.700108 l 0,59.68348 c 0.511605,4.36116 4.326806,7.98184 8.410632,7.98184 4.083832,0 7.899032,-3.62068 8.410632,-7.98184 l 0,-59.68348 c 0,-6.336955 -1.59004,-11.96332 -4.67257,-16.429722 -3.082531,-4.466401 -7.902173,-8.047209 -13.706219,-8.04721 z"
+     id="path2998"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssscscsscccsccccscccsscscssss" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="path3776"
+     sodipodi:cx="4"
+     sodipodi:cy="5"
+     sodipodi:rx="2"
+     sodipodi:ry="2"
+     d="M 6,5 A 2,2 0 1 1 2,5 2,2 0 1 1 6,5 z"
+     transform="matrix(10.729614,0,0,10.729614,16.094421,-10.729613)" />
+  <rect
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     id="rect3787"
+     width="23.502964"
+     height="225.3219"
+     x="117.00388"
+     y="21.459229" />
+  <path
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#505050;fill-opacity:1;stroke:none;stroke-width:22.83884811000000070;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+     d="M 16.40625 7.25 C 15.622227 7.25 15.006682 7.810696 14.8125 8.5625 L 13.28125 14.8125 A 0.75007499 0.75007499 0 1 0 14.71875 15.1875 L 16.28125 8.90625 C 16.335122 8.8275442 16.45542 8.75 16.40625 8.75 L 16.78125 8.75 L 16.84375 8.75 L 15 18 L 16.15625 18 C 16.146991 19.309483 16.125 20.595045 16.125 22 C 16.155626 22.534509 16.59623 23 17.09375 23 C 17.591267 23 18.063124 22.534509 18.09375 22 L 18.09375 18 L 18.90625 18 L 18.90625 22 C 18.936876 22.534509 19.408731 23 19.90625 23 C 20.403769 23 20.844374 22.534509 20.875 22 C 20.885437 20.706551 20.878479 19.346628 20.875 18 L 22 18 L 20.15625 8.75 L 20.6875 8.75 C 20.79513 8.75 20.817416 8.7479622 20.84375 8.75 C 20.844706 8.7618178 20.887225 8.821202 20.90625 8.875 C 20.92383 8.9247105 20.879068 8.8703251 20.9375 9 L 22.28125 15.15625 A 0.75007499 0.75007499 0 1 0 23.71875 14.84375 L 22.34375 8.53125 L 22.34375 8.46875 L 22.3125 8.40625 C 22.322668 8.4288155 22.302578 8.1250965 22.03125 7.78125 C 21.759922 7.4374035 21.239787 7.25 20.6875 7.25 L 20.0625 7.25 L 16.78125 7.25 L 16.40625 7.25 z "
+     transform="scale(10.729614,10.729614)"
+     id="path3804" />
+  <path
+     transform="matrix(10.729614,0,0,10.729614,156.25,-10.729613)"
+     d="M 6,5 A 2,2 0 1 1 2,5 2,2 0 1 1 6,5 z"
+     sodipodi:ry="2"
+     sodipodi:rx="2"
+     sodipodi:cy="5"
+     sodipodi:cx="4"
+     id="path3791"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     sodipodi:type="arc" />
+</svg>
diff --git a/data/styles/symbols/university.svg b/data/styles/symbols/university.svg
index f88e6a9e7a..ff79248e6e 100644
--- a/data/styles/symbols/university.svg
+++ b/data/styles/symbols/university.svg
@@ -1,6 +1,85 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" version="1.1" baseProfile="full" width="18.64" id="symbol-university" viewBox="0 0 128 128" height="18.64">
-   <svg:g transform="translate(0,32)">
-            <svg:path fill="#000000" d="M 65,1 C 57.6,1.4 51.7,3.6 52,6 C 51.7,6.4 52,6.4 51,6.4 L 0,6 L 14,10 C 13.1,12 12.4,14 12,17 C 11.1,20.7 11.4,23.4 12,25 L 21,50 L 15,58 L 20,61 L 23,56 L 26,62 L 30,60 L 22,17 L 35,44 C 35.2,43.8 40.7,18.7 62,19 C 84.2,18.7 95,46.5 95,46.5 L 106,12 L 128,7 L 78,7 C 78.2,6.5 78.2,6.4 78.2,6.3 C 78.2,3.6 72.3,1.4 65,1.4 L 65,1 L 65,1 z"/>
-          </svg:g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   id="symbol-university"
+   viewBox="0 0 164.80687 164.80687"
+   height="24"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="university.svg">
+  <title
+     id="title2985">University Map Icon</title>
+  <metadata
+     id="metadata11">
+    <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>University Map Icon</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Yury Melnichek</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs9" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1041"
+     inkscape:window-height="705"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="29.410679"
+     inkscape:cx="17.910704"
+     inkscape:cy="14.970319"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="symbol-university">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <path
+     style="fill:#505050;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="M 2,6 12,2 22,6 12,10 z"
+     id="path2990"
+     inkscape:connector-curvature="0"
+     transform="scale(6.8669529,6.8669529)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path3760"
+     d="m 34.334765,54.935623 48.06867,20.600859 48.068675,-20.600859 0,34.334765 C 109.87125,82.403435 99.945963,78.594813 82.403435,96.137341 65.063177,78.797083 54.935623,82.403435 34.334765,89.270388 z"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     transform="scale(6.8669529,6.8669529)"
+     inkscape:connector-curvature="0"
+     id="path3762"
+     d="M 2,6 12,2 22,6 12,10 4,7 3,9 4,13 4.7172361,13.769694 5.5100188,15.510019 4.3740138,16 4,15 3,16 2,16 3,14 2,9 3,6.3738919 z"
+     style="fill:#505050;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="ccccccccccccccccc" />
+</svg>