Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 830)
+++ /trunk/presets/presets.xml	(revision 831)
@@ -605,5 +605,5 @@
 		<seperator/>
 
-		<item name="Hiking" icon="presets/empty.png">
+		<item name="Hiking" icon="presets/hiking_grade1.png">
 			<label text="Edit Hiking" />
 			<label text=" " />
@@ -617,5 +617,5 @@
 		</item>
 
-		<item name="Mountain Hiking" icon="presets/empty.png">
+		<item name="Mountain Hiking" icon="presets/hiking_grade1.png">
 			<label text="Edit Mountain Hiking" />
 			<label text=" " />
@@ -629,5 +629,5 @@
 		</item>
 
-		<item name="Demanding Mountain Hiking" icon="presets/empty.png">
+		<item name="Demanding Mountain Hiking" icon="presets/hiking_grade3.png">
 			<label text="Edit Demanding Mountain Hiking" />
 			<label text=" " />
@@ -641,5 +641,5 @@
 		</item>
 
-		<item name="Alpine Hiking" icon="presets/empty.png">
+		<item name="Alpine Hiking" icon="presets/hiking_grade4.png">
 			<label text="Edit Alpine Hiking" />
 			<label text=" " />
@@ -653,5 +653,5 @@
 		</item>
 
-		<item name="Demanding alpine hiking" icon="presets/empty.png">
+		<item name="Demanding alpine hiking" icon="presets/hiking_grade5.png">
 			<label text="Edit Demanding alpine hiking" />
 			<label text=" " />
@@ -665,5 +665,5 @@
 		</item>
 
-		<item name="Difficult alpine hiking" icon="presets/empty.png">
+		<item name="Difficult alpine hiking" icon="presets/hiking_grade6.png">
 			<label text="Edit Difficult alpine hiking" />
 			<label text=" " />
@@ -762,4 +762,10 @@
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
+
+		<item name="Slipway" icon="presets/slipway.png">
+			<label text="Edit Slipway" />
+			<key key="leisure" value="slipway" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
 	</group> <!-- Waypoints -->
 
@@ -829,9 +835,9 @@
 
 	<group name="Railway Point" icon="presets/railwaypoint.png">
-		<item name="Crossing" icon="presets/railwaypoint.png">
+		<item name="Crossing" icon="presets/crossing.png">
 			<key key="railway" value="crossing" />
 		</item>
 
-		<item name="Level Crossing" icon="presets/railwaypoint.png">
+		<item name="Level Crossing" icon="presets/level_crossing.png">
 			<key key="railway" value="level_crossing" />
 		</item>
@@ -840,8 +846,8 @@
 			<key key="railway" value="turntable" />
 		</item>
-	</group> <!-- Tailway Point -->
+	</group> <!-- Railway Point -->
 
 	<group name="Public Transport" icon="presets/bus.png">
-		<item name="Station" icon="presets/railwaypoint.png">
+		<item name="Station" icon="presets/station.png">
 			<label text="Edit Station" />
 			<label text=" " />
@@ -853,5 +859,5 @@
 		</item>
 
-		<item name="Halt" icon="presets/railwaypoint.png">
+		<item name="Railway Halt" icon="presets/railway_halt.png">
 			<label text="Edit Halt" />
 			<label text=" " />
@@ -863,5 +869,5 @@
 		</item>
 
-		<item name="Tram Stop" icon="presets/railwaypoint.png">
+		<item name="Tram Stop" icon="presets/tram.png">
 			<label text="Edit Tram Stop" />
 			<label text=" " />
@@ -877,14 +883,4 @@
 			<label text=" " />
 			<key key="railway" value="subway_entrance" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Bus Stop" icon="presets/bus.png">
-			<label text="Edit Bus Stop" />
-			<label text=" " />
-			<key key="highway" value="bus_stop" />
 			<label text=" " />
 			<label text="Optional Attributes:" />
@@ -901,4 +897,14 @@
 			<text key="name" text="Name" default="" delete_if_empty="true" />
 		</item>
+
+		<item name="Bus Stop" icon="presets/bus_halt.png">
+			<label text="Edit Bus Stop" />
+			<label text=" " />
+			<key key="highway" value="bus_stop" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+		</item>
 	</group> <!-- Public Transport -->
 
@@ -967,5 +973,5 @@
 	</group> <!-- Waterway -->
 
-	<group name="Waterway Point" icon="presets/waterway.png">
+	<group name="Waterway Point" icon="presets/waterwaypoint.png">
 		<item name="Lock Gate" icon="presets/empty.png">
 			<key key="waterway" value="lock_gate" />
@@ -997,4 +1003,11 @@
 		</item>
 
+		<item name="Car Shop" icon="presets/car_repair.png">
+			<label text="Edit Car Shop" />
+			<key key="shop" value="car" />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<text key="operator" text="Operator" default="" delete_if_empty="true" />
+	</item>
+
 		<item name="Car Rental" icon="presets/car.png">
 			<label text="Edit Car Rental" />
@@ -1072,4 +1085,6 @@
 	</group> <!-- Accomodation -->
 
+
+
 	<group name="Food+Drinks" icon="presets/restaurant.png">
 		<item name="Restaurant" icon="presets/restaurant.png">
@@ -1079,5 +1094,5 @@
 		</item>
 
-		<item name="Biergarten" icon="presets/empty.png">
+		<item name="Biergarten" icon="presets/biergarten.png">
 			<label text="Edit Biergarten" />
 			<key key="amenity" value="biergarten" />
@@ -1123,5 +1138,5 @@
 		</item>
 
-		<item name="Zoo" icon="presets/empty.png">
+		<item name="Zoo" icon="presets/zoo.png">
 			<label text="Edit Zoo" />
 			<key key="tourism" value="zoo" />
@@ -1129,5 +1144,5 @@
 		</item>
 
-		<item name="Viewpoint" icon="presets/empty.png">
+		<item name="Viewpoint" icon="presets/viewpoint.png">
 			<label text="Edit Viewpoint" />
 			<key key="tourism" value="viewpoint" />
@@ -1179,5 +1194,5 @@
 		</item>
 
-		<item name="Monument" icon="presets/empty.png">
+		<item name="Monument" icon="presets/monument.png">
 			<label text="Edit Monument" />
 			<key key="historic" value="monument" />
@@ -1185,5 +1200,5 @@
 		</item>
 
-		<item name="Memorial" icon="presets/empty.png">
+		<item name="Memorial" icon="presets/memorial.png">
 			<label text="Edit Memorial" />
 			<key key="historic" value="memorial" />