Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1126)
+++ trunk/presets/presets.xml	(revision 1129)
@@ -700,15 +700,4 @@
 		</item>
 
-		<item name="Toll Booth" icon="presets/toll_station.png">
-			<label text="Edit Toll Booth" />
-			<label text=" " />
-			<key key="highway" value="toll_booth" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<text key="operator" text="Operator" default="" delete_if_empty="true" />
-		</item>
-
 		<separator/>
 
@@ -725,8 +714,4 @@
 		</item>
 
-		<item name="Bollard" icon="presets/bollard.png">
-			<key key="barrier" value="bollard" />
-		</item>
-
 		<item name="Mini Roundabout" icon="presets/roundabout_left.png">
 			<key key="highway" value="mini_roundabout" />
@@ -770,16 +755,4 @@
 		</item>
 
-		<item name="Cattle Grid" icon="presets/cattle_grid.png">
-			<key key="highway" value="cattle_grid" />
-		</item>
-
-		<item name="Gate" icon="presets/gate.png">
-			<key key="highway" value="gate" />
-		</item>
-
-		<item name="Stile" icon="presets/stile.png">
-			<key key="highway" value="stile" />
-		</item>
-
 		<item name="Mountain Pass" icon="presets/mountain_pass.png">
 			<label text="Edit Mountain Pass" />
@@ -796,7 +769,7 @@
 
 
-	<group name="Barriers" icon="presets/bollard.png">
-		
-		<item name="Stile" icon="presets/empty.png">
+	<group name="Barriers" icon="presets/barrier.png">
+		
+		<item name="Stile" icon="presets/stile.png">
 			<label text="Edit a Stile" />
 			<label text=" " />
@@ -831,5 +804,5 @@
 		</item> <!-- hampshire_gate -->
 		
-		<item name="Bollard" icon="presets/empty.png">
+		<item name="Bollard" icon="presets/bollard.png">
 			<label text="Edit a bollard" />
 			<label text=" " />
@@ -860,5 +833,5 @@
 		</item> <!-- bus_trap -->
 		
-		<item name="Cattle Grid" icon="presets/empty.png">
+		<item name="Cattle Grid" icon="presets/cattle_grid.png">
 			<label text="Edit a Cattle Grid" />
 			<label text=" " />
@@ -897,5 +870,5 @@
 		
 		
-		<item name="Gate" icon="presets/empty.png">
+		<item name="Gate" icon="presets/gate.png">
 			<label text="Edit a Gate" />
 			<label text=" " />
@@ -973,6 +946,13 @@
 		</item> <!-- retaining_wall -->
 		
-		<item name="Toll Booth" icon="presets/empty.png">
+		<item name="Toll Booth" icon="presets/toll_station.png">
+			<label text="Edit Toll Booth" />
+			<label text=" " />
 			<key key="barrier" value="toll_booth" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="operator" text="Operator" default="" delete_if_empty="true" />
 		</item> <!-- toll_booth -->