Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7469)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7470)
@@ -3292,7 +3292,7 @@
 node[natural=saddle] {
     icon-image: "presets/saddle.svg";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
 }
 area[natural=peak] {
@@ -3301,13 +3301,13 @@
 node[natural=peak] {
     icon-image: "presets/peak.svg";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
 }
 node[natural=peak][tourism=viewpoint] {
     icon-image: "sightseeing/peak_viewpoint.svg";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
 }
 area[natural=glacier] {
@@ -3316,7 +3316,7 @@
 node[natural=glacier] {
     icon-image: "misc/landmark/glacier_small.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
 }
 area[natural=volcano] {
@@ -3325,7 +3325,7 @@
 node[natural=volcano] {
     icon-image: "misc/landmark/volcano_small.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
 }
 area[natural=cliff]:closed {
@@ -3973,7 +3973,7 @@
 node[mountain_pass?] {
     icon-image: "misc/landmark/mountain_pass.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
 }
 
@@ -4133,7 +4133,7 @@
 node["openGeoDB:location"=locality] {
     icon-image: "place/settlement/town.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4166,7 +4166,7 @@
 node[place=county] {
     icon-image: "place/settlement/capital.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4177,7 +4177,7 @@
 node[place=city] {
     icon-image: "place/settlement/city.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4194,7 +4194,7 @@
 node[place=suburb] {
     icon-image: "place/settlement/town.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4205,7 +4205,7 @@
 node[place=locality] {
     icon-image: "place/locality.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4216,7 +4216,7 @@
 node[place=island] {
     icon-image: "place/island.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4227,7 +4227,7 @@
 node[place=islet] {
     icon-image: "place/islet.png";
-    set icon_z11;
-    text: auto;
-    set text_z11;
+    set icon_z0;
+    text: auto;
+    set text_z0;
     font-size: 10;
     font-weight: bold;
@@ -4268,10 +4268,10 @@
 /*
 Summary of different zoom levels:
-  |z11-   place=* icons and text is shown
-  |z-15   untagged way nodes are hidden completely
-  |z16-   fixme=* and note=* symbols
-  |z17-   normal POI icons (without text),
-          street name along highway=* ways
-  |z18-   text for normal POI icons is shown
+  (any zoom)    place=* and a few natural icons with their text is shown
+  |z-15         untagged way nodes are hidden completely
+  |z16-         fixme=* and note=* symbols
+  |z17-         normal POI icons (without text),
+                street name along highway=* ways
+  |z18-         text for normal POI icons is shown
   
  * text size and node size is adapted according to zoom level (see style source below)
@@ -4320,15 +4320,9 @@
 node[!setting("shrink_nodes")]:connection       { symbol-size: 6; }
 
-node|z-10[setting("hide_icons")] {
-    icon-image: none;
-}
-node|z-16[setting("hide_icons")].icon_z17!.icon_z11,
+node|z-16[setting("hide_icons")].icon_z17!.icon_z0,
 relation|z-16[type=restriction][setting("hide_icons")] {
     icon-image: none;
 }
-node|z-10[setting("hide_icons")] {
-    text: none;
-}
-node|z-17[setting("hide_icons")]!.text_z11 {
+node|z-17[setting("hide_icons")]!.text_z0 {
     text: none;
 }