Index: trunk/presets/presets.xml
===================================================================
--- trunk/presets/presets.xml	(revision 2117)
+++ trunk/presets/presets.xml	(revision 2118)
@@ -55,4 +55,5 @@
 -->
 <annotations>
+  <group name="Highways" icon="presets/way_secondary.png">
     <group name="Streets" icon="presets/way_secondary.png">
         <item name="Motorway" icon="presets/motorway.png" type="way">
@@ -1043,5 +1044,6 @@
         
     </group> <!-- Barriers -->
-    <separator/>
+  </group>
+  <group name="Water" icon="presets/waterway.png">
     <group name="Water" icon="presets/waterway.png">
         <item name="Spring" icon="presets/spring.png" type="node,closedway">
@@ -1245,5 +1247,6 @@
         </item>
     </group> <!-- Waterway -->
-    <separator/>
+  </group>
+  <group name="Transport" icon="presets/railway.png">
     <group name="Railway" icon="presets/railway.png">
         <item name="Rail" icon="presets/railway.png" type="way">
@@ -1561,5 +1564,6 @@
         </item>
     </group> <!-- Public Transport -->
-    <separator/>
+  </group>
+  <group name="Travel" icon="presets/bed.png">
     <group name="Accomodation" icon="presets/bed.png">
         <item name="Hotel" icon="presets/bed.png" type="node,closedway">
@@ -1865,5 +1869,6 @@
         </item>
     </group> <!-- Leisure -->
-    <separator/>
+  </group>
+  <group name="Sports" icon="presets/soccer.png">
     <group name="Sport Facilities" icon="presets/stadium.png">
         <item name="Stadium" icon="presets/stadium.png" type="node,closedway">
@@ -2128,5 +2133,6 @@
         </item>
     </group>
-    <separator/>
+  </group>
+  <group name="Man-Made" icon="presets/works.png">
     <group name="Buildings" icon="presets/townhall.png">
         <item name="Building" icon="presets/empty.png" type="closedway,relation">
@@ -2744,5 +2750,6 @@
         </item>
     </group> <!-- Health -->
-    <separator/>
+  </group>
+  <group name="Geography" icon="presets/places.png">
     <group name="Places" icon="presets/places.png">
         <item name="Continent" icon="presets/places.png" type="node,closedway">
@@ -3105,5 +3112,5 @@
         </item>
     </group> <!-- Landuse -->
-    <separator/>
+  </group>
 <!-- FIXME: element role not yet supported! -->
     <group name="Relations" icon="presets/relations.png">