Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 1060)
+++ /trunk/presets/presets.xml	(revision 1061)
@@ -725,5 +725,5 @@
 		</item>
 
-		<item name="Bollard" icon="styles/standard/vehicle/restrictions/bollard.png">
+		<item name="Bollard" icon="presets/bollard.png">
 			<key key="barrier" value="bollard" />
 		</item>
@@ -762,13 +762,13 @@
 		</item>
 
-		<item name="Cattle Grid" icon="styles/standard/vehicle/cattle_grid.png">
+		<item name="Cattle Grid" icon="presets/cattle_grid.png">
 			<key key="highway" value="cattle_grid" />
 		</item>
 
-		<item name="Gate" icon="styles/standard/vehicle/gate.png">
+		<item name="Gate" icon="presets/gate.png">
 			<key key="highway" value="gate" />
 		</item>
 
-		<item name="Stile" icon="styles/standard/vehicle/stile.png">
+		<item name="Stile" icon="presets/stile.png">
 			<key key="highway" value="stile" />
 		</item>
@@ -969,5 +969,5 @@
 		</item>
 
-		<item name="Waterfall" icon="styles/standard/nautical/waterfall.png">
+		<item name="Waterfall" icon="presets/waterfall.png">
 			<label text="Edit a Waterfall" />
 			<label text=" " />
@@ -1117,5 +1117,5 @@
 		</item>
 
-		<item name="Subway Entrance" icon="styles/standard/transport/underground.png">
+		<item name="Subway Entrance" icon="presets/underground.png">
 			<label text="Edit Subway Entrance" />
 			<label text=" " />
@@ -1294,5 +1294,5 @@
 		</item>
 
-		<item name="Artwork" icon="styles/standard/public/arts_centre.png">
+		<item name="Artwork" icon="presets/arts_centre.png">
 			<label text="Edit Artwork" />
 			<key key="tourism" value="artwork" />
@@ -1582,5 +1582,5 @@
 		</item>
 		
-		<item name="Shooting" icon="styles/standard/misc/landmark/range.png">
+		<item name="Shooting" icon="presets/range.png">
 			<label text="Edit Shooting" />
 			<key key="sport" value="shooting" />
@@ -1634,5 +1634,5 @@
 		</item>
 		
-		<item name="Boule" icon="styles/standard/sports/boule.png">
+		<item name="Boule" icon="presets/boule.png">
 			<label text="Edit Boule" />
 			<key key="sport" value="boules" />
@@ -1641,5 +1641,5 @@
 		</item>
 		
-		<item name="Bowls" icon="styles/standard/sports/boule.png">
+		<item name="Bowls" icon="presets/boule.png">
 			<label text="Edit Bowls" />
 			<key key="sport" value="bowls" />
@@ -1683,5 +1683,5 @@
 		</item>
 		
-		<item name="Racquet" icon="styles/standard/sports/racquetball.png">
+		<item name="Racquet" icon="presets/racquetball.png">
 			<label text="Edit Racquet" />
 			<key key="sport" value="racquet" />
@@ -1774,5 +1774,5 @@
 		</item>
 
-		<item name="Police" icon="styles/standard/public/police.png">
+		<item name="Police" icon="presets/police.png">
 			<label text="Edit Police" />
 			<key key="amenity" value="police" />
@@ -1820,5 +1820,5 @@
 		</item>
 
-		<item name="Library" icon="styles/standard/shopping/rental/library.png">
+		<item name="Library" icon="presets/library.png">
 			<label text="Edit Library" />
 			<key key="amenity" value="library" />
@@ -1826,5 +1826,5 @@
 		</item>
 
-		<item name="Arts Centre" icon="styles/standard/public/arts_centre.png">
+		<item name="Arts Centre" icon="presets/arts_centre.png">
 			<label text="Edit Arts Centre" />
 			<key key="amenity" value="arts_centre" />
@@ -2075,5 +2075,5 @@
 		</item>
 
-		<item name="Locality" icon="styles/standard/places/locality.png">
+		<item name="Locality" icon="presets/locality.png">
 			<label text="Edit Locality" />
 			<label text=" " />
@@ -2082,5 +2082,5 @@
 		</item>
 
-		<item name="Island" icon="styles/standard/places/island.png">
+		<item name="Island" icon="presets/island.png">
 			<label text="Edit Island" />
 			<label text=" " />
@@ -2171,5 +2171,5 @@
 		</item>
 
-		<item name="Vineyard" icon="styles/standard/shopping/groceries/fruits.png">
+		<item name="Vineyard" icon="presets/fruits.png">
 			<label text="Edit Vineyard Landuse" />
 			<label text=" " />
@@ -2349,5 +2349,5 @@
 		</item>
 
-		<item name="Glacier" icon="styles/standard/misc/landmark/glacier.png">
+		<item name="Glacier" icon="presets/glacier.png">
 			<label text="Edit Glacier" />
 			<key key="natural" value="glacier" />
@@ -2355,5 +2355,5 @@
 		</item>
 
-		<item name="Volcano" icon="styles/standard/misc/landmark/volcano.png">
+		<item name="Volcano" icon="presets/volcano.png">
 			<label text="Edit Volcano" />
 			<key key="natural" value="volcano" />
@@ -2490,5 +2490,5 @@
 		</item>
 
-		<item name="Pier" icon="styles/standard/misc/landmark/pier.png">
+		<item name="Pier" icon="presets/pier.png">
 			<label text="Edit Pier" />
 			<key key="man_made" value="pier" />