Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 1010)
+++ trunk/presets/presets.xml	(revision 1011)
@@ -2,4 +2,5 @@
 		Pics have been derived from
 		http://commons.wikipedia.org (german street sign SVGs)
+		http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
 		http://www.kde.org
 		http://openclipart.org/media/view/media/clip_art
@@ -687,5 +688,5 @@
 		</item>
 
-		<item name="Services" icon="presets/services.png">
+		<item name="Services" icon="presets/car_service.png">
 			<label text="Edit Service Station" />
 			<label text=" " />
@@ -931,5 +932,5 @@
 		<separator/>
 
-		<item name="Boatyard" icon="styles/standard/nautical/boatyard.png">
+		<item name="Boatyard" icon="presets/boatyard.png">
 			<label text="Edit a Boatyard" />
 			<label text=" " />
@@ -978,5 +979,5 @@
 		</item>
 
-		<item name="Marina" icon="styles/standard/nautical/marina.png">
+		<item name="Marina" icon="presets/marina.png">
 			<label text="Edit Marina" />
 			<key key="leisure" value="marina" />
@@ -993,21 +994,21 @@
 	<separator/>
 
-	<group name="Aerialway" icon="styles/standard/transport/aerialway.png">
-		<item name="Chair Lift" icon="styles/standard/transport/aerialway/chair_lift.png">
+	<group name="Aerialway" icon="presets/aerialway.png">
+		<item name="Chair Lift" icon="presets/chair_lift.png">
 			<label text="Edit a Chair Lift" />
 			<key key="aerialway" value="chair_lift" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
-		<item name="Drag Lift" icon="styles/standard/transport/aerialway/drag_lift.png">
+		<item name="Drag Lift" icon="presets/drag_lift.png">
 			<label text="Edit a Drag Lift" />
 			<key key="aerialway" value="drag_lift" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
-		<item name="Cable Car" icon="styles/standard/transport/aerialway/cable_car.png">
+		<item name="Cable Car" icon="presets/cable_car.png">
 			<label text="Edit a Cable Car" />
 			<key key="aerialway" value="cable_car" />
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
-		<item name="Station" icon="styles/standard/transport/aerialway/station.png">
+		<item name="Station" icon="presets/aerialway_station.png">
 			<label text="Edit a Station" />
 			<key key="aerialway" value="station" />
@@ -1269,5 +1270,5 @@
 		</item>
 
-		<item name="Picnic Site" icon="styles/standard/recreation/picnic.png">
+		<item name="Picnic Site" icon="presets/picnic.png">
 			<label text="Edit Picnic Site" />
 			<key key="tourism" value="picnic_site" />
@@ -1317,5 +1318,5 @@
 		</item>
 		
-		<item name="Wayside Cross" icon="presets/empty.png">
+		<item name="Wayside Cross" icon="presets/wayside_cross.png">
 			<label text="Edit a Wayside Cross" />
 			<key key="historic" value="wayside_cross" />
@@ -1323,5 +1324,5 @@
 		</item>
 		
-		<item name="Wayside Shrine" icon="presets/empty.png">
+		<item name="Wayside Shrine" icon="presets/wayside_shrine.png">
 			<label text="Edit a Wayside Shrine" />
 			<key key="historic" value="wayside_shrine" />
@@ -1331,5 +1332,5 @@
 
 	<group name="Leisure" icon="presets/kindergarten.png">
-		<item name="Water Park" icon="styles/standard/recreation/water_park.png">
+		<item name="Water Park" icon="presets/swimming.png">
 			<label text="Edit Water Park" />
 			<key key="leisure" value="water_park" />
@@ -1343,5 +1344,5 @@
 		</item>
 
-		<item name="Fishing" icon="styles/standard/sports/fishing.png">
+		<item name="Fishing" icon="presets/fishing.png">
 			<label text="Edit Fishing" />
 			<key key="leisure" value="fishing" />
@@ -1406,5 +1407,5 @@
 		</item>
 
-		<item name="Racetrack" icon="styles/standard/sports/track.png">
+		<item name="Racetrack" icon="presets/stadium.png">
 			<label text="Edit Racetrack" />
 			<key key="leisure" value="track" />
@@ -1416,5 +1417,5 @@
 		</item>
 		
-		<item name="Golf Course" icon="styles/standard/sports/golf.png">
+		<item name="Golf Course" icon="presets/golf.png">
 			<label text="Edit Golf Course" />
 			<key key="leisure" value="golf_course" />
@@ -1422,5 +1423,5 @@
 		</item>
 		
-		<item name="Miniature Golf" icon="styles/standard/sports/golf.png">
+		<item name="Miniature Golf" icon="presets/golf.png">
 			<label text="Edit Miniature Golf" />
 			<key key="leisure" value="miniature_golf" />
@@ -1429,5 +1430,5 @@
 	</group>
 	
-	<group name="Sport" icon="presets/canoe.png">
+	<group name="Sport" icon="presets/rowing.png">
 		<item name="Multi" icon="presets/empty.png">
 			<label text="Edit Multi" />
@@ -1594,5 +1595,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" />
@@ -1601,5 +1602,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" />
@@ -1728,5 +1729,5 @@
 		</item>
 
-		<item name="Prison" icon="styles/standard/public/administration/prison.png">
+		<item name="Prison" icon="presets/prison.png">
 			<label text="Edit Prison" />
 			<key key="amenity" value="prison" />
@@ -1931,5 +1932,5 @@
 		</item>
 
-		<item name="Baker" icon="styles/standard/shopping/groceries/bakery.png">
+		<item name="Baker" icon="presets/baker.png">
 			<label text="Edit Baker" />
 			<key key="shop" value="bakery" />
@@ -2138,5 +2139,5 @@
 		</item>
 
-		<item name="Quarry" icon="styles/standard/misc/landmark/mine.png">
+		<item name="Quarry" icon="presets/mine.png">
 			<label text="Edit Quarry Landuse" />
 			<label text=" " />
@@ -2468,5 +2469,5 @@
 		</item>
 
-		<item name="Crane" icon="styles/standard/misc/landmark/crane.png">
+		<item name="Crane" icon="presets/crane.png">
 			<label text="Edit Crane" />
 			<key key="man_made" value="crane" />