Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10706)
+++ /trunk/data/defaultpresets.xml	(revision 10707)
@@ -5350,5 +5350,5 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
-        <item name="Shelter" icon="presets/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
+        <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"
@@ -5368,6 +5368,6 @@
                 <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic_brown.png" />
                 <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport_brown.png" />
-                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.png" />
-                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.png" />
+                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.svg" />
+                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.svg" />
             </combo>
         </item> <!-- Shelter -->
@@ -6003,5 +6003,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Motorsport -->
-        <item name="Kart Racing" icon="presets/sports/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Kart Racing" icon="presets/sport/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
@@ -6375,5 +6375,5 @@
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="presets/landmark/watermill.png" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
@@ -7356,5 +7356,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
-        <item name="Farm Stand" icon="presets/shop/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Farm Stand" icon="presets/shop/groceries/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
@@ -9016,5 +9016,5 @@
             <text key="name" text="Name" />
             <combo key="reef" text="Type" values="coral,oyster,rock,sand" />
-        </item> <!-- Islet -->
+        </item> <!-- Reef -->
     </group> <!-- Geography -->
     <group name="Nature" icon="presets/landmark/trees.svg">
Index: /trunk/images/presets/landmark/reef.svg
===================================================================
--- /trunk/images/presets/landmark/reef.svg	(revision 10707)
+++ /trunk/images/presets/landmark/reef.svg	(revision 10707)
@@ -0,0 +1,83 @@
+<?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"
+   id="Calque_1"
+   enable-background="new 0 0 307 229"
+   xml:space="preserve"
+   viewBox="0 0 297.0498 213.31735"
+   version="1.1"
+   y="0px"
+   x="0px"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="16.svg"
+   width="297.0498"
+   height="213.31735"><defs
+   id="defs19" /><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="namedview17"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="1.4574428"
+   inkscape:cx="3.9839805"
+   inkscape:cy="191.8494"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Calque_1" />
+<g
+   id="g3"
+   style="fill:#00ffff;stroke:#0893a1;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+   transform="translate(-3.4592507,-8.790634)">
+	<path
+   d="m 142.04,214.03 c 0,0 2.866,-59.186 -5.322,-75.972 -8.19,-16.79 -22.52,-38.49 -22.93,-45.86 -0.409,-7.37 -1.638,-28.25 0,-36.848 1.638,-8.598 6.961,-29.479 11.874,-16.787 4.913,12.692 -3.686,23.747 -3.275,25.794 0.409,2.047 -3.686,18.015 7.778,31.935 11.464,13.92 8.598,-9.417 8.598,-9.417 0,0 -5.987,-28.66 3.762,-30.707 9.75,-2.047 7.703,17.605 6.475,22.928 -1.229,5.323 2.535,26.203 1.063,27.841 -1.472,1.638 1.349,21.291 0.348,23.338 -1.001,2.047 1.865,32.345 5.96,20.062 4.094,-12.282 6.002,-17.605 11.598,-21.699 5.598,-4.095 13.785,-2.867 6.826,11.668 -6.961,14.535 -14.74,13.716 -17.605,35.825 -2.867,22.109 -0.41,44.218 -0.41,44.218 0,0 -12.7,2.09 -14.75,-6.33 z"
+   id="path5"
+   style="fill:#00ffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+   inkscape:connector-curvature="0" />
+	<path
+   d="m 112.75,218.42 c 0,0 2.457,-7.755 -11.464,-27.816 -13.92,-20.062 -27.021,-13.511 -29.888,-28.251 -2.866,-14.739 2.457,-16.377 6.142,-10.645 3.685,5.731 6.312,9.417 14.21,11.873 7.898,2.457 11.993,10.646 7.489,-8.188 C 94.735,136.56 92.688,134.675 86.957,128.043 81.225,121.41 52.564,102.986 29.228,100.939 5.887,98.899 3.431,91.53 5.477,87.435 c 2.047,-4.094 29.888,0 29.888,0 l 9.417,0.819 c 0,0 23.746,13.102 4.503,-15.558 C 30.043,44.036 24.311,35.438 31.271,35.029 c 6.961,-0.409 11.055,-1.638 20.063,12.692 9.007,14.33 19.652,42.171 19.652,42.171 0,0 3.275,10.235 6.142,8.598 2.865,-1.638 0.818,-27.841 1.228,-29.479 0.41,-1.638 -2.047,-28.692 1.229,-31.337 3.276,-2.645 18.424,-29.667 13.511,9.638 -4.913,39.305 -3.275,51.587 -3.275,51.587 0,0 11.055,16.787 15.149,0.819 4.094,-15.968 24.155,-26.203 24.155,-26.203 0,0 6.961,-2.457 9.827,-9.007 2.865,-6.551 16.377,1.228 8.598,10.235 -7.779,9.007 -34.802,25.384 -36.029,38.077 -1.229,12.692 -5.323,31.936 0.409,33.163 5.731,1.229 1.638,-4.913 11.873,-9.826 10.236,-4.913 18.834,-23.63 22.109,-13.861 3.275,9.768 -7.37,16.318 -7.37,16.318 0,0 -11.873,2.456 -15.968,14.33 -4.094,11.873 -4.503,13.92 -3.685,21.29 0.819,7.369 4.504,15.148 10.235,9.007 5.732,-6.141 13.512,-6.141 7.37,4.095 -6.142,10.236 -9.826,22.928 -9.826,27.432 0.01,4.51 -13.76,8.42 -13.91,3.67 z"
+   id="path7"
+   style="fill:#00ffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+   inkscape:connector-curvature="0" />
+	<path
+   d="m 207.26,215.85 c 0,0 -3.361,-7.407 8.074,-28.982 11.435,-21.575 25.223,-16.629 26.316,-31.604 1.092,-14.976 -4.389,-15.969 -7.365,-9.839 -2.977,6.129 -5.146,10.101 -12.697,13.479 -7.551,3.379 -10.641,11.996 -8.41,-7.239 2.232,-19.235 4.041,-21.35 8.943,-28.616 4.902,-7.268 31.168,-28.97 54.096,-33.778 22.928,-4.808 24.49,-12.418 21.971,-16.24 -2.519,-3.822 -29.676,3.555 -29.676,3.555 l -9.252,1.933 c 0,0 -22.02,15.833 -6.322,-14.912 15.698,-30.745 20.365,-39.964 13.406,-39.542 -6.959,0.422 -11.17,-0.312 -18.41,14.988 -7.238,15.3 -14.496,44.209 -14.496,44.209 0,0 -2.035,10.553 -5.076,9.268 -3.039,-1.285 -4.125,-27.546 -4.727,-29.124 -0.6,-1.577 -1.379,-28.732 -4.945,-30.969 -3.566,-2.237 -21.822,-27.265 -12.27,11.176 9.552,38.441 9.389,50.832 9.389,50.832 0,0 -8.98,17.982 -14.943,2.615 -5.965,-15.367 -27.103,-23.144 -27.103,-23.144 0,0 -7.203,-1.611 -10.828,-7.775 -3.625,-6.164 -16.114,3.167 -7.318,11.186 8.795,8.018 37.573,21.065 40.302,33.521 2.729,12.456 9.084,31.075 3.539,32.977 -5.547,1.901 -2.211,-4.683 -12.958,-8.344 -10.748,-3.661 -21.512,-21.223 -23.602,-11.134 -2.09,10.088 9.258,15.326 9.258,15.326 0,0 12.082,1.026 17.56,12.328 5.477,11.303 6.127,13.287 6.189,20.701 0.064,7.415 -2.67,15.577 -9.091,10.161 -6.422,-5.416 -14.146,-4.491 -6.83,4.941 7.314,9.433 12.483,21.597 13.019,26.068 0.536,4.471 14.67,6.7 14.26,1.96 z"
+   id="path9"
+   style="fill:#00ffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+   inkscape:connector-curvature="0" />
+	<path
+   d="m 128.92,218.84 c 0,0 3.275,-24.975 -6.96,-28.25 -10.235,-3.275 -37.667,-4.913 -36.029,-13.102 1.638,-8.189 12.282,0 15.148,0 2.866,0 13.921,0.818 18.015,0.818 4.095,0 10.646,-10.235 3.275,-24.155 -7.369,-13.921 -15.558,-18.016 -18.833,-27.432 -3.275,-9.417 4.094,-3.275 -5.732,-24.565 -9.843,-21.298 -17.213,-47.911 -6.568,-41.36 10.645,6.551 9.417,22.928 9.417,22.928 l 3.685,-1.228 c 0,0 5.342,-11.055 3.285,-15.149 -2.057,-4.094 -4.514,-19.652 -4.514,-19.652 0,0 2.866,-13.92 6.961,-6.551 4.094,7.37 2.865,17.605 3.685,21.29 0.818,3.685 2.456,18.015 0.818,20.881 -1.638,2.866 -6.122,6.96 -6.95,9.417 -0.828,2.457 -0.01,11.873 3.266,20.881 3.275,9.007 13.102,-9.417 14.33,-9.826 1.229,-0.41 8.188,-13.921 10.645,-20.881 2.457,-6.96 -2.456,-24.975 -2.456,-27.432 0,-2.457 1.229,-25.384 7.369,-11.055 6.142,14.33 3.275,26.203 3.275,27.432 0,1.228 -1.638,21.7 -1.638,21.7 0,0 -3.275,11.874 -9.416,19.243 -6.142,7.37 -14.33,4.095 -6.142,27.022 8.188,22.927 20.988,29.888 17.863,41.761 -3.124,11.874 3.427,11.874 -1.486,18.834 -4.913,6.96 -4.095,16.377 -5.322,18.424 -1.23,2.06 -9.01,0.01 -9.01,0.01 z"
+   id="path11"
+   style="fill:#00ffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+   inkscape:connector-curvature="0" />
+	<path
+   d="m 171.18,216.93 c 0,0 -2.504,-28.407 7.949,-32.632 10.452,-4.225 27.509,-22.591 26.116,-31.879 -1.391,-9.287 -5.695,-5.385 -8.592,-5.251 -2.898,0.134 -10.093,22.758 -14.231,22.949 -4.138,0.191 -10.43,-11.207 -2.531,-27.47 7.898,-16.265 16.31,-21.33 19.925,-32.251 3.615,-10.922 -4.033,-3.555 6.586,-28.361 10.621,-24.806 18.93,-55.584 7.957,-47.595 -10.973,7.989 -10.26,26.66 -10.26,26.66 l -3.684,-1.232 c 0,0 -5.045,-12.392 -2.832,-17.169 2.211,-4.778 5.197,-22.685 5.197,-22.685 0,0 -2.449,-15.785 -6.824,-7.166 -4.377,8.619 -3.467,20.267 -4.414,24.519 -0.945,4.252 -3.063,20.716 -1.5,23.917 1.563,3.201 5.963,7.673 6.721,10.443 0.76,2.771 -0.373,13.578 -3.975,24.031 -3.603,10.454 -12.94,-10.156 -14.169,-10.567 -1.229,-0.41 -7.828,-15.536 -10.086,-23.38 -2.258,-7.845 3.289,-28.675 3.369,-31.485 0.078,-2.809 -0.422,-28.971 -7.094,-12.296 -6.67,16.674 -4.156,30.118 -4.195,31.522 -0.041,1.405 0.953,24.738 0.953,24.738 0,0 2.928,13.425 8.898,21.565 5.97,8.14 14.354,4.012 5.336,30.614 -9.018,26.604 -22.181,35.162 -19.406,48.593 2.773,13.432 -3.846,13.739 0.895,21.468 4.742,7.729 3.609,18.537 4.785,20.82 1.15,2.29 9.08,-0.42 9.08,-0.42 z"
+   id="path13"
+   style="fill:#00ffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none"
+   inkscape:connector-curvature="0" />
+</g>
+<metadata
+   id="metadata15"><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/publicdomain/zero/1.0/" /><dc:publisher><cc:Agent
+           rdf:about="http://openclipart.org/"><dc:title>Openclipart</dc:title></cc:Agent></dc:publisher><dc:title></dc:title><dc:date>2012-09-11T16:16:42</dc:date><dc:description /><dc:source>https://openclipart.org/detail/172292/corals-by-presquesage-172292</dc:source><dc:creator><cc:Agent><dc:title>presquesage</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>corals</rdf:li><rdf:li>coraux</rdf:li></rdf:Bag></dc:subject></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></svg>
Index: /trunk/images/presets/misc/information/map.svg
===================================================================
--- /trunk/images/presets/misc/information/map.svg	(revision 10707)
+++ /trunk/images/presets/misc/information/map.svg	(revision 10707)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Creator: CorelDRAW -->
+
+<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"
+   xml:space="preserve"
+   width="16"
+   height="16"
+   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
+   viewBox="0 0 4.5155555 4.5155555"
+   version="1.0"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="map3.svg"
+   id="svg2"><metadata
+   id="metadata18"><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><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="namedview16"
+   showgrid="false"
+   units="px"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="3.3302222"
+   inkscape:cx="7.9999988"
+   inkscape:cy="7.6997182"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg2" />
+ <defs
+   id="defs4">
+  <style
+   type="text/css"
+   id="style6">
+   <![CDATA[
+    .str2 {stroke:#84C225;stroke-width:0.0762}
+    .str0 {stroke:#84C225;stroke-width:0.2}
+    .str1 {stroke:white;stroke-width:0.2}
+    .fil0 {fill:#84C225}
+    .fil1 {fill:white}
+    .fil2 {fill:#84C225;fill-rule:nonzero}
+   ]]>
+  </style>
+ </defs>
+ <g
+   id="Ebene_x0020_1"
+   transform="matrix(0.22354235,0,0,0.22354235,0.02235424,0.02235424)">
+  <metadata
+   id="CorelCorpID_0Corel-Layer" />
+  <path
+   class="fil0 str0"
+   d="M 2.6772,0 17.3228,0 C 18.8011,0 20,1.7983 20,4.0158 l 0,11.9684 c 0,2.2174 -1.1989,4.0157 -2.6772,4.0157 L 2.6772,20 C 1.1989,19.9999 1e-4,18.2016 1e-4,15.9841 L 0,4.0158 C 1e-4,1.7983 1.1989,0 2.6773,0 Z"
+   id="path10"
+   inkscape:connector-curvature="0"
+   style="fill:#84c225;stroke:#84c225;stroke-width:0.2" />
+  <circle
+   class="fil1 str1"
+   cx="10"
+   cy="10"
+   r="6"
+   id="circle12"
+   style="fill:#ffffff;stroke:#ffffff;stroke-width:0.2" />
+  <path
+   id="_1"
+   class="fil2 str2"
+   d="M 9.9989,7.3298 C 9.6687,7.3298 9.3978,7.2324 9.1882,7.0356 8.9766,6.8387 8.8707,6.5995 8.8707,6.3138 8.8707,6.0196 8.9766,5.7804 9.1882,5.5941 9.3978,5.4078 9.6687,5.3147 9.9989,5.3147 c 0.3366,0 0.6075,0.0931 0.817,0.2794 0.2075,0.1863 0.3133,0.4255 0.3133,0.7197 0,0.2984 -0.1058,0.5418 -0.3133,0.7323 -0.2095,0.1884 -0.4804,0.2837 -0.817,0.2837 z m 0.9673,7.3554 -1.9579,0 0,-6.35 1.9579,0 0,6.35 z"
+   inkscape:connector-curvature="0"
+   style="fill:#84c225;fill-rule:nonzero;stroke:#84c225;stroke-width:0.0762" />
+  <sodipodi:namedview
+   inkscape:window-height="749"
+   inkscape:window-width="1024"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="1"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="white"
+   id="base"
+   inkscape:zoom="1.05"
+   inkscape:cx="426.38288"
+   inkscape:cy="175.14"
+   inkscape:window-x="545"
+   inkscape:window-y="8"
+   inkscape:current-layer="g2015"
+   inkscape:showpageshadow="false"
+   showborder="true"
+   showgrid="true"
+   width="440px"
+   height="360px"><inkscape:grid
+     id="GridFromPre046Settings"
+     type="xygrid"
+     originx="0px"
+     originy="0px"
+     spacingx="1px"
+     spacingy="1px"
+     color="#3f3fff"
+     empcolor="#3f3fff"
+     opacity="0.15"
+     empopacity="0.38"
+     empspacing="20" /></sodipodi:namedview>
+ </g>
+</svg>
Index: unk/images/presets/misc/information/map3.svg
===================================================================
--- /trunk/images/presets/misc/information/map3.svg	(revision 10706)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Creator: CorelDRAW -->
-
-<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"
-   xml:space="preserve"
-   width="16"
-   height="16"
-   style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"
-   viewBox="0 0 4.5155555 4.5155555"
-   version="1.0"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="map3.svg"
-   id="svg2"><metadata
-   id="metadata18"><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><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="namedview16"
-   showgrid="false"
-   units="px"
-   fit-margin-top="0"
-   fit-margin-left="0"
-   fit-margin-right="0"
-   fit-margin-bottom="0"
-   inkscape:zoom="3.3302222"
-   inkscape:cx="7.9999988"
-   inkscape:cy="7.6997182"
-   inkscape:window-x="-8"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="svg2" />
- <defs
-   id="defs4">
-  <style
-   type="text/css"
-   id="style6">
-   <![CDATA[
-    .str2 {stroke:#84C225;stroke-width:0.0762}
-    .str0 {stroke:#84C225;stroke-width:0.2}
-    .str1 {stroke:white;stroke-width:0.2}
-    .fil0 {fill:#84C225}
-    .fil1 {fill:white}
-    .fil2 {fill:#84C225;fill-rule:nonzero}
-   ]]>
-  </style>
- </defs>
- <g
-   id="Ebene_x0020_1"
-   transform="matrix(0.22354235,0,0,0.22354235,0.02235424,0.02235424)">
-  <metadata
-   id="CorelCorpID_0Corel-Layer" />
-  <path
-   class="fil0 str0"
-   d="M 2.6772,0 17.3228,0 C 18.8011,0 20,1.7983 20,4.0158 l 0,11.9684 c 0,2.2174 -1.1989,4.0157 -2.6772,4.0157 L 2.6772,20 C 1.1989,19.9999 1e-4,18.2016 1e-4,15.9841 L 0,4.0158 C 1e-4,1.7983 1.1989,0 2.6773,0 Z"
-   id="path10"
-   inkscape:connector-curvature="0"
-   style="fill:#84c225;stroke:#84c225;stroke-width:0.2" />
-  <circle
-   class="fil1 str1"
-   cx="10"
-   cy="10"
-   r="6"
-   id="circle12"
-   style="fill:#ffffff;stroke:#ffffff;stroke-width:0.2" />
-  <path
-   id="_1"
-   class="fil2 str2"
-   d="M 9.9989,7.3298 C 9.6687,7.3298 9.3978,7.2324 9.1882,7.0356 8.9766,6.8387 8.8707,6.5995 8.8707,6.3138 8.8707,6.0196 8.9766,5.7804 9.1882,5.5941 9.3978,5.4078 9.6687,5.3147 9.9989,5.3147 c 0.3366,0 0.6075,0.0931 0.817,0.2794 0.2075,0.1863 0.3133,0.4255 0.3133,0.7197 0,0.2984 -0.1058,0.5418 -0.3133,0.7323 -0.2095,0.1884 -0.4804,0.2837 -0.817,0.2837 z m 0.9673,7.3554 -1.9579,0 0,-6.35 1.9579,0 0,6.35 z"
-   inkscape:connector-curvature="0"
-   style="fill:#84c225;fill-rule:nonzero;stroke:#84c225;stroke-width:0.0762" />
-  <sodipodi:namedview
-   inkscape:window-height="749"
-   inkscape:window-width="1024"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="1"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="white"
-   id="base"
-   inkscape:zoom="1.05"
-   inkscape:cx="426.38288"
-   inkscape:cy="175.14"
-   inkscape:window-x="545"
-   inkscape:window-y="8"
-   inkscape:current-layer="g2015"
-   inkscape:showpageshadow="false"
-   showborder="true"
-   showgrid="true"
-   width="440px"
-   height="360px"><inkscape:grid
-     id="GridFromPre046Settings"
-     type="xygrid"
-     originx="0px"
-     originy="0px"
-     spacingx="1px"
-     spacingy="1px"
-     color="#3f3fff"
-     empcolor="#3f3fff"
-     opacity="0.15"
-     empopacity="0.38"
-     empspacing="20" /></sodipodi:namedview>
- </g>
-</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10706)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10707)
@@ -443,4 +443,5 @@
 node[barrier=border_control] {
     icon-image: "presets/barrier/douane.png";
+    icon-width: 16;
     set icon_z17;
 }
@@ -1465,5 +1466,5 @@
 }
 node[man_made=watermill] {
-    icon-image: "presets/landmark/watermill.png";
+    icon-image: "presets/landmark/watermill.svg";
     set icon_z17;
 }
@@ -1943,6 +1944,4 @@
 node[shop=doityourself] {
     icon-image: "presets/shop/diy_store.svg";
-    icon-width: 16;
-    icon-height: 16;
     set icon_z17;
 }
@@ -2266,5 +2265,5 @@
 }
 node[shop=farm] {
-    icon-image: "presets/shop/apple.png";
+    icon-image: "presets/shop/groceries/apple.png";
     set icon_z17;
 }
@@ -2346,6 +2345,5 @@
 node[amenity=pub] {
     icon-image: "presets/food/pub.png";
-    icon-width: 15;
-    icon-height: 19;
+    icon-height: 16;
     set icon_z17;
 }
@@ -2353,5 +2351,4 @@
     icon-image: "presets/food/biergarten.png";
     icon-width: 16;
-    icon-height: 16;
     set icon_z17;
 }
@@ -2639,5 +2636,5 @@
 }
 node[amenity=grave_yard] {
-    icon-image: "presets/misc/landuse/graveyard.svg";
+    icon-image: "presets/landuse/graveyard.svg";
     set icon_z17;
 }
@@ -2838,5 +2835,5 @@
 }
 node[amenity=shelter] {
-    icon-image: "presets/accommodation/shelter.png";
+    icon-image: "presets/accommodation/shelter.svg";
     set icon_z17;
 }
@@ -3777,6 +3774,4 @@
 node[sport=rugby_union] {
     icon-image: "presets/sport/football.svg";
-    icon-width: 20;
-    icon-height: 20;
     set icon_z17;
 }
@@ -3798,6 +3793,4 @@
 node[sport=basketball] {
     icon-image: "presets/sport/basketball.svg";
-    icon-width: 16;
-    icon-height: 16;
     set icon_z17;
 }
@@ -4164,4 +4157,11 @@
 node[natural=bay] {
     icon-image: "presets/nautical/bay.svg";
+    set icon_z17;
+}
+area[natural=reef] {
+    fill-color: reef#80c9ff;
+}
+node[natural=reef] {
+    icon-image: "presets/misc/no_icon.svg";
     set icon_z17;
 }