Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 839)
+++ /trunk/presets/presets.xml	(revision 840)
@@ -7,5 +7,5 @@
 
 <annotations>
-	<group name="Streets" icon="presets/way_unknown.png">
+	<group name="Streets" icon="presets/way_secondary.png">
 		<item name="Motorway" icon="presets/motorway.png">
 			<label text="Edit a Motorway" />
@@ -449,6 +449,135 @@
 		</item>
 
-		<item name="Paths" icon="presets/empty.png">
-			<label text="Edit Paths" />
+		<seperator/>
+
+		<item name="Track" icon="presets/track.png">
+			<label text="Edit a Track" />
+			<label text=" " />
+			<key key="highway" value="track" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Track Grade 1" icon="presets/track1.png">
+			<label text="Edit a Track of grade 1" />
+			<label text=" " />
+			<key key="highway" value="track" />
+			<key key="tracktype" value="grade1" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Track Grade 2" icon="presets/track2.png">
+			<label text="Edit a Track of grade 2" />
+			<label text=" " />
+			<key key="highway" value="track" />
+			<key key="tracktype" value="grade2" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Track Grade 3" icon="presets/track3.png">
+			<label text="Edit a Track of grade 3" />
+			<label text=" " />
+			<key key="highway" value="track" />
+			<key key="tracktype" value="grade3" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Track Grade 4" icon="presets/track4.png">
+			<label text="Edit a Track of grade 4" />
+			<label text=" " />
+			<key key="highway" value="track" />
+			<key key="tracktype" value="grade4" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<item name="Track Grade 5" icon="presets/track5.png">
+			<label text="Edit a Track of grade 5" />
+			<label text=" " />
+			<key key="highway" value="track" />
+			<key key="tracktype" value="grade5" />
+			<label text=" " />
+			<label text="Optional Attributes:" />
+			<label text=" " />
+			<text key="name" text="Name" default="" delete_if_empty="true" />
+			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
+			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
+			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
+			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
+			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
+			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
+			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
+			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
+		</item>
+
+		<seperator/>
+
+		<item name="Path" icon="presets/path.png">
+			<label text="Edit Path" />
 			<label text=" " />
 			<key key="highway" value="path" />
@@ -476,132 +605,4 @@
 		</item>
 
-		<seperator/>
-
-		<item name="Track" icon="presets/track.png">
-			<label text="Edit a Track" />
-			<label text=" " />
-			<key key="highway" value="track" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Track Grade 1" icon="presets/track1.png">
-			<label text="Edit a Track of grade 1" />
-			<label text=" " />
-			<key key="highway" value="track" />
-			<key key="tracktype" value="grade1" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Track Grade 2" icon="presets/track2.png">
-			<label text="Edit a Track of grade 2" />
-			<label text=" " />
-			<key key="highway" value="track" />
-			<key key="tracktype" value="grade2" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Track Grade 3" icon="presets/track3.png">
-			<label text="Edit a Track of grade 3" />
-			<label text=" " />
-			<key key="highway" value="track" />
-			<key key="tracktype" value="grade3" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Track Grade 4" icon="presets/track4.png">
-			<label text="Edit a Track of grade 4" />
-			<label text=" " />
-			<key key="highway" value="track" />
-			<key key="tracktype" value="grade4" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<item name="Track Grade 5" icon="presets/track5.png">
-			<label text="Edit a Track of grade 5" />
-			<label text=" " />
-			<key key="highway" value="track" />
-			<key key="tracktype" value="grade5" />
-			<label text=" " />
-			<label text="Optional Attributes:" />
-			<label text=" " />
-			<text key="name" text="Name" default="" delete_if_empty="true" />
-			<check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
-			<check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
-			<check key="cutting" text="Cutting" default="off" delete_if_empty="true" />
-			<check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
-			<combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
-			<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
-			<combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
-			<text key="width" text="Width (metres)" default="" delete_if_empty="true" />
-		</item>
-
-		<seperator/>
 
 		<item name="Hiking" icon="presets/hiking_grade1.png">
@@ -1718,5 +1719,5 @@
 		</item>
 
-		<item name="Fountain" icon="presets/empty.png">
+		<item name="Fountain" icon="presets/fountain.png">
 			<label text="Edit a Fountain" />
 			<key key="amenity" value="fountain" />
@@ -1783,5 +1784,5 @@
 		</item>
 
-		<item name="Do-it-yourself-store" icon="presets/empty.png">
+		<item name="Do-it-yourself-store" icon="presets/diy_store.png">
 			<label text="Edit Do-it-yourself-store" />
 			<key key="shop" value="doityourself" />