Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7940)
+++ trunk/data/defaultpresets.xml	(revision 7942)
@@ -7025,6 +7025,6 @@
         </item> <!-- Ridge -->
     </group> <!-- Geography -->
-    <group name="Nature" icon="presets/tree.png">
-        <item name="Tree" icon="presets/tree.png" type="node" preset_name_label="true">
+    <group name="Nature" icon="styles/standard/misc/landmark/trees.png">
+        <item name="Tree" icon="styles/standard/misc/landmark/trees.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree"
@@ -7050,5 +7050,5 @@
             </optional>
         </item> <!-- Tree -->
-        <item name="Tree Row" icon="presets/tree.png" type="way" preset_name_label="true">
+        <item name="Tree Row" icon="styles/standard/misc/landmark/tree_row.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
@@ -7068,5 +7068,5 @@
             </optional>
         </item> <!-- Tree Row -->
-        <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
+        <item name="Wood" icon="styles/standard/misc/landmark/forest.svg" 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"
@@ -7081,5 +7081,5 @@
             <reference ref="leaf" />
         </item> <!-- Wood -->
-        <item name="Forest" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
+        <item name="Forest" icon="styles/standard/misc/landmark/forest.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest"
@@ -7174,5 +7174,5 @@
             <text key="name" text="Name" />
         </item> <!-- Heath -->
-        <item name="Sand" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
+        <item name="Sand" icon="styles/standard/misc/sand.svg" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 7940)
+++ trunk/data/validator/geometry.mapcss	(revision 7942)
@@ -24,5 +24,5 @@
 node[natural=ridge],
 node[natural=tree_row] {
-  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
+  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");
   assertMatch: "node oneway=-1";
   assertNoMatch: "way oneway=-1";
@@ -55,4 +55,12 @@
 node[restriction] {
   throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}"); 
+}
+
+/* {0} on a way, should be a node */
+way[natural=peak],
+way[natural=saddle],
+way[natural=volcano],
+way[natural=tree] {
+  throwWarning: tr("{0} on a way. Should be used on a node.", "{0.tag}"); 
 }