Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10813)
+++ /trunk/data/defaultpresets.xml	(revision 10814)
@@ -5304,5 +5304,5 @@
             <key key="amenity" value="waste_basket" />
         </item> <!-- Waste Basket/Trash Can -->
-        <item name="Waste Disposal/Dumpster" icon="presets/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
+        <item name="Waste Disposal/Dumpster" icon="presets/service/recycling/waste_disposal.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=waste_disposal"
@@ -6498,5 +6498,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Survey Point -->
-        <item name="Surveillance Camera" icon="presets/service/surveillance.png" type="node,closedway" preset_name_label="true">
+        <item name="Surveillance Camera" icon="presets/service/surveillance.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=surveillance"
@@ -7098,5 +7098,5 @@
             <text key="name" text="Name" />
         </item> <!-- Battlefield -->
-        <item name="Palaeontological Site" icon="presets/sightseeing/palaeontological_site.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Palaeontological Site" icon="presets/sightseeing/palaeontological_site.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological=palaeontological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:geological=palaeontological_site"
Index: /trunk/images/presets/service/recycling/waste_disposal.svg
===================================================================
--- /trunk/images/presets/service/recycling/waste_disposal.svg	(revision 10814)
+++ /trunk/images/presets/service/recycling/waste_disposal.svg	(revision 10814)
@@ -0,0 +1,116 @@
+<?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="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waste_disposal6.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="5.3425075"
+     inkscape:cy="3.5099536"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4170"
+       width="15"
+       height="16"
+       x="0"
+       y="1036.3622" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1,1049.3622 0,-8 11.957726,0 c 0,0 -0.999999,9.9864 -3.9154515,9.9921 L 4,1051.3622 Z"
+       id="path4160"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccscc" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4162"
+       sodipodi:type="arc"
+       sodipodi:cx="3.05"
+       sodipodi:cy="1049.3621"
+       sodipodi:rx="2.4841819"
+       sodipodi:ry="2.4289775"
+       sodipodi:start="0"
+       sodipodi:end="6.2827839"
+       sodipodi:open="true"
+       d="m 5.5341818,1049.3621 a 2.4841819,2.4289775 0 0 1 -2.4839326,2.4289 2.4841819,2.4289775 0 0 1 -2.48443108,-2.4285 2.4841819,2.4289775 0 0 1 2.48343398,-2.4294 2.4841819,2.4289775 0 0 1 2.4849295,2.428" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4166"
+       sodipodi:type="arc"
+       sodipodi:cx="3.05"
+       sodipodi:cy="1049.3621"
+       sodipodi:rx="0.97122699"
+       sodipodi:ry="0.94964403"
+       sodipodi:start="0"
+       sodipodi:end="6.2827839"
+       sodipodi:open="true"
+       d="m 4.0212269,1049.3621 a 0.97122699,0.94964403 0 0 1 -0.9711295,0.9496 0.97122699,0.94964403 0 0 1 -0.9713244,-0.9494 0.97122699,0.94964403 0 0 1 0.9709346,-0.9499 0.97122699,0.94964403 0 0 1 0.9715193,0.9493" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.7954951,1041.4341 10.8132299,-3.4214"
+       id="path4168"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: /trunk/images/presets/service/surveillance.svg
===================================================================
--- /trunk/images/presets/service/surveillance.svg	(revision 10814)
+++ /trunk/images/presets/service/surveillance.svg	(revision 10814)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://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="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="surv3.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="13.181422"
+     inkscape:cy="5.3416433"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.66019452;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4159"
+       width="2.9398055"
+       height="7.4130197"
+       x="7.030097"
+       y="1036.3923" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#008080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4145"
+       width="9.3797579"
+       height="5.2418313"
+       x="370.80548"
+       y="962.91003"
+       transform="matrix(0.92523816,0.3793868,-0.35358302,0.93540315,0,0)" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.35006732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4149"
+       width="3.410821"
+       height="3.4945693"
+       x="379.67514"
+       y="963.76813"
+       transform="matrix(0.92523816,0.3793868,-0.35358302,0.93540315,0,0)" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.35006732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4151"
+       width="1.7054105"
+       height="5.2418313"
+       x="383.08597"
+       y="962.89447"
+       transform="matrix(0.92523816,0.3793868,-0.35358302,0.93540315,0,0)" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.51776552;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -0.01406146,1046.9001 8.67851426,3.5586 4.8380902,-5.5671 -11.0453705,-4.529 -2.47123396,6.5375"
+       id="path4147"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/sightseeing/palaeontological_site.svg
===================================================================
--- /trunk/images/presets/sightseeing/palaeontological_site.svg	(revision 10814)
+++ /trunk/images/presets/sightseeing/palaeontological_site.svg	(revision 10814)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://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"
+   id="svg2"
+   viewBox="0 0 95.701 86.146"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ammonoid2.svg">
+  <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="1680"
+     inkscape:window-height="988"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="51.783795"
+     inkscape:cy="26.270164"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#eddbd0;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="m 9,80.708504 25.125,-5.9375 4.625,-2.25 1.375,-1.3125 2.375,-0.0625 0.1875,-6.25 -4.8125,-5.375 -29.0625,20.5 0.3125,0.875"
+     id="path4147"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 58.945,45.634 4.1613,-1.3666 m -5.2024,-0.56332 2.7234,-5.388 m -5.177,4.4425 c 0,0 0.34285,-4.8026 -0.41417,-5.7204 m -1.0297,6.5207 c 0,0 -2.6256,-2.8511 -4.2967,-3.9631 m 3.2243,6.0896 c 0,0 -4.4409,-1.1026 -5.5935,-1.6573 m 6.0234,3.3001 c 0,0 -3.1633,1.9778 -5.0744,3.2252 m 6.6793,-1.601 c 0,0 -1.2796,4.5279 -2.1716,5.9571 m 6.69325,-6.0304 c 0,0 2.9482,5.7063 2.6799,7.0422 m 0.3584,-9.8108 c 0,0 5.8584,2.6903 6.9116,3.7862 m -60.8665,30.8302 c 0,0 -0.53627,-6.0618 6.5616,-9.9598 7.0978,-3.898 17.666,-11.994 23.058,-11.03 m -29.4871875,21.13 c 0,0 1.5440875,-0.56542 2.9403875,1.0054 1.3963,1.57082 4.0143,4.1307 5.8179,3.7234 1.8035,-0.40725 1.629,-2.0363 2.7926,-2.3272 1.1636,-0.2909 2.7344,0.69814 2.7926,-0.98904 0.0582,-1.68718 -1.0472,-3.258 1.9199,-3.1998 2.9671,0.0582 4.247,2.618 5.2943,1.2218 1.0472,-1.3963 1.6872,-3.6653 3.3744,-5.3525 1.6872,-1.6872 2.6762,-1.3381 4.7125,-2.4435 2.0363,-1.1054 1.0156,-1.7155 4.0858,-1.1778 m 28.179,-31.29387 c 0,0 -5.5757,2.4847 -7.5462,3.1078 m 0.3147,-14.0393 c 0,0 -3.1354,8.8573 -3.7323,8.6021 M 56.453,26.99567 c 0,0 0.45341,7.5446 -0.1264,9.9754 m -8.1457,-9.0376 c 0,0 4.1511,6.8689 4.3749,9.6341 m -12.2416,-4.7554 c 0,0 7.6394,4.4626 8.9761,7.3297 m -13.584,1.84832 c 0,0 8.7533,0.0266 11.866,2.1808 m -11.88,9.7716 c 0,0 8.1942,-4.5413 12.291,-4.0722 m -5.44107,15.3125 c 0,0 5.6634,-9.5983 9.1425,-10.883 m 5.5015,23.0948 c 0,0 -0.80055,-6.5765 -0.68419,-10.882 0.11635,-4.3052 0.56365,-9.2113 0.86361,-10.394 m 19.8292,17.5148 c 0,0 -3.0072,-1.7676 -4.8689,-4.6766 -1.8617,-2.9089 -8.0153,-13.805 -7.7824,-13.932 m 25.0184,6.355 c 0,0 -5.8332,-0.3356 -7.055,-1.1501 -1.2218,-0.81451 -10.239,-7.7378 -10.239,-7.7378 0,0 -1.84,-1.3698 -2.8108,-2.6339 M 93.48565,31.5765 c 0,0 -6.8463,3.9269 -10.046,4.9159 -3.1998,0.98904 -11.212,1.8334 -13.402,1.4403 M 86.08485,16.609 c 0,0 -7.009,6.7927 -9.1034,8.2472 -2.0944,1.4545 -7.5332,6.1941 -10.574,6.4424 m 3.3696,-27.5275 c 0,0 0.92128,3.3992 -0.2423,5.9008 -1.1636,2.5017 -8.0013,17.205 -9.6731,17.998 M 49.28385,0.5314 c 0,0 3.4956,0.35462 4.1938,4.8926 0.69814,4.538 2.0011,21.398 0.69851,21.444 M 29.23726,5.3392 c 0,0 4.925,-0.9622 6.903,3.2267 1.9781,4.1889 10.537,19.792 8.9278,20.752 M 12.91696,17.218 c 0,0 5.6533,-2.2528 10.657,1.8197 5.0034,4.0725 17.683,12.168 15.982,14.581 m -38.387,11.2927 c 0,0 4.371,-6.2085 9.1417,-5.743 4.7707,0.46543 25.075,2.5973 24.945,5.844 M 1.72086,65.2276 c 0,0 1.1435,-8.8387 8.1249,-10.002 6.9814,-1.1636 24.797,-5.7103 25.637,-2.466 M 8.6774163,80.855675 c 0,0 -13.9596563,-15.946375 -5.4029563,-45.566375 8.5568,-29.62 36.531,-34.227 45.252,-34.721 8.7214,-0.49366 25.671,1.1519 35.379,13.164 9.7087,12.012 13.329,26.164 10.202,37.683 -3.4078,12.555 -14.974,23.367 -24.354,25.341 -9.3796,1.9747 -19.911,0.82277 -27.316,-5.4303 l 0.16455,-6.0885 c 0,0 -6.0885,-5.7594 -7.0758,-12.177 -0.98733,-6.4176 -0.16456,-12.671 2.4683,-17.278 2.6329,-4.6075 9.215,-8.5568 15.139,-8.8859 5.924,-0.32911 13.307,2.1095 15.797,8.0632 2.5465,6.0885 2.8356,10.337 0.65822,14.645 -2.0381,4.0327 -5.5949,7.0758 -11.519,6.5822 -5.924,-0.49366 -9.0505,-3.1265 -10.367,-7.0758 -1.3164,-3.9493 0.82278,-10.202 4.7721,-11.519 3.9493,-1.3164 8.3334,-0.63582 9.7879,2.8549 1.317,3.1608 1.3963,5.4106 -1.7454,7.796 -2.0566,1.5615 -5.4688,1.9781 -7.156,-0.93086 -1.6872,-2.9089 2.0363,-5.527 3.6653,-4.3634 1.629,1.1636 1.7454,2.1526 1.9199,2.6762"
+     style="fill:#eddbd0;stroke:#000000;stroke-width:1px;fill-opacity:1"
+     id="path3133"
+     sodipodi:nodetypes="cccccccccccccccccccsccscssscssccccccccccccccccccscccccscccsccsccscccccccccccccccccsccccccscscccccssssc" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2013-01-27T07:14:26</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/174552/ammonite-by-gosc-174552</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Gosc</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Ammonit</rdf:li>
+            <rdf:li>Ammonshorn</rdf:li>
+            <rdf:li>Fossil</rdf:li>
+            <rdf:li>Paläontologie</rdf:li>
+            <rdf:li>ammonite</rdf:li>
+            <rdf:li>animal</rdf:li>
+            <rdf:li>biology</rdf:li>
+            <rdf:li>black and white</rdf:li>
+            <rdf:li>cephalopoda</rdf:li>
+            <rdf:li>ceratite</rdf:li>
+            <rdf:li>contour</rdf:li>
+            <rdf:li>evolution</rdf:li>
+            <rdf:li>extinct</rdf:li>
+            <rdf:li>fossil</rdf:li>
+            <rdf:li>geology</rdf:li>
+            <rdf:li>line art</rdf:li>
+            <rdf:li>outline</rdf:li>
+            <rdf:li>palaeontology</rdf:li>
+            <rdf:li>paleontology</rdf:li>
+            <rdf:li>shell</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10813)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10814)
@@ -1441,5 +1441,5 @@
 }
 node[man_made=surveillance] {
-    icon-image: "presets/service/surveillance.png";
+    icon-image: "presets/service/surveillance.svg";
     set icon_z17;
 }
@@ -2486,5 +2486,5 @@
 }
 node[amenity=waste_disposal] {
-    icon-image: "presets/service/recycling/waste_disposal.png";
+    icon-image: "presets/service/recycling/waste_disposal.svg";
     set icon_z17;
 }
@@ -3124,6 +3124,5 @@
 }
 node[geological=palaeontological_site] {
-    icon-image: "presets/sightseeing/palaeontological_site.png";
-    icon-width: 16;
+    icon-image: "presets/sightseeing/palaeontological_site.svg";
     set icon_z17;
 }