Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7734)
+++ /trunk/data/defaultpresets.xml	(revision 7735)
@@ -1765,5 +1765,5 @@
         </item> <!-- Covered Reservoir -->
         <separator/>
-        <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Water" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
@@ -1837,5 +1837,5 @@
             <text key="name" text="Name" />
         </item> <!-- Mud -->
-        <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
@@ -7003,5 +7003,5 @@
             </optional>
         </item> <!-- Tree Row -->
-        <item name="Wood" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
@@ -7029,5 +7029,5 @@
             <reference ref="leaf" />
         </item> <!-- Forest -->
-        <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
+        <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
@@ -7056,5 +7056,5 @@
         </item> <!-- Nature Reserve -->
         <separator/>
-        <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Scree" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
@@ -7068,5 +7068,5 @@
             <text key="name" text="Name" />
         </item> <!-- Scree -->
-        <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Fell" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell"
@@ -7079,5 +7079,5 @@
             <text key="name" text="Name" />
         </item> <!-- Fell -->
-        <item name="Scrub" icon="presets/scrub.svg" type="node,closedway,relation" preset_name_label="true">
+        <item name="Scrub" icon="presets/scrub.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
@@ -7095,5 +7095,5 @@
             </optional>
         </item> <!-- Scrub -->
-        <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Heath" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"
Index: /trunk/data/validator/geometry.mapcss
===================================================================
--- /trunk/data/validator/geometry.mapcss	(revision 7734)
+++ /trunk/data/validator/geometry.mapcss	(revision 7735)
@@ -1,9 +1,10 @@
-/* {0} on a node */
+/* {0} on a node, should be a way */
 node[oneway],
 node[bridge?],
-node[landuse],
 node[sidewalk],
-node[source:outline] {
-  throwWarning: tr("{0} on a node", "{0.key}");
+node[natural=coastline],
+node[natural=ridge],
+node[natural=tree_row] {
+  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
   assertMatch: "node oneway=-1";
   assertNoMatch: "way oneway=-1";
@@ -12,6 +13,22 @@
 }
 
-node[natural=wood] {
-  throwOther: tr("{0} on a node. Should be drawn as an area", "{0.tag}");
+/* {0} on a node, should be an area; see ticket #10679 */
+node[landuse],
+node[natural=scree],
+node[natural=scrub],
+node[natural=fell],
+node[natural=heath],
+node[natural=wood],
+node[natural=grassland],
+node[natural=wetland],
+node[natural=water],
+node[natural=mud],
+node[natural=beach],
+node[natural=sand],
+node[natural=wood],
+node[natural=bare_rock],
+node[waterway=riverbank],
+node[source:outline] {
+  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
 }
 
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7734)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7735)
@@ -3754,35 +3754,19 @@
     text: auto;
 }
+way[natural=ridge] {
+    width: 1;
+    color: natural#002f00;
+}
 area[natural=scree] {
     fill-color: natural#002f00;
 }
-node[natural=scree] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=scrub] {
     fill-color: scrub#007000;
 }
-node[natural=scrub] {
-    icon-image: "presets/scrub.svg";
-    set icon_z17;
-    text: auto;
-}
 area[natural=fell] {
     fill-color: natural#002f00;
 }
-node[natural=fell] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=heath] {
     fill-color: heath#ffffc0;
-}
-node[natural=heath] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
 }
 way[natural=tree_row] {
@@ -3790,40 +3774,15 @@
     color: woodarea#008000;
 }
-node[natural=tree_row] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=wood] {
     fill-color: woodarea#008000;
 }
-node[natural=wood] {
-    icon-image: "misc/landmark/trees.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=grassland] {
     fill-color: green#b1e0c2;
 }
-node[natural=grassland] {
-    icon-image: "misc/deprecated.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=wetland] {
     fill-color: marsh#4f4ff3;
 }
-node[natural=wetland] {
-    icon-image: "misc/no_icon.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=water] {
     fill-color: water#0000ff;
-}
-node[natural=water] {
-    icon-image: "nautical/water.png";
-    set icon_z17;
-    text: auto;
 }
 way[natural=coastline] {
@@ -3831,29 +3790,20 @@
     color: water#0000ff;
 }
-node[natural=coastline] {
-    icon-image: "misc/coastline.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=mud] {
     fill-color: mud#cba762;
 }
-node[natural=mud] {
-    icon-image: "misc/mud.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=beach] {
     fill-color: beach#f8dba2;
 }
-node[natural=beach] {
-    icon-image: "misc/beach.png";
-    set icon_z17;
-    text: auto;
-}
 area[natural=sand] {
     fill-color: sand#f8dba2;
 }
-node[natural=sand] {
+area[natural=bare_rock] {
+    fill-color: bare_rock#f8f8c7;
+}
+area[natural=stone] {
+    fill-color: stone#f8f8c7;
+}
+node[natural=stone] {
     icon-image: "misc/no_icon.png";
     set icon_z17;
@@ -3861,5 +3811,4 @@
 }
 area[natural=bay],
-area[natural=land],
 area[natural=cave_entrance] {
     fill-color: natural#002f00;
@@ -3867,9 +3816,4 @@
 node[natural=bay] {
     icon-image: "misc/bay.png";
-    set icon_z17;
-    text: auto;
-}
-node[natural=land] {
-    icon-image: "misc/no_icon.png";
     set icon_z17;
     text: auto;
@@ -3902,5 +3846,24 @@
     text: auto;
 }
-
+node[natural=scree],
+node[natural=scrub],
+node[natural=fell],
+node[natural=heath],
+node[natural=tree_row],
+node[natural=wood],
+node[natural=grassland],
+node[natural=wetland],
+node[natural=water],
+node[natural=coastline],
+node[natural=mud],
+node[natural=beach],
+node[natural=sand],
+node[natural=land],
+node[natural=bare_rock],
+node[natural=ridge] {
+    icon-image: "misc/deprecated.png";
+    set icon_z17;
+    text: auto;
+}
 /*****************/
 /* waterway tags */