Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 819)
+++ /trunk/presets/presets.xml	(revision 820)
@@ -765,5 +765,5 @@
 	</item>
 
-	<item name="Waypoints/Bus Stop" icon="presets/waypoints.png">
+	<item name="Waypoints/Bus Stop" icon="presets/bus.png">
 		<label text="Edit Bus Stop" />
 		<label text=" " />
@@ -774,4 +774,14 @@
 		<text key="name" text="Name" default="" delete_if_empty="true" />
 	</item>
+
+	<item name="Waypoints/Bus Station" icon="presets/bus.png">
+		<label text="Edit a Bus Station" />
+		<key key="amenity" value="bus_station" />
+		<label text=" " />
+		<label text="Optional Attributes:" />
+		<label text=" " />
+		<text key="name" text="Name" default="" delete_if_empty="true" />
+	</item>
+
 
 	<item name="Waypoints/Stop" icon="presets/Stop.png">
@@ -1626,10 +1636,4 @@
 	</item>
 
-	<item name="Amenities/Bus Station" icon="presets/bus.png">
-		<label text="Edit a Bus Station" />
-		<key key="amenity" value="bus_station" />
-		<text key="name" text="Name" default="" delete_if_empty="true" />
-	</item>
-	
 	<item name="Amenities/Post Box" icon="presets/letter.png">
 		<key key="amenity" value="post_box" />