Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7975)
+++ trunk/data/defaultpresets.xml	(revision 7976)
@@ -6824,5 +6824,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- City -->
-        <item name="Town" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Town" icon="styles/standard/place/settlement/town.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
@@ -6837,5 +6837,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <item name="Suburb" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
@@ -6849,5 +6849,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Suburb -->
-        <item name="Village" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Village" icon="styles/standard/place/settlement/village.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=village"
@@ -6864,5 +6864,18 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <item name="Hamlet" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Neighbourhood" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
+            <space />
+            <key key="place" value="neighbourhood" />
+            <reference ref="name_wikipedia" />
+            <text key="population" text="Population" />
+            <text key="website" text="Website" />
+        </item> <!-- Neighbourhood -->
+        <item name="Hamlet" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=hamlet"
@@ -6877,5 +6890,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Farm" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Farm" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=farm"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=farm"
@@ -6888,5 +6901,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Farm -->
-        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
@@ -6900,17 +6913,4 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Isolated Dwelling -->
-        <item name="Neighbourhood" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
-            <space />
-            <key key="place" value="neighbourhood" />
-            <reference ref="name_wikipedia" />
-            <text key="population" text="Population" />
-            <text key="website" text="Website" />
-        </item> <!-- Neighbourhood -->
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
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] {