Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 871)
+++ trunk/presets/presets.xml	(revision 876)
@@ -300,4 +300,17 @@
 			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
 		</item>
+		<item name="Bridge" icon="presets/bridge.png">
+			<label text="Edit a Bridge" />
+			<label text=" " />
+			<key key="bridge" value="yes" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<text key="maxspeed" text="Max. speed (km/h)" default="" delete_if_empty="true" />
+			<text key="maxweight" text="Max. weight (tonnes)" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
 	</group> <!-- Streets -->
 
@@ -722,5 +735,5 @@
 		</item>
 
-		<item name="Ford" icon="presets/waypoints.png">
+		<item name="Ford" icon="presets/ford.png">
 			<label text="Edit Ford" />
 			<label text=" " />
@@ -740,5 +753,5 @@
 		</item>
 
-		<item name="Traffic Signal" icon="presets/waypoints.png">
+		<item name="Traffic Signal" icon="presets/traffic-light.png">
 			<key key="highway" value="traffic_signals" />
 		</item>
@@ -858,5 +871,5 @@
 
 	<group name="Waterway" icon="presets/waterway.png">
-		<item name="River" icon="presets/waterway.png">
+		<item name="River" icon="presets/river.png">
 			<label text="Edit a River" />
 			<label text=" " />
@@ -1774,5 +1787,5 @@
 		</item>
 
-		<item name="Kiosk" icon="presets/empty.png">
+		<item name="Kiosk" icon="presets/kiosk.png">
 			<label text="Edit Kiosk" />
 			<key key="shop" value="kiosk" />
@@ -1798,5 +1811,5 @@
 		</item>
 
-		<item name="Dry Cleaning" icon="presets/empty.png">
+		<item name="Dry Cleaning" icon="presets/laundry.png">
 			<label text="Edit Dry Cleaning" />
 			<key key="shop" value="dry_cleaning" />
@@ -1804,5 +1817,5 @@
 		</item>
 
-		<item name="Laundry" icon="presets/empty.png">
+		<item name="Laundry" icon="presets/laundry.png">
 			<label text="Edit Laundry" />
 			<key key="shop" value="laundry" />
@@ -1964,5 +1977,5 @@
 
 	<group name="Landuse" icon="presets/landuse.png">
-		<item name="Grave Yard" icon="presets/empty.png">
+		<item name="Grave Yard" icon="presets/graveyard.png">
 			<label text="Edit Grave Yard" />
 			<key key="amenity" value="grave_yard" />
@@ -2007,5 +2020,5 @@
 		</item>
 
-		<item name="Basin" icon="presets/landuse.png">
+		<item name="Basin" icon="presets/landuse_water.png">
 			<label text="Edit Basin Landuse" />
 			<label text=" " />
@@ -2014,5 +2027,5 @@
 		</item>
 
-		<item name="Reservoir" icon="presets/landuse.png">
+		<item name="Reservoir" icon="presets/landuse_water.png">
 			<label text="Edit Reservoir Landuse" />
 			<label text=" " />
@@ -2099,5 +2112,5 @@
 		</item>
 
-		<item name="Cemetery" icon="presets/landuse.png">
+		<item name="Cemetery" icon="presets/cemetery.png">
 			<label text="Edit Cemetery Landuse" />
 			<label text=" " />