Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7975)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7976)
@@ -4311,4 +4311,5 @@
     text-halo-color: white;
     text-halo-radius: 1;
+    z-index: 2.6;
 }
 node[place=city] {
@@ -4322,12 +4323,7 @@
     text-halo-color: white;
     text-halo-radius: 1;
-}
-node[place=town],
-node[place=village],
-node[place=hamlet],
-node[place=farm],
-node[place=isolated_dwelling],
-node[place=neighbourhood],
-node[place=suburb] {
+    z-index: 2.5;
+}
+node[place=town] {
     icon-image: "place/settlement/town.png";
     set icon_z0;
@@ -4339,4 +4335,44 @@
     text-halo-color: white;
     text-halo-radius: 1;
+    z-index: 2.4;
+}
+node[place=suburb] {
+    icon-image: "place/settlement/suburb.png";
+    set icon_z0;
+    text: auto;
+    set text_z0;
+    font-size: 10;
+    font-weight: bold;
+    text-color:black;
+    text-halo-color: white;
+    text-halo-radius: 1;
+    z-index: 2.3;
+}
+node[place=village] {
+    icon-image: "place/settlement/village.png";
+    set icon_z0;
+    text: auto;
+    set text_z0;
+    font-size: 10;
+    font-weight: bold;
+    text-color:black;
+    text-halo-color: white;
+    text-halo-radius: 1;
+    z-index: 2.2;
+}
+node[place=hamlet],
+node[place=farm],
+node[place=isolated_dwelling],
+node[place=neighbourhood] {
+    icon-image: "place/settlement/hamlet.png";
+    set icon_z0;
+    text: auto;
+    set text_z0;
+    font-size: 10;
+    font-weight: bold;
+    text-color:black;
+    text-halo-color: white;
+    text-halo-radius: 1;
+    z-index: 2.1;
 }
 node[place=locality] {