Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 8002)
+++ /trunk/data/defaultpresets.xml	(revision 8003)
@@ -7231,5 +7231,15 @@
             <text key="name" text="Name" />
         </item> <!-- Bare Rock -->
-        <item name="Stone" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
+        <item name="Rock" icon="styles/standard/misc/rock.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=rock" />
+            <label text="A notable rock or group of rocks, with at least one of them firmly attached to the underlying bedrock." />
+            <space />
+            <key key="natural" value="rock" />
+            <reference ref="name_wikipedia" />
+            <optional>
+                <check key="tourism" text="Tourism attraction" value_on="attraction" disable_off="true" />
+            </optional>
+        </item> <!-- Rock -->
+        <item name="Stone" icon="styles/standard/misc/stone.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=stone"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=stone"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 8002)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 8003)
@@ -3909,9 +3909,17 @@
     fill-color: bare_rock#f8f8c7;
 }
+area[natural=rock] {
+    fill-color: stone#f8f8c7;
+}
+node[natural=rock] {
+    icon-image: "misc/rock.svg";
+    set icon_z17;
+    text: auto;
+}
 area[natural=stone] {
     fill-color: stone#f8f8c7;
 }
 node[natural=stone] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "misc/stone.svg";
     set icon_z17;
     text: auto;