Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 953)
+++ trunk/presets/presets.xml	(revision 954)
@@ -723,4 +723,8 @@
 		</item>
 
+		<item name="Bollard" icon="styles/standard/vehicle/restrictions/bollard.png">
+			<key key="barrier" value="bollard" />
+		</item>
+
 		<item name="Mini Roundabout" icon="presets/roundabout_left.png">
 			<key key="highway" value="mini_roundabout" />
@@ -731,4 +735,17 @@
 		</item>
 
+		<item name="City Limit" icon="presets/citylimit.png">
+			<label text="Edit a city limit sign" />
+			<label text=" " />
+			<key key="traffic_sign" value="city_limit" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="alt_name" text="Second Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Speed Camera" icon="presets/speed_camera.png">
+			<key key="amenity" value="speed_camera" />
+		</item>
+		
 		<separator/>
 
@@ -747,5 +764,5 @@
 		</item>
 
-		<item name="Gate" icon="presets/waypoints.png">
+		<item name="Gate" icon="styles/standard/vehicle/gate.png">
 			<key key="highway" value="gate" />
 		</item>
@@ -755,8 +772,4 @@
 		</item>
 
-		<item name="Bollard" icon="styles/standard/vehicle/restrictions/bollard.png">
-			<key key="barrier" value="bollard" />
-		</item>
-
 		<item name="Mountain Pass" icon="presets/mountain_pass.png">
 			<label text="Edit Mountain Pass" />
@@ -767,17 +780,4 @@
 			<label text=" " />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="City Limit" icon="presets/citylimit.png">
-			<label text="Edit a city limit sign" />
-			<label text=" " />
-			<key key="traffic_sign" value="city_limit" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<text key="alt_name" text="Second Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Speed Camera" icon="presets/speed_camera.png">
-			<key key="amenity" value="speed_camera" />
 		</item>
 	</group> <!-- Waypoints -->
@@ -964,4 +964,11 @@
 			<label text=" " />
 			<key key="waterway" value="weir" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Waterfall" icon="styles/standard/nautical/waterfall.png">
+			<label text="Edit a Waterfall" />
+			<label text=" " />
+			<key key="waterway" value="waterfall" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
@@ -1211,4 +1218,10 @@
 
 	<group name="Tourism" icon="presets/State_Public.png">
+		<item name="Attraction" icon="presets/sightseeing.png">
+			<label text="Edit Attraction" />
+			<key key="tourism" value="attraction" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
+
 		<item name="Information point" icon="presets/information.png">
 			<label text="Edit Tourist Information" />
@@ -1232,10 +1245,4 @@
 			<label text="Edit Viewpoint" />
 			<key key="tourism" value="viewpoint" />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Attraction" icon="presets/sightseeing.png">
-			<label text="Edit Attraction" />
-			<key key="tourism" value="attraction" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>