Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 900)
+++ /trunk/presets/presets.xml	(revision 901)
@@ -1116,25 +1116,25 @@
 		</item>
 
+		<item name="Fast Food" icon="presets/fastfood.png">
+			<label text="Edit Fast Food Restaurant" />
+			<key key="amenity" value="fast_food" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Cafe" icon="presets/cafe.png">
+			<label text="Edit Cafe" />
+			<key key="amenity" value="cafe" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Pub" icon="presets/empty.png">
+			<label text="Edit Pub" />
+			<key key="amenity" value="pub" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Biergarten" icon="presets/biergarten.png">
 			<label text="Edit Biergarten" />
 			<key key="amenity" value="biergarten" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Fast Food" icon="presets/fastfood.png">
-			<label text="Edit Fast Food Restaurant" />
-			<key key="amenity" value="fast_food" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Cafe" icon="presets/cafe.png">
-			<label text="Edit Cafe" />
-			<key key="amenity" value="cafe" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Pub" icon="presets/empty.png">
-			<label text="Edit Pub" />
-			<key key="amenity" value="pub" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
@@ -1217,5 +1217,5 @@
 		</item>
 
-		<item name="Ruins" icon="presets/State_Tourist.png">
+		<item name="Ruins" icon="presets/ruins.png">
 			<label text="Edit Ruins" />
 			<key key="historic" value="ruins" />
@@ -1877,50 +1877,50 @@
 		</item>
 
+		<item name="City" icon="presets/places.png">
+			<label text="Edit City" />
+			<label text=" " />
+			<key key="place" value="city" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Town" icon="presets/places.png">
+			<label text="Edit Town" />
+			<label text=" " />
+			<key key="place" value="town" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Suburb" icon="presets/places.png">
+			<label text="Edit Suburb" />
+			<label text=" " />
+			<key key="place" value="suburb" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Village" icon="presets/places.png">
+			<label text="Edit Village" />
+			<label text=" " />
+			<key key="place" value="village" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Hamlet" icon="presets/places.png">
+			<label text="Edit Hamlet" />
+			<label text=" " />
+			<key key="place" value="hamlet" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Locality" icon="presets/locality.png">
+			<label text="Edit Locality" />
+			<label text=" " />
+			<key key="place" value="locality" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Island" icon="presets/island.png">
 			<label text="Edit Island" />
 			<label text=" " />
 			<key key="place" value="island" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="City" icon="presets/places.png">
-			<label text="Edit City" />
-			<label text=" " />
-			<key key="place" value="city" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Town" icon="presets/places.png">
-			<label text="Edit Town" />
-			<label text=" " />
-			<key key="place" value="town" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Suburb" icon="presets/places.png">
-			<label text="Edit Suburb" />
-			<label text=" " />
-			<key key="place" value="suburb" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Village" icon="presets/places.png">
-			<label text="Edit Village" />
-			<label text=" " />
-			<key key="place" value="village" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Hamlet" icon="presets/places.png">
-			<label text="Edit Hamlet" />
-			<label text=" " />
-			<key key="place" value="hamlet" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Locality" icon="presets/locality.png">
-			<label text="Edit Locality" />
-			<label text=" " />
-			<key key="place" value="locality" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>