Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 915)
+++ trunk/presets/presets.xml	(revision 916)
@@ -230,5 +230,5 @@
 		<separator/>
 
-		<item name="Road (Unknown Type)" icon="presets/way_unknown.png">
+		<item name="Road (Unknown Type)" icon="presets/way_unclassified.png">
 			<label text="Edit a Road of unknown type" />
 			<label text=" " />
@@ -293,4 +293,5 @@
 			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 		</item>
+
 		<item name="Bridge" icon="presets/bridge.png">
 			<label text="Edit a Bridge" />
@@ -308,6 +309,6 @@
 	</group> <!-- Streets -->
 
-	<group name="Ways" icon="presets/way_unknown.png">
-		<item name="Service" icon="presets/way_service.png">
+	<group name="Ways" icon="presets/way_unclassified.png">
+		<item name="Service" icon="presets/way_unclassified.png">
 			<label text="Edit a Serviceway" />
 			<label text=" " />
@@ -328,5 +329,5 @@
 		</item>
 
-		<item name="Parking Aisle" icon="presets/way_service.png">
+		<item name="Parking Aisle" icon="presets/way_unclassified.png">
 			<label text="Edit a Parking Aisle" />
 			<label text=" " />
@@ -459,5 +460,5 @@
 		<separator/>
 
-		<item name="Track" icon="presets/track.png">
+		<item name="Track" icon="presets/track1.png">
 			<label text="Edit a Track" />
 			<label text=" " />
@@ -778,4 +779,17 @@
 			<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/waypoints.png">
+			<key key="amenity" value="speed_camera" />
+		</item>
 	</group> <!-- Waypoints -->
 
@@ -1031,5 +1045,5 @@
 		</item>
 		
-		<item name="Railway Halt" icon="presets/railway_halt.png">
+		<item name="Railway Halt" icon="presets/station.png">
 			<label text="Edit Halt" />
 			<label text=" " />