Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7979)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7984)
@@ -4310,8 +4310,44 @@
     text-halo-color: white;
     text-halo-radius: 1;
-    z-index: 2.6;
+    z-index: 2.9;
 }
 node[place=city] {
     icon-image: "place/settlement/city.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.8;
+}
+node[place=town] {
+    icon-image: "place/settlement/town.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.7;
+}
+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.6;
+}
+node[place=village] {
+    icon-image: "place/settlement/village.png";
     set icon_z0;
     text: auto;
@@ -4324,6 +4360,6 @@
     z-index: 2.5;
 }
-node[place=town] {
-    icon-image: "place/settlement/town.png";
+node[place=neighbourhood] {
+    icon-image: "place/settlement/neighbourhood.png";
     set icon_z0;
     text: auto;
@@ -4336,6 +4372,6 @@
     z-index: 2.4;
 }
-node[place=suburb] {
-    icon-image: "place/settlement/suburb.png";
+node[place=hamlet] {
+    icon-image: "place/settlement/hamlet.png";
     set icon_z0;
     text: auto;
@@ -4348,6 +4384,6 @@
     z-index: 2.3;
 }
-node[place=village] {
-    icon-image: "place/settlement/village.png";
+node[place=isolated_dwelling] {
+    icon-image: "place/settlement/isolated_dwelling.png";
     set icon_z0;
     text: auto;
@@ -4360,9 +4396,6 @@
     z-index: 2.2;
 }
-node[place=hamlet],
-node[place=farm],
-node[place=isolated_dwelling],
-node[place=neighbourhood] {
-    icon-image: "place/settlement/hamlet.png";
+node[place=farm] {
+    icon-image: "place/settlement/farm.png";
     set icon_z0;
     text: auto;