Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 911)
+++ trunk/presets/presets.xml	(revision 912)
@@ -757,9 +757,9 @@
 		</item>
 
-		<item name="Cattle Grid" icon="presets/cattle_grid.png">
+		<item name="Cattle Grid" icon="styles/standard/vehicle/cattle_grid.png">
 			<key key="highway" value="cattle_grid" />
 		</item>
 
-		<item name="Stile" icon="presets/stile.png">
+		<item name="Stile" icon="styles/standard/vehicle/stile.png">
 			<key key="highway" value="stile" />
 		</item>
@@ -917,5 +917,5 @@
 		</item>
 
-		<item name="Boatyard" icon="presets/boatyard.png">
+		<item name="Boatyard" icon="styles/standard/nautical/boatyard.png">
 			<label text="Edit a Boatyard" />
 			<label text=" " />
@@ -1190,5 +1190,5 @@
 		</item>
 
-		<item name="Artwork" icon="presets/arts.png">
+		<item name="Artwork" icon="styles/standard/public/arts_centre.png">
 			<label text="Edit Artwork" />
 			<key key="tourism" value="artwork" />
@@ -1205,5 +1205,5 @@
 		</item>
 
-		<item name="Picnic Site" icon="presets/picnic.png">
+		<item name="Picnic Site" icon="styles/standard/recreation/picnic.png">
 			<label text="Edit Picnic Site" />
 			<key key="tourism" value="picnic_site" />
@@ -1261,5 +1261,5 @@
 		</item>
 
-		<item name="Fishing" icon="presets/fishing.png">
+		<item name="Fishing" icon="styles/standard/sports/fishing.png">
 			<label text="Edit Fishing" />
 			<key key="leisure" value="fishing" />
@@ -1330,5 +1330,5 @@
 		</item>
 
-		<item name="Racetrack" icon="presets/racetrack.png">
+		<item name="Racetrack" icon="styles/standard/sports/track.png">
 			<label text="Edit Racetrack" />
 			<key key="leisure" value="track" />
@@ -1636,5 +1636,5 @@
 		</item>
 
-		<item name="Prison" icon="presets/prison.png">
+		<item name="Prison" icon="styles/standard/public/administration/prison.png">
 			<label text="Edit Prison" />
 			<key key="amenity" value="prison" />
@@ -1688,5 +1688,5 @@
 		</item>
 
-		<item name="Library" icon="presets/library.png">
+		<item name="Library" icon="styles/standard/shopping/rental/library.png">
 			<label text="Edit Library" />
 			<key key="amenity" value="library" />
@@ -1694,5 +1694,5 @@
 		</item>
 
-		<item name="Arts Centre" icon="presets/arts.png">
+		<item name="Arts Centre" icon="styles/standard/public/arts_centre.png">
 			<label text="Edit Arts Centre" />
 			<key key="amenity" value="arts_centre" />
@@ -1802,5 +1802,5 @@
 		</item>
 
-		<item name="Baker" icon="presets/bakery.png">
+		<item name="Baker" icon="styles/standard/shopping/groceries/bakery.png">
 			<label text="Edit Baker" />
 			<key key="shop" value="bakery" />
@@ -1906,5 +1906,5 @@
 		</item>
 
-		<item name="Locality" icon="presets/locality.png">
+		<item name="Locality" icon="styles/standard/places/locality.png">
 			<label text="Edit Locality" />
 			<label text=" " />
@@ -1913,5 +1913,5 @@
 		</item>
 
-		<item name="Island" icon="presets/island.png">
+		<item name="Island" icon="styles/standard/places/island.png">
 			<label text="Edit Island" />
 			<label text=" " />
@@ -2002,5 +2002,5 @@
 		</item>
 
-		<item name="Vineyard" icon="presets/fruits.png">
+		<item name="Vineyard" icon="styles/standard/shopping/groceries/fruits.png">
 			<label text="Edit Vineyard Landuse" />
 			<label text=" " />
@@ -2335,5 +2335,5 @@
 		</item>
 
-		<item name="Pier" icon="presets/pier.png">
+		<item name="Pier" icon="styles/standard/misc/landmark/pier.png">
 			<label text="Edit Pier" />
 			<key key="man_made" value="pier" />
@@ -2353,5 +2353,5 @@
 		</item>
 
-		<item name="Crane" icon="presets/crane.png">
+		<item name="Crane" icon="styles/standard/misc/landmark/crane.png">
 			<label text="Edit Crane" />
 			<key key="man_made" value="crane" />