Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 898)
+++ trunk/presets/presets.xml	(revision 899)
@@ -705,5 +705,5 @@
 
 	<group name="Waypoints" icon="presets/waypoints.png">
-		<item name="Toll Booth" icon="presets/waypoints.png">
+		<item name="Toll Booth" icon="presets/toll_station.png">
 			<label text="Edit Toll Booth" />
 			<label text=" " />
@@ -716,5 +716,5 @@
 		</item>
 
-		<item name="Services" icon="presets/waypoints.png">
+		<item name="Services" icon="presets/services.png">
 			<label text="Edit Service Station" />
 			<label text=" " />
@@ -749,5 +749,5 @@
 		</item>
 
-		<item name="Mini Roundabout" icon="presets/waypoints.png">
+		<item name="Mini Roundabout" icon="presets/roundabout_left.png">
 			<key key="highway" value="mini_roundabout" />
 		</item>
@@ -765,13 +765,13 @@
 		</item>
 
-		<item name="Cattle Grid" icon="presets/waypoints.png">
+		<item name="Cattle Grid" icon="presets/cattle_grid.png">
 			<key key="highway" value="cattle_grid" />
 		</item>
 
-		<item name="Stile" icon="presets/waypoints.png">
+		<item name="Stile" icon="presets/stile.png">
 			<key key="highway" value="stile" />
 		</item>
 
-		<item name="Mountain Pass" icon="presets/waypoints.png">
+		<item name="Mountain Pass" icon="presets/mountain_pass.png">
 			<label text="Edit Mountain Pass" />
 			<label text=" " />
@@ -863,5 +863,5 @@
 		</item>
 
-		<item name="Turntable" icon="presets/railwaypoint.png">
+		<item name="Turntable" icon="presets/turntable.png">
 			<key key="railway" value="turntable" />
 		</item>
@@ -912,5 +912,5 @@
 		<separator/>
 
-		<item name="Weir" icon="presets/empty.png">
+		<item name="Weir" icon="presets/weir.png">
 			<label text="Edit a Weir" />
 			<label text=" " />
@@ -926,5 +926,5 @@
 		</item>
 
-		<item name="Boatyard" icon="presets/empty.png">
+		<item name="Boatyard" icon="presets/boatyard.png">
 			<label text="Edit a Boatyard" />
 			<label text=" " />
@@ -935,9 +935,9 @@
 
 	<group name="Waterway Point" icon="presets/waterwaypoint.png">
-		<item name="Lock Gate" icon="presets/empty.png">
+		<item name="Lock Gate" icon="presets/lock_gate.png">
 			<key key="waterway" value="lock_gate" />
 		</item>
 
-		<item name="Turning Point" icon="presets/empty.png">
+		<item name="Turning Point" icon="presets/turning.png">
 			<key key="waterway" value="turning_point" />
 		</item>
@@ -971,5 +971,5 @@
 	</item>
 
-		<item name="Car Rental" icon="presets/car.png">
+		<item name="Car Rental" icon="presets/car_rental.png">
 			<label text="Edit Car Rental" />
 			<key key="amenity" value="car_rental" />
@@ -978,5 +978,5 @@
 		</item>
 
-		<item name="Car Sharing" icon="presets/car.png">
+		<item name="Car Sharing" icon="presets/car_sharing.png">
 			<label text="Edit Car Sharing" />
 			<key key="amenity" value="car_sharing" />
@@ -987,5 +987,5 @@
 
 	<group name="Bicycle" icon="presets/bike.png">
-		<item name="Bicycle Parking" icon="presets/bike.png">
+		<item name="Bicycle Parking" icon="presets/bike_parking.png">
 			<label text="Edit Bicycle Parking" />
 			<key key="amenity" value="bicycle_parking" />
@@ -993,5 +993,5 @@
 		</item>
 
-		<item name="Bicycle Rental" icon="presets/bike.png">
+		<item name="Bicycle Rental" icon="presets/bicycle_rental.png">
 			<label text="Edit Bicycle Rental" />
 			<key key="amenity" value="bicycle_rental" />
@@ -1178,5 +1178,5 @@
 		</item>
 
-		<item name="Theme Park" icon="presets/empty.png">
+		<item name="Theme Park" icon="presets/theme_park.png">
 			<label text="Edit Theme Park" />
 			<key key="tourism" value="theme_park" />
@@ -1199,5 +1199,5 @@
 		</item>
 
-		<item name="Picnic Site" icon="presets/empty.png">
+		<item name="Picnic Site" icon="presets/picnic.png">
 			<label text="Edit Picnic Site" />
 			<key key="tourism" value="picnic_site" />
@@ -1241,5 +1241,5 @@
 		</item>
 
-		<item name="Battlefield" icon="presets/empty.png">
+		<item name="Battlefield" icon="presets/battlefield.png">
 			<label text="Edit Battlefield" />
 			<key key="historic" value="battlefield" />
@@ -1336,5 +1336,5 @@
 		</item>
 
-		<item name="Racetrack" icon="presets/empty.png">
+		<item name="Racetrack" icon="presets/racetrack.png">
 			<label text="Edit Racetrack" />
 			<key key="leisure" value="track" />
@@ -1477,5 +1477,5 @@
 		</item>
 		
-		<item name="Football" icon="presets/empty.png">
+		<item name="Football" icon="presets/football.png">
 			<label text="Edit Football" />
 			<key key="sport" value="football" />
@@ -1568,5 +1568,5 @@
 		</item>
 		
-		<item name="Rugby" icon="presets/empty.png">
+		<item name="Rugby" icon="presets/football.png">
 			<label text="Edit Rugby" />
 			<key key="sport" value="rugby" />
@@ -1575,5 +1575,5 @@
 		</item>
 		
-		<item name="Table Tennis" icon="presets/tennisball.png">
+		<item name="Table Tennis" icon="presets/table_tennis.png">
 			<label text="Edit Table Tennis" />
 			<key key="sport" value="table_tennis" />
@@ -1630,5 +1630,5 @@
 		</item>
 
-		<item name="Fire Station" icon="presets/empty.png">
+		<item name="Fire Station" icon="presets/firebrigade.png">
 			<label text="Edit Fire Station" />
 			<key key="amenity" value="fire_station" />
@@ -1642,5 +1642,5 @@
 		</item>
 
-		<item name="Prison" icon="presets/empty.png">
+		<item name="Prison" icon="presets/prison.png">
 			<label text="Edit Prison" />
 			<key key="amenity" value="prison" />
@@ -1688,5 +1688,5 @@
 		<separator/>
 
-		<item name="Cinema" icon="presets/empty.png">
+		<item name="Cinema" icon="presets/cinema.png">
 			<label text="Edit Cinema" />
 			<key key="amenity" value="cinema" />
@@ -1808,5 +1808,5 @@
 		</item>
 
-		<item name="Baker" icon="presets/empty.png">
+		<item name="Baker" icon="presets/bakery.png">
 			<label text="Edit Baker" />
 			<key key="shop" value="bakery" />
@@ -1877,5 +1877,5 @@
 		</item>
 
-		<item name="Island" icon="presets/places.png">
+		<item name="Island" icon="presets/island.png">
 			<label text="Edit Island" />
 			<label text=" " />
@@ -1919,5 +1919,5 @@
 		</item>
 
-		<item name="Locality" icon="presets/places.png">
+		<item name="Locality" icon="presets/locality.png">
 			<label text="Edit Locality" />
 			<label text=" " />
@@ -2008,5 +2008,5 @@
 		</item>
 
-		<item name="Vineyard" icon="presets/landuse.png">
+		<item name="Vineyard" icon="presets/fruits.png">
 			<label text="Edit Vineyard Landuse" />
 			<label text=" " />
@@ -2341,5 +2341,5 @@
 		</item>
 
-		<item name="Pier" icon="presets/empty.png">
+		<item name="Pier" icon="presets/pier.png">
 			<label text="Edit Pier" />
 			<key key="man_made" value="pier" />
@@ -2359,5 +2359,5 @@
 		</item>
 
-		<item name="Crane" icon="presets/empty.png">
+		<item name="Crane" icon="presets/crane.png">
 			<label text="Edit Crane" />
 			<key key="man_made" value="crane" />