Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7979)
+++ trunk/data/defaultpresets.xml	(revision 7984)
@@ -6783,5 +6783,5 @@
         </item> <!-- Protected Area -->
     </group> <!-- Boundaries -->
-    <group name="Places" icon="styles/standard/place/settlement/city.png">
+    <group name="Places" icon="styles/standard/place/settlement/isolated_dwelling.png">
         <item name="Continent" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=continent"
@@ -6849,16 +6849,4 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <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"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
-            <space />
-            <key key="place" value="suburb" />
-            <reference ref="name_wikipedia" />
-            <reference ref="population_postcode_website" />
-        </item> <!-- Suburb -->
         <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"
@@ -6876,17 +6864,4 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <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"
@@ -6902,5 +6877,43 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Farm" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
+        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/isolated_dwelling.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"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=isolated_dwelling"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=isolated_dwelling"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=isolated_dwelling" />
+            <space />
+            <key key="place" value="isolated_dwelling" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
+        </item> <!-- Isolated Dwelling -->
+        <separator/>
+        <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"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
+            <space />
+            <key key="place" value="suburb" />
+            <reference ref="name_wikipedia" />
+            <reference ref="population_postcode_website" />
+        </item> <!-- Suburb -->
+        <item name="Neighbourhood" icon="styles/standard/place/settlement/neighbourhood.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="Farm" icon="styles/standard/place/settlement/farm.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"
@@ -6913,16 +6926,4 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Farm -->
-        <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"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=isolated_dwelling"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=isolated_dwelling"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=isolated_dwelling" />
-            <space />
-            <key key="place" value="isolated_dwelling" />
-            <reference ref="name_wikipedia" />
-            <reference ref="population_postcode_website" />
-        </item> <!-- Isolated Dwelling -->
         <separator/>
         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">