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;
 }