Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10676)
+++ trunk/data/defaultpresets.xml	(revision 10706)
@@ -955,5 +955,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Roundabout -->
-        <item name="Ford" icon="presets/misc/ford.svg" type="node,way" preset_name_label="true">
+        <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
@@ -1556,5 +1556,5 @@
         </item> <!-- Grit Bin -->
         <separator/>
-        <item name="Mountain Pass" icon="presets/misc/landmark/mountain_pass.svg" type="node" preset_name_label="true">
+        <item name="Mountain Pass" icon="presets/landmark/mountain_pass.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:mountain_pass"
@@ -1572,6 +1572,6 @@
         </item> <!-- Mountain Pass -->
     </group> <!-- Waypoints -->
-    <group name="Barriers" icon="presets/barrier.png"> <!-- *** Node Barriers *** -->
-        <item name="Block" icon="presets/vehicle/block.svg" type="node,way,closedway" preset_name_label="true">
+    <group name="Barriers" icon="presets/barrier/barrier.png"> <!-- *** Node Barriers *** -->
+        <item name="Block" icon="presets/barrier/block.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=block"
@@ -1585,5 +1585,5 @@
             </optional>
         </item> <!-- Block -->
-        <item name="Bollard" icon="presets/bollard.png" type="node,way" preset_name_label="true">
+        <item name="Bollard" icon="presets/barrier/bollard.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=bollard"
@@ -1602,5 +1602,5 @@
             </optional>
         </item> <!-- Bollard -->
-        <item name="Cycle Barrier" icon="presets/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
+        <item name="Cycle Barrier" icon="presets/barrier/cycle_barrier.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cycle_barrier"
@@ -1611,5 +1611,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Cycle Barrier -->
-        <item name="Cattle Grid" icon="presets/vehicle/cattle_grid.png" type="node" preset_name_label="true">
+        <item name="Cattle Grid" icon="presets/barrier/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
@@ -1618,5 +1618,5 @@
             <reference ref="barrier_4" />
         </item> <!-- Cattle Grid -->
-        <item name="Bus Trap" icon="presets/empty.png" type="node" preset_name_label="true">
+        <item name="Bus Trap" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
@@ -1624,5 +1624,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Bus Trap -->
-        <item name="Spikes" icon="presets/vehicle/spikes.svg" type="node" preset_name_label="true">
+        <item name="Spikes" icon="presets/barrier/spikes.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
@@ -1641,5 +1641,5 @@
             <reference ref="barrier_5" />
         </item> <!-- Spikes -->
-        <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway" preset_name_label="true">
+        <item name="Toll Booth" icon="presets/barrier/toll_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=toll_booth"
@@ -1656,5 +1656,5 @@
             </optional>
         </item> <!-- Toll Booth -->
-        <item name="Border Control" icon="presets/douane.png" type="node" preset_name_label="true">
+        <item name="Border Control" icon="presets/barrier/douane.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=border_control" />
             <key key="barrier" value="border_control" />
@@ -1662,5 +1662,5 @@
         </item> <!-- Border Control -->
         <separator/> <!-- *** Linear Barriers *** -->
-        <item name="Hedge" icon="presets/hedge.png" type="way,closedway,multipolygon" preset_name_label="true">
+        <item name="Hedge" icon="presets/barrier/hedge.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=hedge"
@@ -1680,5 +1680,5 @@
             </optional>
         </item> <!-- Hedge -->
-        <item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
+        <item name="Fence" icon="presets/barrier/fence.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=fence"
@@ -1702,5 +1702,5 @@
             <reference ref="optional_height" />
         </item> <!-- Guard Rail -->
-        <item name="Wall" icon="presets/wall.png" type="way,closedway" preset_name_label="true">
+        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=wall"
@@ -1715,5 +1715,5 @@
             <combo key="wall" text="Type" values="dry_stone,noise_barrier" />
         </item> <!-- Wall -->
-        <item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
+        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=city_wall"
@@ -1725,5 +1725,5 @@
             <reference ref="optional_height" />
         </item> <!-- City Wall -->
-        <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway" preset_name_label="true">
+        <item name="Retaining Wall" icon="presets/barrier/retaining_wall.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
@@ -1756,5 +1756,5 @@
             </optional>
         </item> <!-- Ditch -->
-        <item name="Kerb" icon="presets/vehicle/kerb.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Kerb" icon="presets/barrier/kerb.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb"
@@ -1766,5 +1766,5 @@
         </item> <!-- Kerb -->
         <separator/> <!-- *** Access *** -->
-        <item name="Entrance (Barrier Opening)" icon="presets/vehicle/entrance.png" type="node" preset_name_label="true">
+        <item name="Entrance (Barrier Opening)" icon="presets/barrier/entrance.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=entrance"
@@ -1775,5 +1775,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Entrance (Barrier Opening) -->
-        <item name="Gate" icon="presets/vehicle/gate.png" type="node" preset_name_label="true">
+        <item name="Gate" icon="presets/barrier/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
@@ -1788,5 +1788,5 @@
             <reference ref="general_access" />
         </item> <!-- Gate -->
-        <item name="Lift Gate" icon="presets/lift_gate.png" type="node" preset_name_label="true">
+        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=lift_gate"
@@ -1800,5 +1800,5 @@
             <reference ref="general_access" />
         </item> <!-- Lift Gate -->
-        <item name="Swing Gate" icon="presets/swing_gate.png" type="node" preset_name_label="true">
+        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=swing_gate" />
             <key key="barrier" value="swing_gate" />
@@ -1808,5 +1808,5 @@
             <reference ref="general_access" />
         </item> <!-- Swing Gate -->
-        <item name="Hampshire Gate" icon="presets/empty.png" type="node" preset_name_label="true">
+        <item name="Hampshire Gate" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
@@ -1824,5 +1824,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Hampshire Gate -->
-        <item name="Bump Gate" icon="presets/empty.png" type="node" preset_name_label="true">
+        <item name="Bump Gate" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
@@ -1840,5 +1840,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Bump Gate -->
-        <item name="Kissing Gate" icon="presets/empty.png" type="node" preset_name_label="true">
+        <item name="Kissing Gate" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=kissing_gate" />
@@ -1847,5 +1847,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Kissing Gate -->
-        <item name="Chain" icon="presets/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Chain" icon="presets/barrier/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
@@ -1854,5 +1854,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Chain -->
-        <item name="Stile" icon="presets/vehicle/stile.svg" type="node" preset_name_label="true">
+        <item name="Stile" icon="presets/barrier/stile.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
             <space />
@@ -1864,5 +1864,5 @@
             <reference ref="barrier_2" />
         </item> <!-- Stile -->
-        <item name="Turnstile" icon="presets/vehicle/turnstile.png" type="node" preset_name_label="true">
+        <item name="Turnstile" icon="presets/barrier/turnstile.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=turnstile"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=turnstile"
@@ -1871,5 +1871,5 @@
             <reference ref="barrier_2" />
         </item> <!-- Turnstile -->
-        <item name="Sally Port" icon="presets/vehicle/sally_port.png" type="node" preset_name_label="true">
+        <item name="Sally Port" icon="presets/barrier/sally_port.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=sally_port"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=sally_port"
@@ -2074,5 +2074,5 @@
         </item> <!-- Canal -->
         <separator/>
-        <item name="Spring" icon="presets/misc/landmark/spring.svg" type="node,closedway" preset_name_label="true">
+        <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=spring"
@@ -2163,5 +2163,5 @@
         </item> <!-- Culvert -->
         <separator/>
-        <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Basin" icon="presets/landuse/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=basin"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=basin"
@@ -2175,5 +2175,5 @@
             <text key="name" text="Name" />
         </item> <!-- Basin -->
-        <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Reservoir" icon="presets/landuse/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=reservoir"
@@ -2186,5 +2186,5 @@
             <text key="name" text="Name" />
         </item> <!-- Reservoir -->
-        <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=reservoir_covered"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=reservoir_covered"
@@ -2252,5 +2252,5 @@
         </item> <!-- Riverbank -->
         <separator/>
-        <item name="Wetland" icon="presets/misc/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Wetland" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
@@ -2271,5 +2271,5 @@
             <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Wetland -->
-        <item name="Mud" icon="presets/misc/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Mud" icon="presets/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
@@ -2399,5 +2399,5 @@
             <check key="floating" text="Floating" />
         </item> <!-- Pier -->
-        <item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
+        <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=lock_gate"
@@ -2410,5 +2410,5 @@
             <key key="waterway" value="lock_gate" />
         </item> <!-- Lock Gate -->
-        <item name="Turning Point" icon="presets/turning.png" type="node" preset_name_label="true">
+        <item name="Turning Point" icon="presets/nautical/turning.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=turning_point"
@@ -2429,5 +2429,5 @@
             </optional>
         </item> <!-- Slipway -->
-        <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Boatyard" icon="presets/nautical/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=boatyard"
@@ -2441,5 +2441,5 @@
             <text key="name" text="Name" />
         </item> <!-- Boatyard -->
-        <item name="Dock" icon="presets/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dock" icon="presets/nautical/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dock"
@@ -2658,6 +2658,6 @@
         </item> <!-- Railway Milestone -->
     </group> <!-- Railway -->
-    <group name="Aerialway" icon="presets/aerialway.png">
-        <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
+    <group name="Aerialway" icon="presets/transport/aerialway/gondola.svg">
+        <item name="Cable Car" icon="presets/transport/aerialway/cable_car.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=cable_car"
@@ -2678,5 +2678,5 @@
             </optional>
         </item> <!-- Cable Car -->
-        <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
+        <item name="Chair Lift" icon="presets/transport/aerialway/chair_lift.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
@@ -2692,5 +2692,5 @@
             </optional>
         </item> <!-- Chair Lift -->
-        <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
+        <item name="Gondola" icon="presets/transport/aerialway/gondola.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=gondola" />
             <space />
@@ -2704,5 +2704,5 @@
             </optional>
         </item> <!-- Gondola -->
-        <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.png" type="way" preset_name_label="true">
+        <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
             <space />
@@ -2717,5 +2717,5 @@
             </optional>
         </item> <!-- Mixed Lift -->
-        <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
+        <item name="Drag Lift" icon="presets/transport/aerialway/drag_lift.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=drag_lift"
@@ -2739,5 +2739,5 @@
             </optional>
         </item> <!-- Magic Carpet -->
-        <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
+        <item name="Goods" icon="presets/transport/aerialway/goods.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=goods"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=goods" />
@@ -2750,5 +2750,5 @@
         </item> <!-- Goods -->
         <separator/>
-        <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway" preset_name_label="true">
+        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=station"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=station" />
@@ -2765,6 +2765,6 @@
     </group> <!-- Aerialway -->
     <separator/>
-    <group name="Car" icon="presets/car.png">
-        <item name="Parking" icon="presets/parking.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Car" icon="presets/shop/vehicle.svg">
+        <item name="Parking" icon="presets/vehicle/parking/parking.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking"
@@ -2810,5 +2810,5 @@
             <check key="covered" text="Covered (with roof)" />
         </item> <!-- Parking Space -->
-        <item name="Parking Entrance" icon="presets/parking.png" type="node" preset_name_label="true">
+        <item name="Parking Entrance" icon="presets/vehicle/parking/parking.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
@@ -2826,5 +2826,5 @@
         </item> <!-- Parking Entrance -->
         <separator/>
-        <item name="Fuel" icon="presets/fuel.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fuel" icon="presets/vehicle/fuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
@@ -2880,5 +2880,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Fuel -->
-        <item name="Charging Station" icon="presets/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
+        <item name="Charging Station" icon="presets/vehicle/charging_station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station"
@@ -2928,5 +2928,5 @@
             <preset_link preset_name="Payment Methods" />
         </item> <!-- Charging Station -->
-        <item name="Wash" icon="presets/car_wash.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Wash" icon="presets/vehicle/car_wash.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_wash"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_wash"
@@ -2943,5 +2943,5 @@
         </item> <!-- Wash -->
         <separator/>
-        <item name="Car Dealer" icon="presets/car.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Car Dealer" icon="presets/shop/vehicle.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car"
@@ -2961,5 +2961,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Car Dealer -->
-        <item name="Repair" icon="presets/car_repair.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Repair" icon="presets/vehicle/repair_shop.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_repair"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_repair"
@@ -2984,5 +2984,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Parts -->
-        <item name="Tires" icon="presets/tyres.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tires" icon="presets/vehicle/tyres.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tyres"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tyres"
@@ -2994,5 +2994,5 @@
         </item> <!-- Tires -->
         <separator/>
-        <item name="Rental" icon="presets/car_rental.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rental" icon="presets/vehicle/car_rental.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_rental"
@@ -3008,5 +3008,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
-        <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Sharing" icon="presets/vehicle/car_sharing.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_sharing"
@@ -3024,6 +3024,6 @@
         </item> <!-- Sharing -->
     </group> <!-- Car -->
-    <group name="Motorcycle" icon="presets/motorbike.png">
-        <item name="Parking" icon="presets/vehicle/parking/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Motorcycle" icon="presets/vehicle/motorbike.svg">
+        <item name="Parking" icon="presets/vehicle/parking/motorbike.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=motorcycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=motorcycle_parking"
@@ -3039,5 +3039,5 @@
             <check key="covered" text="Covered (with roof)" />
         </item> <!-- Parking -->
-        <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Motorcycle Dealer" icon="presets/vehicle/motorbike.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=motorcycle"
@@ -3065,6 +3065,6 @@
         </item> <!-- Motorcycle Dealer -->
     </group> <!-- Motorcycle -->
-    <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="presets/vehicle/parking/bicycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+    <group name="Bicycle" icon="presets/shop/bicycle.svg">
+        <item name="Parking" icon="presets/vehicle/parking/bicycle.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_parking"
@@ -3088,5 +3088,5 @@
             <reference ref="supervised_lit_oh" />
         </item> <!-- Parking -->
-        <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bike Dealer" icon="presets/shop/bicycle.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
@@ -3110,5 +3110,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bike Dealer -->
-        <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rental" icon="presets/vehicle/bicycle_rental.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_rental"
@@ -3145,6 +3145,6 @@
         </item> <!-- Public Bicycle Repair Station -->
     </group> <!-- Bicycle -->
-    <group name="Public Transport" icon="presets/bus.png">
-        <item name="Public Transport Route (Rail)" icon="presets/path.png" type="relation" preset_name_label="true">
+    <group name="Public Transport" icon="presets/transport/bus_old.svg">
+        <item name="Public Transport Route (Rail)" icon="presets/misc/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
             <space />
@@ -3166,5 +3166,5 @@
             </roles>
         </item> <!-- Public Transport Route (Rail) -->
-        <item name="Public Transport Route (Bus)" icon="presets/path.png" type="relation" preset_name_label="true">
+        <item name="Public Transport Route (Bus)" icon="presets/misc/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
             <space />
@@ -3186,5 +3186,5 @@
             </roles>
         </item> <!-- Public Transport Route (Bus) -->
-        <item name="Route Master" icon="presets/path.png" type="relation" preset_name_label="true">
+        <item name="Route Master" icon="presets/misc/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
             <space />
@@ -3201,5 +3201,5 @@
             </roles>
         </item> <!-- Route Master -->
-        <item name="Stop Area" type="relation" icon="presets/interpolation.png" preset_name_label="true">
+        <item name="Stop Area" type="relation" icon="presets/misc/interpolation.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
             <space />
@@ -3281,5 +3281,5 @@
         </item> <!-- Station -->
         <separator/> <!-- *** Access *** -->
-        <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
+        <item name="Subway Entrance" icon="presets/transport/underground.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
@@ -3295,5 +3295,5 @@
             </optional>
         </item> <!-- Subway Entrance -->
-        <item name="Ticket Machine" icon="presets/transport/ticket-machine.png" type="node" preset_name_label="true">
+        <item name="Ticket Machine" icon="presets/transport/ticket-machine.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -3311,6 +3311,6 @@
         </item> <!-- Ticket Machine -->
     </group> <!-- Public Transport -->
-    <group name="Public Transport (Legacy)" icon="presets/bus.png">
-        <item name="Public transport route (Legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
+    <group name="Public Transport (Legacy)" icon="presets/transport/bus_old.svg">
+        <item name="Public transport route (Legacy)" icon="presets/misc/path.png" type="relation" preset_name_label="true">
             <key key="type" value="route" />
             <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
@@ -3336,5 +3336,5 @@
             </roles>
         </item> <!-- Public transport route (Legacy) -->
-        <item name="Station" name_context="railway" icon="presets/transport/railway_station.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Station" name_context="railway" icon="presets/transport/railway_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
@@ -3350,5 +3350,5 @@
             </optional>
         </item> <!-- Station -->
-        <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
+        <item name="Railway Halt" icon="presets/transport/station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
@@ -3361,5 +3361,5 @@
             </optional>
         </item> <!-- Railway Halt -->
-        <item name="Tram Stop" icon="presets/transport/tram.png" type="node" preset_name_label="true">
+        <item name="Tram Stop" icon="presets/transport/tram.svg" type="node" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
@@ -3371,5 +3371,5 @@
             </optional>
         </item> <!-- Tram Stop -->
-        <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway,multipolygon" preset_name_label="true">
+        <item name="Railway Platform" icon="presets/transport/platform_rail.png" type="way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
@@ -3383,5 +3383,5 @@
         </item> <!-- Railway Platform -->
         <separator/>
-        <item name="Bus Station" icon="presets/bus.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bus Station" icon="presets/transport/bus_old.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station"
@@ -3395,5 +3395,5 @@
             </optional>
         </item> <!-- Bus Station -->
-        <item name="Bus Stop" icon="presets/bus_small.png" type="node" preset_name_label="true">
+        <item name="Bus Stop" icon="presets/transport/bus_small.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
@@ -3414,5 +3414,5 @@
             </optional>
         </item> <!-- Bus Stop -->
-        <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Bus Platform" icon="presets/transport/platform_bus.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=platform"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=platform"
@@ -3428,5 +3428,5 @@
         </item> <!-- Bus Platform -->
     </group> <!-- Public Transport -->
-    <item name="Taxi" icon="presets/taxi.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Taxi" icon="presets/transport/taxi.svg" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=taxi"
@@ -3444,6 +3444,6 @@
     </item> <!-- Taxi -->
     <separator/>
-    <group name="Airport" icon="presets/plane.png">
-        <item name="Airport Ground" icon="presets/plane.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Airport" icon="presets/transport/airport.svg">
+        <item name="Airport Ground" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=aerodrome"
@@ -3455,5 +3455,5 @@
         </item> <!-- Airport Ground -->
         <separator/>
-        <item name="Runway" icon="presets/runway.png" type="way,closedway" preset_name_label="true">
+        <item name="Runway" icon="presets/transport/airport/runway.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=runway"
@@ -3467,5 +3467,5 @@
             </optional>
         </item> <!-- Runway -->
-        <item name="Taxiway" icon="presets/taxiway.png" type="way,closedway" preset_name_label="true">
+        <item name="Taxiway" icon="presets/transport/airport/taxiway.png" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=taxiway"
@@ -3478,5 +3478,5 @@
             </optional>
         </item> <!-- Taxiway -->
-        <item name="Helipad" icon="presets/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
+        <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=helipad"
@@ -3490,5 +3490,5 @@
             </optional>
         </item> <!-- Helipad -->
-        <item name="Apron" icon="presets/apron.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Apron" icon="presets/transport/airport/apron.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=apron"
@@ -3504,5 +3504,5 @@
             <text key="ref" text="Reference" />
         </item> <!-- Plane Parking Position -->
-        <item name="Hangar" icon="presets/hangar.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hangar" icon="presets/transport/airport/hangar.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=hangar"
@@ -3513,5 +3513,5 @@
             <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
         </item> <!-- Hangar -->
-        <item name="Beacon" icon="presets/misc/landmark/beacon.png" type="node" preset_name_label="true">
+        <item name="Beacon" icon="presets/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
@@ -3520,5 +3520,5 @@
             <key key="man_made" value="beacon" />
         </item> <!-- Beacon -->
-        <item name="Windsock" icon="presets/transport/airport/windsock.png" type="node" preset_name_label="true">
+        <item name="Windsock" icon="presets/transport/airport/windsock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock"
@@ -3527,5 +3527,5 @@
         </item> <!-- Windsock -->
         <separator/>
-        <item name="Terminal" icon="presets/transport/airport/terminal.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Terminal" icon="presets/transport/airport/terminal.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=terminal"
@@ -3540,5 +3540,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Terminal -->
-        <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
+        <item name="Gate" name_context="airport" icon="presets/transport/airport/gate.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=gate"
@@ -3551,6 +3551,6 @@
     </group> <!-- Airport -->
   </group> <!-- Transport -->
-  <group name="Facilities" icon="presets/bed.png">
-    <group name="Accommodation" icon="presets/bed.png">
+  <group name="Facilities" icon="presets/accommodation/hotel.svg">
+    <group name="Accommodation" icon="presets/accommodation/hotel.svg">
         <item name="Hotel" icon="presets/accommodation/hotel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
@@ -3598,5 +3598,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Motel -->
-        <item name="Guest House/Bed &amp; Breakfast" icon="presets/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Guest House/Bed &amp; Breakfast" icon="presets/accommodation/guest_house.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=guest_house"
@@ -3705,5 +3705,5 @@
         </item> <!-- Wilderness Hut -->
         <separator/>
-        <item name="Caravan Site/RV Park" icon="presets/accommodation/camping/caravan.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Caravan Site/RV Park" icon="presets/accommodation/caravan.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=caravan_site"
@@ -3728,5 +3728,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Caravan Site/RV Park -->
-        <item name="Camping Site" icon="presets/accommodation/camping.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Camping Site" icon="presets/accommodation/camping.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=camp_site"
@@ -3775,5 +3775,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Restaurant -->
-        <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fast Food" icon="presets/food/fastfood.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
@@ -3813,5 +3813,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Food Court -->
-        <item name="Cafe" icon="presets/cafe.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Cafe" icon="presets/food/cafe.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
@@ -3887,5 +3887,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beer Garden -->
-        <item name="Bar" icon="presets/food/bar.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bar" icon="presets/food/bar.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
@@ -3908,6 +3908,6 @@
         </item> <!-- Bar -->
     </group> <!-- Food+Drinks -->
-    <group name="Tourism" icon="presets/sightseeing.png">
-        <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Tourism" icon="presets/sightseeing/attraction.svg">
+        <item name="Attraction" icon="presets/sightseeing/attraction.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=attraction"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=attraction"
@@ -3921,5 +3921,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Attraction -->
-        <item name="Viewpoint" icon="presets/sightseeing/viewpoint.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Viewpoint" icon="presets/sightseeing/viewpoint.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=viewpoint"
@@ -3936,5 +3936,5 @@
         </item> <!-- Viewpoint -->
         <separator/>
-        <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Information Office" icon="presets/misc/information/informationoffice.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:information"
@@ -3952,5 +3952,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Information Office -->
-        <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
+        <item name="Map" icon="presets/misc/information/map.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -3977,5 +3977,5 @@
             </optional>
         </item> <!-- Map -->
-        <item name="Information Board" icon="presets/board.png" type="node" preset_name_label="true">
+        <item name="Information Board" icon="presets/misc/information/board.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -3992,5 +3992,5 @@
             <text key="description" text="Closer Description" />
         </item> <!-- Information Board -->
-        <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
+        <item name="Guidepost" icon="presets/misc/information/guidepost.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:information=guidepost"
@@ -4015,5 +4015,5 @@
             </optional>
         </item> <!-- Guidepost -->
-        <item name="Information Terminal" icon="presets/misc/information.png" type="node" preset_name_label="true">
+        <item name="Information Terminal" icon="presets/misc/information/information.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -4033,5 +4033,5 @@
             <reference ref="internet" />
         </item> <!-- Information Terminal -->
-        <item name="Audio Guide" icon="presets/misc/information.png" type="node" preset_name_label="true">
+        <item name="Audio Guide" icon="presets/misc/information/information.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -4053,5 +4053,5 @@
             <text key="phone" text="Phone number" />
         </item> <!-- Audio Guide -->
-        <item name="Other Information Point" icon="presets/misc/information.png" type="node,closedway" preset_name_label="true">
+        <item name="Other Information Point" icon="presets/misc/information/information.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=information"
@@ -4068,6 +4068,6 @@
         </item> <!-- Other Information Point -->
     </group> <!-- Tourism -->
-    <group name="Leisure" icon="presets/theme_park.png">
-        <item name="Movie Theater/Cinema" icon="presets/cinema.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Leisure" icon="presets/leisure/theme_park.svg">
+        <item name="Movie Theater/Cinema" icon="presets/leisure/cinema.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cinema"
@@ -4087,5 +4087,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Movie Theater/Cinema -->
-        <item name="Zoo" icon="presets/zoo.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Zoo" icon="presets/leisure/zoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=zoo"
@@ -4103,5 +4103,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Zoo -->
-        <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dog Park" icon="presets/leisure/dogpark.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:leisure=dog_park"
@@ -4121,5 +4121,5 @@
             <check key="lit" text="Lit" />
         </item> <!-- Dog Park -->
-        <item name="Amusement/Theme Park" icon="presets/theme_park.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Amusement/Theme Park" icon="presets/leisure/theme_park.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=theme_park"
@@ -4149,5 +4149,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Water Park -->
-        <item name="Swimming Pool" icon="presets/sport/pool.png" type="node,closedway" preset_name_label="true">
+        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
                   ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:leisure=swimming_pool"
@@ -4172,5 +4172,5 @@
             <text key="description" text="Description" />
         </item> <!-- Fitness Station -->
-        <item name="Sauna" icon="presets/sauna.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Sauna" icon="presets/leisure/sauna.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=sauna"
@@ -4184,5 +4184,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Sauna -->
-        <item name="Horse Riding" icon="presets/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Horse Riding" icon="presets/leisure/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
             <space />
@@ -4194,5 +4194,5 @@
         </item> <!-- Horse Riding -->
         <separator/>
-        <item name="Playground" icon="presets/leisure/playground.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Playground" icon="presets/leisure/playground.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=playground"
@@ -4229,5 +4229,5 @@
             <check key="covered" text="Covered" />
         </item> <!-- Picnic Table -->
-        <item name="Public Grill" icon="presets/bbq.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Public Grill" icon="presets/leisure/bbq.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
@@ -4331,5 +4331,5 @@
         </item> <!-- Brothel -->
     </group> <!-- Leisure -->
-    <group name="Culture" icon="presets/theater.png">
+    <group name="Culture" icon="presets/leisure/theater.png">
         <item name="Museum" icon="presets/sightseeing/museum.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
@@ -4348,5 +4348,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Museum -->
-        <item name="Theatre" icon="presets/theater.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Theatre" icon="presets/leisure/theater.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=theatre"
@@ -4378,5 +4378,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Library -->
-        <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Arts Centre" icon="presets/service/arts_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=arts_centre"
@@ -4390,5 +4390,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Arts Centre -->
-        <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Artwork" icon="presets/service/arts_centre.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=artwork"
@@ -4407,5 +4407,5 @@
             <text key="artist_name" text="Artist Name" />
         </item> <!-- Artwork -->
-        <item name="Studio" icon="presets/studio.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Studio" icon="presets/service/studio.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=studio"
@@ -4421,6 +4421,6 @@
         </item> <!-- Studio -->
     </group> <!-- Culture -->
-    <group name="Place of Worship" icon="presets/religion.png">
-        <item name="Church" icon="presets/religion/church.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Place of Worship" icon="presets/religion/religion.svg">
+        <item name="Church" icon="presets/religion/church.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4448,5 +4448,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Church -->
-        <item name="Mosque" icon="presets/religion/muslim.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Mosque" icon="presets/religion/muslim.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4473,5 +4473,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Mosque -->
-        <item name="Synagogue" icon="presets/religion/jewish.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Synagogue" icon="presets/religion/jewish.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4498,5 +4498,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Synagogue -->
-        <item name="Buddhist Temple" icon="presets/religion/buddhism.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Buddhist Temple" icon="presets/religion/buddhism.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4522,5 +4522,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Buddhist Temple -->
-        <item name="Hindu Temple" icon="presets/religion/hinduism.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hindu Temple" icon="presets/religion/hinduism.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4546,5 +4546,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Hindu Temple -->
-        <item name="Shinto Shrine" icon="presets/religion/shinto.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Shinto Shrine" icon="presets/religion/shinto.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4569,5 +4569,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Shinto Shrine -->
-        <item name="Other Place of Worship" icon="presets/religion.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Other Place of Worship" icon="presets/religion/religion.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4593,6 +4593,6 @@
         </item> <!-- Other Place of Worship -->
     </group> <!-- Place of Worship -->
-    <group name="Public Building" icon="presets/townhall.png">
-        <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Public Building" icon="presets/service/townhall.png">
+        <item name="Town Hall" icon="presets/service/townhall.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
@@ -4608,5 +4608,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Town Hall -->
-        <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Community Centre" icon="presets/service/community_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
@@ -4623,5 +4623,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Community Centre -->
-        <item name="Embassy" icon="presets/embassy.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Embassy" icon="presets/service/embassy.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=embassy"
@@ -4636,5 +4636,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Embassy -->
-        <item name="Courthouse" icon="presets/service/administration/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
@@ -4649,5 +4649,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Courthouse -->
-        <item name="Prison" icon="presets/service/administration/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Prison" icon="presets/service/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
@@ -4661,5 +4661,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Prison -->
-        <item name="Police" icon="presets/service/police.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Police" icon="presets/service/police.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=police"
@@ -4683,5 +4683,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Ranger Station -->
-        <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fire Station" icon="presets/service/firebrigade.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fire_station"
@@ -4716,6 +4716,6 @@
         </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
-    <group name="Education" icon="presets/school.png">
-        <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Education" icon="presets/education/school.png">
+        <item name="Kindergarten" icon="presets/education/kindergarten.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=kindergarten"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=kindergarten"
@@ -4732,5 +4732,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Kindergarten -->
-        <item name="School" icon="presets/school.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="School" icon="presets/education/school.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:amenity=school"
@@ -4923,5 +4923,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Ambulance Station -->
-        <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
+        <item name="Automated Defibrillator" icon="presets/emergency/aed.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
@@ -4963,5 +4963,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Fire Hose -->
-        <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
+        <item name="Fire Hydrant" icon="presets/service/fire_hydrant.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
@@ -5003,5 +5003,5 @@
             <reference ref="name_ref_operator" />
         </item> <!-- Assembly Point -->
-        <item name="Emergency Phone" icon="presets/vehicle/emergency_phone.png" type="node" preset_name_label="true">
+        <item name="Emergency Phone" icon="presets/vehicle/emergency_phone.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
@@ -5115,6 +5115,6 @@
         </item> <!-- Food Bank -->
     </group> <!-- Social Facility -->
-    <group name="Facilities" icon="presets/telephone.png">
-        <item name="Toilets/Restrooms" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
+    <group name="Facilities" icon="presets/service/telephone.svg">
+        <item name="Toilets/Restrooms" icon="presets/service/toilets.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets"
@@ -5173,5 +5173,5 @@
             <check key="drive_through" text="Drive through" />
         </item> <!-- Post Box -->
-        <item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
+        <item name="Telephone" icon="presets/service/telephone.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=telephone"
@@ -5190,5 +5190,5 @@
             <preset_link preset_name="Payment Methods" />
         </item> <!-- Telephone -->
-        <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
+        <item name="Internet Access" icon="presets/service/network-wireless.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:internet_access"
@@ -5293,5 +5293,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Recycling Centre-->
-        <item name="Waste Basket/Trash Can" icon="presets/service/recycling/trash-bin.png" type="node" preset_name_label="true">
+        <item name="Waste Basket/Trash Can" icon="presets/service/recycling/trash-bin.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
@@ -5330,5 +5330,5 @@
         </item> <!-- Sanitary Dump Station -->
         <separator/>
-        <item name="Bench" icon="presets/bench.png" type="node,way" preset_name_label="true">
+        <item name="Bench" icon="presets/leisure/bench.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
@@ -5372,5 +5372,5 @@
             </combo>
         </item> <!-- Shelter -->
-        <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node" preset_name_label="true">
+        <item name="Hunting Stand" icon="presets/landmark/hunting_stand.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hunting_stand"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=hunting_stand"
@@ -5404,5 +5404,5 @@
             </optional>
         </item> <!-- Drinking Water -->
-        <item name="Water Point" icon="presets/accommodation/camping/water.png" type="node" preset_name_label="true">
+        <item name="Water Point" icon="presets/accommodation/chalet.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=water_point" />
             <space />
@@ -5449,6 +5449,6 @@
     </group> <!-- Facilities -->
   </group>  <!-- Facilities -->
-  <group name="Sports" icon="presets/sport/soccer.png">
-    <group name="Sport Facilities" icon="presets/stadium.png">
+  <group name="Sports" icon="presets/sport/soccer.svg">
+    <group name="Sport Facilities" icon="presets/sport/stadium.png">
         <item name="Stadium" icon="presets/sport/stadium.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
@@ -5480,5 +5480,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Sports Centre -->
-        <item name="Fitness Centre" icon="presets/fitness_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fitness Centre" icon="presets/sport/fitness_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fitness_centre" />
             <space />
@@ -5660,6 +5660,6 @@
         </item> <!-- Miniature Golf -->
     </group> <!-- Sport Facilities -->
-    <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="presets/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Sport" icon="presets/sport/multi.svg">
+        <item name="Multi" icon="presets/sport/multi.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=multi" />
@@ -5669,5 +5669,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
         </item> <!-- Multi -->
-        <item name="Nine-pin Bowling" icon="presets/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Nine-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
@@ -5677,5 +5677,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Nine-pin Bowling -->
-        <item name="Ten-pin Bowling" icon="presets/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ten-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
@@ -5685,5 +5685,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Ten-pin Bowling -->
-        <item name="Archery" icon="presets/sport/archery.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Archery" icon="presets/sport/archery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
@@ -5693,5 +5693,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Archery -->
-        <item name="Track and Field Athletics" icon="presets/athletics.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Track and Field Athletics" icon="presets/sport/athletics.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
             <space />
@@ -5707,5 +5707,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item> <!-- Running -->
-        <item name="Climbing" icon="presets/sport/climbing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Climbing" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
@@ -5723,5 +5723,5 @@
             <text key="name" text="Name" />
         </item> <!-- Canoeing/Kayaking -->
-        <item name="Cycling" icon="presets/sport/cycling.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Cycling" icon="presets/sport/cycling.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
@@ -5737,5 +5737,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Dog Racing -->
-        <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Equestrian" icon="presets/leisure/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
             <space />
@@ -5744,5 +5744,5 @@
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
-        <item name="Horse Racing" icon="presets/sport/riding.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <space />
@@ -5751,5 +5751,5 @@
             <reference ref="riding_surface" />
         </item> <!-- Horse Racing -->
-        <item name="Gymnastics" icon="presets/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Gymnastics" icon="presets/sport/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
             <space />
@@ -5758,5 +5758,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium" />
         </item> <!-- Gymnastics -->
-        <item name="Ice Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ice Skating" icon="presets/sport/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_skating" />
             <space />
@@ -5772,5 +5772,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Roller Skating -->
-        <item name="Skateboard" icon="presets/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Skateboard" icon="presets/sport/skateboard.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
@@ -5780,5 +5780,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item> <!-- Skateboard -->
-        <item name="Swimming" icon="presets/sport/pool.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Swimming" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=swimming"
@@ -5797,5 +5797,5 @@
             <text key="name" text="Name" />
         </item> <!-- Scuba Diving -->
-        <item name="Skiing" icon="presets/sport/skiing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Skiing" icon="presets/sport/skiing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -5810,5 +5810,5 @@
             </optional>
         </item> <!-- Skiing -->
-        <item name="Shooting" icon="presets/range.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Shooting" icon="presets/sport/range.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=shooting"
@@ -5822,6 +5822,6 @@
         </item> <!-- Shooting -->
     </group> <!-- Sport -->
-    <group name="Sport (Ball)" icon="presets/sport/soccer.png">
-        <item name="Soccer" icon="presets/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Sport (Ball)" icon="presets/sport/soccer.svg">
+        <item name="Soccer" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
@@ -5833,5 +5833,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Soccer -->
-        <item name="Australian Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Australian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
             <space />
@@ -5839,5 +5839,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Australian Football -->
-        <item name="American Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="American Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
             <space />
@@ -5845,5 +5845,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- American Football -->
-        <item name="Canadian Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Canadian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
             <space />
@@ -5851,5 +5851,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Canadian Football -->
-        <item name="Gaelic Games" icon="presets/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Gaelic Games" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <space />
@@ -5863,5 +5863,5 @@
             </optional>
         </item> <!-- Gaelic Games -->
-        <item name="Rugby League" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rugby League" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
@@ -5870,5 +5870,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby League -->
-        <item name="Rugby Union" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rugby Union" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
@@ -5877,5 +5877,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby Union -->
-        <item name="Baseball" icon="presets/sport/baseball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Baseball" icon="presets/sport/baseball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <space />
@@ -5883,5 +5883,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Baseball -->
-        <item name="Basketball" icon="presets/sport/basketball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Basketball" icon="presets/sport/basketball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
             <space />
@@ -5889,5 +5889,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Basketball -->
-        <item name="Handball" icon="presets/sport/handball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Handball" icon="presets/sport/handball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=handball" />
             <space />
@@ -5896,5 +5896,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Handball -->
-        <item name="Volleyball" icon="presets/sport/volleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Volleyball" icon="presets/sport/volleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
             <space />
@@ -5903,5 +5903,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Volleyball -->
-        <item name="Beach Volleyball" icon="presets/beachvolleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Beach Volleyball" icon="presets/sport/beachvolleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
             <space />
@@ -5927,5 +5927,5 @@
             <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
         </item> <!-- Golf -->
-        <item name="Boule" icon="presets/boule.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
             <space />
@@ -5933,5 +5933,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Boule -->
-        <item name="Lawn Bowling" icon="presets/boule.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Lawn Bowling" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
             <space />
@@ -5939,5 +5939,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Lawn Bowling -->
-        <item name="Cricket" icon="presets/sport/cricket.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Cricket" icon="presets/sport/cricket.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <space />
@@ -5945,5 +5945,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Cricket -->
-        <item name="Croquet" icon="presets/sport/croquet.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Croquet" icon="presets/sport/croquet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
             <space />
@@ -5951,5 +5951,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Croquet -->
-        <item name="Field Hockey" icon="presets/field_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Field Hockey" icon="presets/sport/field_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=field_hockey" />
             <space />
@@ -5958,5 +5958,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Field Hockey -->
-        <item name="Ice Hockey" icon="presets/ice_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ice Hockey" icon="presets/sport/ice_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_hockey" />
             <space />
@@ -5965,5 +5965,5 @@
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
         </item> <!-- Ice Hockey -->
-        <item name="Pelota" icon="presets/pelota.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pelota" icon="presets/sport/pelota.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota" />
@@ -5972,5 +5972,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Pelota -->
-        <item name="Racquetball" icon="presets/sport/racquetball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Racquetball" icon="presets/sport/racquetball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
@@ -5980,5 +5980,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Racquetball -->
-        <item name="Table Tennis/Ping-Pong" icon="presets/table_tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Table Tennis/Ping-Pong" icon="presets/sport/table_tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
             <space />
@@ -5987,5 +5987,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Table Tennis/Ping-Pong -->
-        <item name="Tennis" icon="presets/sport/tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tennis" icon="presets/sport/tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <space />
@@ -5994,5 +5994,5 @@
         </item> <!-- Tennis -->
     </group> <!-- Sport (Ball) -->
-    <group name="Motorsport" icon="presets/motorbike.png">
+    <group name="Motorsport" icon="presets/vehicle/motorbike.svg">
         <item name="Motorsport" icon="presets/sport/motor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motor"
@@ -6003,5 +6003,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Motorsport -->
-        <item name="Kart Racing" icon="presets/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Kart Racing" icon="presets/sports/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
@@ -6011,5 +6011,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item> <!-- Kart Racing -->
-        <item name="Motocross" icon="presets/sport/motocross.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motocross"
@@ -6021,5 +6021,5 @@
         </item> <!-- Motocross -->
         <separator/>
-        <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Model Aerodrome" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=model_aerodrome" />
             <space />
@@ -6028,5 +6028,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item> <!-- Model Aerodrome -->
-        <item name="RC Car" icon="presets/transport/car.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="RC Car" icon="presets/sport/rc_car.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
@@ -6048,7 +6048,7 @@
     </group> <!-- Motorsport -->
   </group> <!-- Sports -->
-  <group name="Man Made" icon="presets/works.png">
-    <group name="Man Made" icon="presets/works.png">
-        <item name="Building" icon="presets/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
+  <group name="Man Made" icon="presets/landmark/works.svg">
+    <group name="Man Made" icon="presets/landmark/works.svg">
+        <item name="Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
@@ -6074,5 +6074,5 @@
             <preset_link preset_name="Addresses" />
         </item> <!-- Building -->
-        <item name="Residential Building" icon="presets/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Residential Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
@@ -6097,5 +6097,5 @@
             <preset_link preset_name="Addresses" />
         </item> <!-- Residential Building -->
-        <item name="Building part" icon="presets/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Building part" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building:part"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building:part"
@@ -6138,5 +6138,5 @@
             </optional>
         </item> <!-- Entrance -->
-        <item name="Tower" icon="presets/misc/landmark/tower.png" type="node,closedway" preset_name_label="true">
+        <item name="Tower" icon="presets/landmark/tower.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=tower"
@@ -6156,5 +6156,5 @@
             </optional>
         </item> <!-- Tower -->
-        <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
+        <item name="Flagpole" icon="presets/misc/flag.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=flagpole"
@@ -6165,5 +6165,5 @@
         </item> <!-- Flagpole -->
         <separator/>
-        <item name="Works" icon="presets/misc/landmark/works.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Works" icon="presets/landmark/works.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=works"
@@ -6177,5 +6177,5 @@
             <text key="name" text="Name" />
         </item> <!-- Works -->
-        <item name="Chimney" icon="presets/chimney.png" type="node,closedway" preset_name_label="true">
+        <item name="Chimney" icon="presets/landmark/chimney.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=chimney"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=chimney"
@@ -6187,5 +6187,5 @@
             <text key="height" text="Height (meters)" />
         </item> <!-- Chimney -->
-        <item name="Windmill" icon="presets/misc/landmark/windmill.png" type="node,closedway" preset_name_label="true">
+        <item name="Windmill" icon="presets/landmark/windmill.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=windmill"
@@ -6200,5 +6200,5 @@
             <text key="name" text="Name" />
         </item> <!-- Windmill -->
-        <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
+        <item name="Gasometer" icon="presets/landmark/gasometer.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=gasometer"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=gasometer"
@@ -6212,5 +6212,5 @@
             </optional>
         </item> <!-- Gasometer -->
-        <item name="Silo" icon="presets/silo.png" type="node,closedway" preset_name_label="true">
+        <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=silo" />
             <space />
@@ -6222,5 +6222,5 @@
             </optional>
         </item> <!-- Silo -->
-        <item name="Storage Tank" icon="presets/storage_tank.png" type="node,closedway">
+        <item name="Storage Tank" icon="presets/landmark/storage_tank.svg" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=storage_tank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=storage_tank"
@@ -6235,5 +6235,5 @@
             </optional>
         </item> <!-- Storage Tank -->
-        <item name="Bunker Silo" icon="presets/bunker_silo.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bunker_silo"
@@ -6246,5 +6246,5 @@
             </optional>
         </item> <!-- Bunker Silo -->
-        <item name="Crane" icon="presets/crane.png" type="node,way,closedway" preset_name_label="true">
+        <item name="Crane" icon="presets/landmark/crane.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=crane"
@@ -6257,5 +6257,5 @@
             <text key="name" text="Name" />
         </item> <!-- Crane -->
-        <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway" preset_name_label="true">
+        <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=mineshaft"
@@ -6274,5 +6274,5 @@
             <check key="disused" text="Disused" />
         </item> <!-- Mineshaft -->
-        <item name="Adit" icon="presets/adit.png" type="node" preset_name_label="true">
+        <item name="Adit" icon="presets/landmark/adit.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=adit"
@@ -6302,5 +6302,5 @@
         </item> <!-- Embankment -->
         <separator/>
-        <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
+        <item name="Pipeline" icon="presets/misc/path.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
@@ -6334,5 +6334,5 @@
         </item> <!-- Pipeline Valve -->
         <separator/>
-        <item name="Water Tower" icon="presets/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="presets/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_tower"
@@ -6349,5 +6349,5 @@
             </optional>
         </item> <!-- Water Tower -->
-        <item name="Water Works" icon="presets/water_works.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Water Works" icon="presets/landmark/water_works.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_works"
@@ -6361,5 +6361,5 @@
             <reference ref="name_operator" />
         </item> <!-- Water Works -->
-        <item name="Wastewater Treatment Plant" icon="presets/wastewater_plant.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Wastewater Treatment Plant" icon="presets/landmark/wastewater_plant.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=wastewater_plant"
@@ -6375,5 +6375,5 @@
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="presets/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/landmark/watermill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
@@ -6403,5 +6403,5 @@
             <text key="name" text="Name" />
         </item> <!-- Fountain -->
-        <item name="Water Well" icon="presets/water_well.png" type="node,closedway" preset_name_label="true">
+        <item name="Water Well" icon="presets/landmark/water_well.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_well"
@@ -6418,5 +6418,5 @@
         </item> <!-- Water Well -->
         <separator/>
-        <item name="Lighthouse" icon="presets/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
+        <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=lighthouse"
@@ -6429,5 +6429,5 @@
             <text key="name" text="Name" />
         </item> <!-- Lighthouse -->
-        <item name="Beacon" icon="presets/misc/landmark/beacon.png" type="node,closedway" preset_name_label="true">
+        <item name="Beacon" icon="presets/landmark/beacon.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
@@ -6446,5 +6446,5 @@
             <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" values_no_i18n="true" />
         </item> <!-- Street Lamp -->
-        <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
+        <item name="Monitoring Station" icon="presets/misc/monitoring_station.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=monitoring_station"
@@ -6484,5 +6484,5 @@
             </checkgroup>
         </item> <!-- Monitoring Station -->
-        <item name="Survey Point" icon="presets/misc/landmark/survey_point.png" type="node" preset_name_label="true">
+        <item name="Survey Point" icon="presets/landmark/survey_point.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=survey_point"
@@ -6498,5 +6498,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Survey Point -->
-        <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
+        <item name="Surveillance Camera" icon="presets/service/surveillance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=surveillance"
@@ -6574,6 +6574,6 @@
         </item> <!-- Bridge outline -->
     </group> <!-- Bridges -->
-    <group name="Military" name_context="preset group" icon="presets/military.png">
-        <item name="Airfield" icon="presets/transport/airport/airfield.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Military" name_context="preset group" icon="presets/landuse/military.svg">
+        <item name="Airfield" icon="presets/transport/airport/airfield.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=airfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=airfield"
@@ -6591,5 +6591,5 @@
             <key key="military" value="barracks" />
         </item> <!-- Barracks -->
-        <item name="Bunker" icon="presets/misc/landmark/bunker.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bunker" icon="presets/landmark/bunker.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=bunker"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:military=bunker"
@@ -6606,5 +6606,5 @@
             <check key="ruins" text="Ruins" />
         </item> <!-- Bunker -->
-        <item name="Range" icon="presets/misc/landmark/range.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Range" icon="presets/sport/range.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=range"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=range"
@@ -6640,5 +6640,5 @@
         </item> <!-- Power Plant -->
         <group name="Power Generator" icon="presets/power/generator.svg">
-            <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Biofuel Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biofuel" />
                 <reference ref="power_generator" />
@@ -6647,5 +6647,5 @@
                 <reference ref="power_output" />
             </item> <!-- Power Generator -->
-            <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Biogas Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biogas" />
                 <reference ref="power_generator" />
@@ -6654,5 +6654,5 @@
                 <reference ref="power_output" />
             </item> <!-- Biogas Power Generator -->
-            <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Biomass Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biomass" />
                 <reference ref="power_generator" />
@@ -6666,5 +6666,5 @@
                 <reference ref="power_output" />
             </item> <!-- Biomass Power Generator -->
-            <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Coal Power Generator" icon="presets/power/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="coal" />
                 <reference ref="power_generator" />
@@ -6673,5 +6673,5 @@
                 <reference ref="power_output" />
             </item> <!-- Coal Power Generator -->
-            <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Gas Power Generator" icon="presets/power/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="gas" />
                 <reference ref="power_generator" />
@@ -6680,5 +6680,5 @@
                 <reference ref="power_output" />
             </item> <!-- Gas Power Generator -->
-            <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Oil Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="oil" />
                 <reference ref="power_generator" />
@@ -6687,5 +6687,5 @@
                 <reference ref="power_output" />
             </item> <!-- Oil Power Generator -->
-            <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Diesel Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="diesel" />
                 <reference ref="power_generator" />
@@ -6694,5 +6694,5 @@
                 <reference ref="power_output" />
             </item> <!-- Diesel Power Generator -->
-            <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Gasoline Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="gasoline" />
                 <reference ref="power_generator" />
@@ -6701,5 +6701,5 @@
                 <reference ref="power_output" />
             </item> <!-- Gasoline Power Generator -->
-            <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Nuclear Reactor" icon="presets/power/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="nuclear" />
                 <reference ref="power_generator" />
@@ -6726,5 +6726,5 @@
                 <reference ref="power_output" />
             </item> <!-- Nuclear Reactor -->
-            <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Solar Power Generator" icon="presets/power/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="solar" />
                 <reference ref="power_generator" />
@@ -6737,5 +6737,5 @@
                 <reference ref="power_output" />
             </item> <!-- Solar Power Generator -->
-            <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Waste Power Generator" icon="presets/power/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="waste" />
                 <reference ref="power_generator" />
@@ -6750,5 +6750,5 @@
                 <reference ref="power_output" />
             </item> <!-- Waste Power Generator -->
-            <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway" preset_name_label="true">
+            <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
                 <key key="generator:source" value="hydro" />
                 <reference ref="power_generator" />
@@ -6762,5 +6762,5 @@
                 <reference ref="power_output" />
             </item> <!-- Water Turbine -->
-            <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway" preset_name_label="true">
+            <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
                 <key key="generator:source" value="tidal" />
                 <reference ref="power_generator" />
@@ -6773,15 +6773,15 @@
                 <reference ref="power_output" />
             </item> <!-- Tidal Water Turbine -->
-            <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Wave Energy Converter" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="wave" />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
             </item> <!-- Wave Energy Converter -->
-            <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Osmotic Power Generator" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="osmotic" />
                 <reference ref="power_generator" />
                 <reference ref="power_output" />
             </item> <!-- Osmotic Power Generator -->
-            <item name="Geothermal Power Generator" icon="presets/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <item name="Geothermal Power Generator" icon="presets/power/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="geothermal" />
                 <reference ref="power_generator" />
@@ -6789,5 +6789,5 @@
                 <reference ref="power_output" />
             </item> <!-- Geothermal Power Generator -->
-            <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway" preset_name_label="true">
+            <item name="Wind Turbine" icon="presets/power/power_source-wind.svg" type="node,closedway" preset_name_label="true">
                 <key key="generator:source" value="wind" />
                 <reference ref="power_generator" />
@@ -7062,5 +7062,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Castle -->
-        <item name="Ruins" icon="presets/ruins.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ruins" icon="presets/sightseeing/ruins.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=ruins"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=ruins"
@@ -7074,5 +7074,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Ruins -->
-        <item name="Archaeological Site" icon="presets/sightseeing/archaeological.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Archaeological Site" icon="presets/sightseeing/archaeological.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
@@ -7086,5 +7086,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Archaeological Site -->
-        <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Battlefield" icon="presets/sightseeing/battlefield.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=battlefield"
@@ -7098,5 +7098,5 @@
             <text key="name" text="Name" />
         </item> <!-- Battlefield -->
-        <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Palaeontological Site" icon="presets/sightseeing/palaeontological_site.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:geological=palaeontological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:geological=palaeontological_site"
@@ -7109,5 +7109,5 @@
         </item> <!-- Palaeontological Site -->
         <separator/>
-        <item name="Monument" icon="presets/monument.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Monument" icon="presets/sightseeing/monument.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=monument"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=monument"
@@ -7122,5 +7122,5 @@
             <text key="name" text="Name" />
         </item> <!-- Monument -->
-        <item name="Memorial" icon="presets/memorial.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Memorial" icon="presets/sightseeing/memorial.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=memorial"
@@ -7142,5 +7142,5 @@
             </optional>
         </item> <!-- Memorial -->
-        <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
+        <item name="Wayside Cross" icon="presets/religion/wayside_cross.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_cross"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_cross"
@@ -7157,5 +7157,5 @@
             <text key="inscription" text="Inscription" />
         </item> <!-- Wayside Cross -->
-        <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
+        <item name="Wayside Shrine" icon="presets/religion/wayside_shrine.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_shrine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_shrine"
@@ -7176,5 +7176,5 @@
             <text key="inscription" text="Inscription" />
         </item> <!-- Wayside Shrine -->
-        <item name="Boundary Stone" icon="presets/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
+        <item name="Boundary Stone" icon="presets/misc/boundary_stone.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=boundary_stone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=boundary_stone"
@@ -7189,5 +7189,5 @@
     </group> <!-- Historic Places -->
   </group> <!-- Man Made -->
-  <group name="Shops" icon="presets/shop/mall.png">
+  <group name="Shops" icon="presets/shop/mall.svg">
     <group name="Food" icon="presets/shop/supermarket.svg">
         <item name="Supermarket" icon="presets/shop/supermarket.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -7205,5 +7205,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Supermarket -->
-        <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Convenience Store" icon="presets/shop/convenience.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=convenience"
@@ -7219,5 +7219,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Convenience Store -->
-        <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Kiosk" icon="presets/shop/kiosk.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
@@ -7234,5 +7234,5 @@
         </item> <!-- Kiosk -->
         <separator/>
-        <item name="Bakery" icon="presets/baker.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bakery" icon="presets/shop/groceries/bakery.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:shop=bakery"
@@ -7266,5 +7266,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Butcher -->
-        <item name="Seafood" icon="presets/seafood.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Seafood" icon="presets/shop/groceries/seafood.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=seafood"
@@ -7278,5 +7278,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Seafood -->
-        <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
@@ -7291,5 +7291,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Deli (Fine Food) -->
-        <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Candy Store" icon="presets/shop/groceries/confectionery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=confectionery"
@@ -7326,5 +7326,5 @@
         </item> <!-- Coffee -->
         <separator/>
-        <item name="Public Market" icon="presets/place/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Public Market" icon="presets/shop/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
@@ -7342,5 +7342,5 @@
             <combo key="organic" text="Organic" values="only,yes,no" />
         </item> <!-- Public Market -->
-        <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Greengrocer" icon="presets/shop/groceries/greengrocer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=greengrocer"
@@ -7356,5 +7356,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
-        <item name="Farm Stand" icon="presets/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Farm Stand" icon="presets/shop/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
@@ -7386,5 +7386,5 @@
         </item> <!-- Fair Trade -->
         <separator/>
-        <item name="Alcohol" icon="presets/shop/alcohol.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Alcohol" icon="presets/shop/alcohol.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=alcohol"
@@ -7400,5 +7400,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Alcohol -->
-        <item name="Beverages" icon="presets/shop/beverages.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Beverages" icon="presets/shop/beverages.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
@@ -7422,6 +7422,6 @@
         </item> <!-- Wine -->
     </group> <!-- Food -->
-    <group name="Clothes" icon="presets/shop/clothes.png">
-        <item name="Clothes" icon="presets/shop/clothes.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Clothes" icon="presets/shop/clothes.svg">
+        <item name="Clothes" icon="presets/shop/clothes.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=clothes"
@@ -7440,5 +7440,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Clothes -->
-        <item name="Boutique" icon="presets/boutique.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Boutique" icon="presets/shop/boutique.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=boutique"
@@ -7452,5 +7452,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Boutique -->
-        <item name="Shoes" icon="presets/shop/shoes.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Shoes" icon="presets/shop/shoes.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
@@ -7464,5 +7464,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Shoes -->
-        <item name="Outdoor" icon="presets/shop/outdoor.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Outdoor" icon="presets/shop/outdoor.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -7475,5 +7475,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Outdoor -->
-        <item name="Sports" icon="presets/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Sports" icon="presets/sport/multi.svg" type="node,closedway,multipolygon" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=sports"
@@ -7486,5 +7486,5 @@
         </item> <!-- Sports -->
         <separator/>
-        <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dry Cleaning" icon="presets/shop/laundry.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
@@ -7498,5 +7498,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Dry Cleaning -->
-        <item name="Laundry" icon="presets/laundry.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Laundry" icon="presets/shop/laundry.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
@@ -7508,5 +7508,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Laundry -->
-        <item name="Tailor" icon="presets/shop/tailor.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tailor" icon="presets/shop/tailor.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tailor"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=tailor" />
@@ -7516,5 +7516,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tailor -->
-        <item name="Fabric" icon="presets/fabric.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fabric" icon="presets/shop/fabric.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=fabric"
@@ -7527,6 +7527,6 @@
         </item> <!-- Fabric -->
     </group> <!-- Clothes -->
-    <group name="Electronic" icon="presets/shop/electronics.png">
-        <item name="Computer" icon="presets/shop/computer.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Electronic" icon="presets/shop/electronics.svg">
+        <item name="Computer" icon="presets/shop/computer.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=computer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=computer"
@@ -7539,5 +7539,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
-        <item name="Electronics" icon="presets/shop/electronics.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Electronics" icon="presets/shop/electronics.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
@@ -7549,5 +7549,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
-        <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Mobile Phone" icon="presets/shop/mobile_phone.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mobile_phone"
@@ -7559,5 +7559,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Mobile Phone -->
-        <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Vacuum Cleaner" icon="presets/shop/vacuum_cleaner.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"
@@ -7608,5 +7608,5 @@
     </group> <!-- Electronic -->
     <group name="Cash" icon="presets/money/dollar.svg">
-        <item name="Bank" icon="presets/money/bank.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bank" icon="presets/money/bank.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=bank"
@@ -7628,5 +7628,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Bank -->
-        <item name="Money Exchange" icon="presets/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Money Exchange" icon="presets/money/exchange.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
@@ -7640,5 +7640,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Money Exchange -->
-        <item name="Automated Teller Machine" icon="presets/money/atm.png" type="node" preset_name_label="true">
+        <item name="Automated Teller Machine" icon="presets/money/atm.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=atm"
@@ -7659,5 +7659,5 @@
             <reference ref="oh_wheelchair" />
         </item> <!-- Automated Teller Machine -->
-        <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pawnbroker" icon="presets/shop/pawnbroker.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pawnbroker"
@@ -7671,5 +7671,5 @@
     </group> <!-- Cash -->
     <group name="Home decoration" icon="presets/shop/interior_decoration.svg">
-        <item name="Furniture" icon="presets/shop/furniture.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Furniture" icon="presets/shop/furniture.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=furniture"
@@ -7683,5 +7683,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Furniture -->
-        <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Kitchen" icon="presets/shop/kitchen.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kitchen"
@@ -7706,5 +7706,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Houseware -->
-        <item name="Curtain" icon="presets/curtain.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Curtain" icon="presets/shop/curtain.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=curtain"
@@ -7727,5 +7727,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Art -->
-        <item name="Frame" icon="presets/frame.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Frame" icon="presets/shop/frame.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=frame"
@@ -7772,6 +7772,6 @@
         </item> <!-- Antiques -->
     </group> <!-- Home decoration -->
-    <group name="Printed Material" icon="presets/stationery.png">
-        <item name="Stationery" icon="presets/stationery.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Printed Material" icon="presets/shop/stationery.png">
+        <item name="Stationery" icon="presets/shop/stationery.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
@@ -7784,5 +7784,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stationery -->
-        <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Copy Shop" icon="presets/shop/copyshop.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
@@ -7832,5 +7832,5 @@
     </group> <!-- Printed Material -->
     <group name="For the body" icon="presets/shop/body.svg">
-        <item name="Chemist" icon="presets/shop/chemist.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Chemist" icon="presets/shop/chemist.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
@@ -7879,5 +7879,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tobacco -->
-        <item name="Hairdresser/Barber" icon="presets/shop/hairdresser.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hairdresser/Barber" icon="presets/shop/hairdresser.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
@@ -7919,5 +7919,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Optician -->
-        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hearing Aids" icon="presets/shop/hearing_aids.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hearing_aids"
@@ -7939,5 +7939,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Medical Supply -->
-        <item name="Jewellery" icon="presets/shop/jewelry.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Jewellery" icon="presets/shop/jewelry.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
@@ -7950,5 +7950,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Jewellery -->
-        <item name="Erotic" icon="presets/erotic.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Erotic" icon="presets/shop/erotic.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=erotic"
@@ -7961,6 +7961,6 @@
         </item> <!-- Erotic -->
     </group> <!-- For the body -->
-    <group name="Other" icon="presets/shop/mall.png">
-        <item name="Department Store" icon="presets/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Other" icon="presets/shop/mall.svg">
+        <item name="Department Store" icon="presets/shop/mall.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=department_store"
@@ -7975,5 +7975,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Department Store -->
-        <item name="Mall" icon="presets/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Mall" icon="presets/shop/mall.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mall"
@@ -7988,5 +7988,5 @@
         </item> <!-- Mall -->
         <separator/>
-        <item name="Florist" icon="presets/shop/florist.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Florist" icon="presets/shop/florist.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=florist"
@@ -8001,5 +8001,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Florist -->
-        <item name="Garden Centre" icon="presets/shop/garden_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Garden Centre" icon="presets/shop/garden_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
@@ -8015,5 +8015,5 @@
         </item> <!-- Garden Centre -->
         <separator/>
-        <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
@@ -8028,5 +8028,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Do-It-Yourself Store -->
-        <item name="Hardware" icon="presets/hardware.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hardware" icon="presets/shop/hardware.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hardware"
@@ -8039,5 +8039,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hardware -->
-        <item name="Paint" icon="presets/paint.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Paint" icon="presets/shop/paint.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=paint"
@@ -8051,5 +8051,5 @@
         </item> <!-- Paint -->
         <separator/>
-        <item name="Travel Agency" icon="presets/travel.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Travel Agency" icon="presets/shop/travel.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=travel_agency"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=travel_agency"
@@ -8061,5 +8061,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Travel Agency -->
-        <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Musical Instrument" icon="presets/shop/musical_instrument.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=musical_instrument"
@@ -8071,5 +8071,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Musical Instrument -->
-        <item name="Toys" icon="presets/shop/toys.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Toys" icon="presets/shop/toys.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
@@ -8082,5 +8082,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Toys -->
-        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Gift/Souvenir" icon="presets/shop/present.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
@@ -8099,5 +8099,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Gift/Souvenir -->
-        <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Variety Store" icon="presets/shop/variety_store.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=variety_store"
@@ -8111,5 +8111,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Variety Store -->
-        <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bookmaker" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bookmaker" />
@@ -8119,5 +8119,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bookmaker -->
-        <item name="Lottery" icon="presets/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Lottery" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery"
@@ -8173,5 +8173,5 @@
     </group> <!-- Other -->
         <separator/>
-    <item name="Vending Machine" icon="presets/transport/ticket-machine.png" type="node" preset_name_label="true">
+    <item name="Vending Machine" icon="presets/transport/ticket-machine.svg" type="node" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -8632,7 +8632,7 @@
     </item> <!-- Tiler -->
   </group> <!-- Craft -->
-  <group name="Geography" icon="presets/peak.svg">
-    <group name="Boundaries" icon="presets/boundaries.png">
-        <item name="Administrative" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
+  <group name="Geography" icon="presets/landmark/peak.svg">
+    <group name="Boundaries" icon="presets/misc/boundaries.png">
+        <item name="Administrative" icon="presets/misc/boundaries.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=administrative"
@@ -8648,5 +8648,5 @@
             <check key="maritime" text="Maritime" disable_off="true" />
         </item> <!-- Administrative -->
-        <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+        <item name="Political" icon="presets/misc/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:boundary=political"
@@ -8658,5 +8658,5 @@
             <text key="name" text="Name" />
         </item> <!-- Political -->
-        <item name="Postal Code" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
+        <item name="Postal Code" icon="presets/misc/boundaries.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=postal_code"
@@ -8666,5 +8666,5 @@
             <text key="postal_code" text="Postal Code" />
         </item> <!-- Postal Code -->
-        <item name="National Park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+        <item name="National Park" icon="presets/misc/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
@@ -8675,5 +8675,5 @@
             <text key="name" text="Name" />
         </item> <!-- National Park -->
-        <item name="Protected Area" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
+        <item name="Protected Area" icon="presets/misc/boundaries.png" type="closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=protected_area"
@@ -8692,5 +8692,5 @@
             </optional>
         </item> <!-- Protected Area -->
-        <item name="Maritime" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
+        <item name="Maritime" icon="presets/misc/boundaries.png" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=maritime"
                   no.href="http://wiki.openstreetmap.org/wiki/No:Tag:boundary=maritime"
@@ -8857,5 +8857,5 @@
         </item> <!-- Farm -->
         <separator/>
-        <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
+        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=locality"
@@ -8870,6 +8870,6 @@
         </item> <!-- Locality -->
     </group> <!-- Places -->
-    <group name="Geography" icon="presets/peak.svg">
-        <item name="Peak" icon="presets/peak.svg" type="node" preset_name_label="true">
+    <group name="Geography" icon="presets/landmark/peak.svg">
+        <item name="Peak" icon="presets/landmark/peak.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=peak"
@@ -8886,5 +8886,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Peak -->
-        <item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
+        <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=saddle"
@@ -8900,5 +8900,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Saddle -->
-        <item name="Glacier" icon="presets/glacier.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=glacier"
@@ -8914,5 +8914,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Glacier -->
-        <item name="Volcano" icon="presets/volcano.png" type="node" preset_name_label="true">
+        <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=volcano"
@@ -8932,5 +8932,5 @@
             </optional>
         </item> <!-- Volcano -->
-        <item name="Ridge" icon="presets/ridge.svg" type="way" preset_name_label="true">
+        <item name="Ridge" icon="presets/landmark/ridge.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
@@ -8946,5 +8946,5 @@
             <text key="ele" text="Elevation" />
         </item> <!-- Ridge -->
-        <item name="Valley" icon="presets/valley.svg" type="way" preset_name_label="true">
+        <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=valley"
@@ -8971,5 +8971,5 @@
             <text key="height" text="Height (meters)" />
         </item> <!-- Cliff -->
-        <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
+        <item name="Cave Entrance" icon="presets/landmark/cave_entrance.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cave_entrance"
@@ -8988,5 +8988,5 @@
         </item> <!-- Cave Entrance -->
         <separator/>
-        <item name="Island" icon="presets/island.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Island" icon="presets/place/island.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=island"
@@ -8999,5 +8999,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Island -->
-        <item name="Islet" icon="presets/islet.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Islet" icon="presets/place/islet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=islet"
@@ -9018,6 +9018,6 @@
         </item> <!-- Islet -->
     </group> <!-- Geography -->
-    <group name="Nature" icon="presets/misc/landmark/trees.png">
-        <item name="Tree" icon="presets/misc/landmark/trees.png" type="node" preset_name_label="true">
+    <group name="Nature" icon="presets/landmark/trees.svg">
+        <item name="Tree" icon="presets/landmark/trees.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree"
@@ -9041,5 +9041,5 @@
             <reference ref="leaf" />
         </item> <!-- Tree -->
-        <item name="Tree Row" icon="presets/misc/landmark/tree_row.svg" type="way" preset_name_label="true">
+        <item name="Tree Row" icon="presets/landmark/tree_row.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
@@ -9060,5 +9060,5 @@
             </optional>
         </item> <!-- Tree Row -->
-        <item name="Wood" icon="presets/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wood"
@@ -9075,5 +9075,5 @@
             <reference ref="leaf" />
         </item> <!-- Wood -->
-        <item name="Forest" icon="presets/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Forest" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=forest"
@@ -9090,5 +9090,5 @@
             <reference ref="leaf" />
         </item> <!-- Forest -->
-        <item name="Cutline" icon="presets/misc/landmark/cutline.svg" type="way" preset_name_label="true">
+        <item name="Cutline" icon="presets/landmark/cutline.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=cutline"
@@ -9103,5 +9103,5 @@
             <combo key="cutline" text="Type" values="border,firebreak,hunting,loggingmachine,pipeline,piste,section" values_context="cutline" />
         </item> <!-- Cutline -->
-        <item name="Grassland" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Grassland" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=grassland"
@@ -9133,5 +9133,5 @@
         </item> <!-- Nature Reserve -->
         <separator/>
-        <item name="Scree" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Scree" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scree"
@@ -9149,5 +9149,5 @@
             <text key="name" text="Name" />
         </item> <!-- Scree -->
-        <item name="Fell" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Fell" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=fell"
@@ -9162,5 +9162,5 @@
             <text key="name" text="Name" />
         </item> <!-- Fell -->
-        <item name="Scrub" icon="presets/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scrub"
@@ -9180,5 +9180,5 @@
             </optional>
         </item> <!-- Scrub -->
-        <item name="Heath" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Heath" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"
@@ -9196,5 +9196,5 @@
             <text key="name" text="Name" />
         </item> <!-- Heath -->
-        <item name="Sand" icon="presets/misc/sand.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Sand" icon="presets/landuse/sand.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=sand"
@@ -9207,5 +9207,5 @@
             <text key="name" text="Name" />
         </item> <!-- Sand -->
-        <item name="Bare Rock" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Bare Rock" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bare_rock"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bare_rock"
@@ -9252,6 +9252,6 @@
         </item> <!-- Stone -->
     </group> <!-- Nature -->
-    <group name="Land use" icon="presets/landuse.png">
-        <item name="Farmyard" icon="presets/misc/landuse/farmyard.png" type="closedway,multipolygon" preset_name_label="true">
+    <group name="Land use" icon="presets/landuse/landuse.png">
+        <item name="Farmyard" icon="presets/landuse/farmyard.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=farmyard"
@@ -9265,5 +9265,5 @@
             <text key="name" text="Name" />
         </item> <!-- Farmyard -->
-        <item name="Farmland" icon="presets/misc/landuse/farmland.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Farmland" icon="presets/landuse/farmland.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmland"
                   ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:landuse=farmland"
@@ -9279,5 +9279,5 @@
             <combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop" values_context="crop" />
         </item> <!-- Farmland -->
-        <item name="Meadow" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Meadow" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=meadow"
@@ -9292,5 +9292,5 @@
             <text key="name" text="Name" />
         </item> <!-- Meadow -->
-        <item name="Orchard" icon="presets/misc/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Orchard" icon="presets/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=orchard"
@@ -9305,5 +9305,5 @@
             <combo key="trees" text="Trees" values="olive_trees,apple_trees,oil_palms,orange_trees,almond_trees,banana_plants,coconut_palms,hazel_plants,cherry_trees,persimmon_trees,walnut_trees,plum_trees,peach_trees,tea_plants" />
         </item> <!-- Orchard -->
-        <item name="Vineyard" icon="presets/fruits.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Vineyard" icon="presets/landuse/vineyard.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=vineyard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=vineyard"
@@ -9316,5 +9316,5 @@
             <text key="name" text="Name" />
         </item> <!-- Vineyard -->
-        <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Greenhouse Horticulture" icon="presets/landuse/greenhouse_horticulture.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenhouse_horticulture"
@@ -9331,5 +9331,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Greenhouse Horticulture -->
-        <item name="Plant Nursery" icon="presets/misc/landmark/plant.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Plant Nursery" icon="presets/landmark/plant.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=plant_nursery"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=plant_nursery"
@@ -9346,5 +9346,5 @@
             <text key="species" text="Species" />
         </item> <!-- Plant Nursery -->
-        <item name="Allotments" icon="presets/misc/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=allotments"
@@ -9372,5 +9372,5 @@
             <text key="name" text="Name" />
         </item> <!-- Garden -->
-        <item name="Grass" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Grass" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=grass"
@@ -9437,5 +9437,5 @@
         </item> <!-- Recreation Ground -->
         <separator/>
-        <item name="Residential Area" icon="presets/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Residential Area" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=residential"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=residential"
@@ -9450,5 +9450,5 @@
             <text key="name" text="Name" />
         </item> <!-- Residential Area -->
-        <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=grave_yard"
@@ -9464,5 +9464,5 @@
             <reference ref="religious" />
         </item> <!-- Graveyard -->
-        <item name="Cemetery" icon="presets/cemetery.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=cemetery"
@@ -9480,5 +9480,5 @@
             <reference ref="religious" />
         </item> <!-- Cemetery -->
-        <item name="Religious" icon="presets/religion.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
@@ -9489,5 +9489,5 @@
             <reference ref="religious" />
         </item> <!-- Religious -->
-        <item name="Retail" icon="presets/shop/mall.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Retail" icon="presets/shop/mall.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=retail"
@@ -9502,5 +9502,5 @@
             <text key="name" text="Name" />
         </item> <!-- Retail -->
-        <item name="Commercial" icon="presets/misc/landuse/commercial.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Commercial" icon="presets/landuse/commercial.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=commercial"
@@ -9515,5 +9515,5 @@
             <text key="name" text="Name" />
         </item> <!-- Commercial -->
-        <item name="Industrial" icon="presets/misc/landmark/works.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Industrial" icon="presets/landmark/works.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=industrial"
@@ -9529,5 +9529,5 @@
             <text key="name" text="Name" />
         </item> <!-- Industrial -->
-        <item name="Garages" icon="presets/garages.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Garages" icon="presets/landuse/garages.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=garages"
@@ -9542,5 +9542,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Garages -->
-        <item name="Railway Land" icon="presets/rail_light.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Railway Land" icon="presets/landuse/rail_light.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=railway"
@@ -9554,5 +9554,5 @@
             <text key="name" text="Name" />
         </item> <!-- Railway Land -->
-        <item name="Military" icon="presets/military.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Military" icon="presets/landuse/military.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=military"
@@ -9566,5 +9566,5 @@
         </item> <!-- Military -->
         <separator/>
-        <item name="Construction Area" icon="presets/construction.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Construction Area" icon="presets/landuse/construction.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=construction"
@@ -9579,5 +9579,5 @@
             <text key="name" text="Name" />
         </item> <!-- Construction Area -->
-        <item name="Brownfield" icon="presets/landuse.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Brownfield" icon="presets/landuse/landuse.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=brownfield"
@@ -9592,5 +9592,5 @@
             <text key="name" text="Name" />
         </item> <!-- Brownfield -->
-        <item name="Greenfield" icon="presets/landuse.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Greenfield" icon="presets/landuse/landuse.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenfield"
@@ -9603,5 +9603,5 @@
             <text key="name" text="Name" />
         </item> <!-- Greenfield -->
-        <item name="Landfill" icon="presets/misc/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Landfill" icon="presets/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=landfill"
@@ -9615,5 +9615,5 @@
             <text key="name" text="Name" />
         </item> <!-- Landfill -->
-        <item name="Quarry" icon="presets/mine.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Quarry" icon="presets/landmark/mine.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=quarry"
@@ -9629,6 +9629,6 @@
     </group> <!-- Landuse -->
   </group> <!-- Geography -->
-    <group name="Annotation" icon="presets/addresses.png">
-        <item name="Name" icon="presets/message.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+    <group name="Annotation" icon="presets/misc/addresses.png">
+        <item name="Name" icon="presets/misc/message.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:name"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
@@ -9661,5 +9661,5 @@
             </optional>
         </item> <!-- Name -->
-        <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Addresses" icon="presets/misc/addresses.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:addr"
@@ -9697,5 +9697,5 @@
             </optional>
         </item> <!-- Addresses -->
-        <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
+        <item name="Address Interpolation" icon="presets/misc/interpolation.png" type="way" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
@@ -9716,5 +9716,5 @@
             </optional>
         </item> <!-- Address Interpolation -->
-        <item name="Contact (Common Schema)" icon="presets/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Contact (Common Schema)" icon="presets/misc/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Annotations"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
@@ -9732,5 +9732,5 @@
             <text key="image" text="Image" />
         </item> <!-- Contact (Common Schema) -->
-        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:contact"
@@ -9811,6 +9811,6 @@
         </item> <!-- Fixme -->
     </group> <!-- Annotation -->
-    <group name="Relations" icon="presets/relations.png">
-        <item name="Multipolygon" icon="presets/multipolygon.png" type="relation,multipolygon" preset_name_label="true">
+    <group name="Relations" icon="presets/misc/relations.png">
+        <item name="Multipolygon" icon="presets/misc/multipolygon.png" type="relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Relation:multipolygon"
@@ -9833,5 +9833,5 @@
             </roles>
         </item> <!-- Multipolygon -->
-        <item name="Boundary" icon="presets/boundaries.png" type="relation,multipolygon" preset_name_label="true">
+        <item name="Boundary" icon="presets/misc/boundaries.png" type="relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
@@ -9873,5 +9873,5 @@
         </item> <!-- Site -->
         <separator/>
-        <item name="Turn Restriction" icon="presets/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
+        <item name="Turn Restriction" icon="presets/vehicle/restriction/turn_restrictions/no_u_turn.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
@@ -9918,6 +9918,6 @@
         </item> <!-- Enforcement -->
         <separator/>
-        <group name="Routes" icon="presets/path.png">
-            <item name="Bicycle Route" icon="presets/path.png" type="relation" preset_name_label="true">
+        <group name="Routes" icon="presets/misc/path.png">
+            <item name="Bicycle Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Cycle_routes"
@@ -9941,5 +9941,5 @@
                 </roles>
             </item> <!-- Bicycle Route -->
-            <item name="Mountain Biking Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Mountain Biking Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Mountain_biking"
@@ -9964,5 +9964,5 @@
                 </roles>
             </item> <!-- Mountain Biking Route -->
-            <item name="Hiking Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Hiking Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Hiking"
@@ -9988,5 +9988,5 @@
                 </roles>
             </item> <!-- Hiking Route -->
-            <item name="Walking Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Walking Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=foot" />
                 <space/>
@@ -10004,5 +10004,5 @@
                 </roles>
             </item> <!-- Walking Route -->
-            <item name="Riding Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Riding Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=horse" />
                 <space/>
@@ -10020,5 +10020,5 @@
                 </roles>
             </item> <!-- Riding Route -->
-            <item name="Piste Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Piste Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=piste"
@@ -10042,5 +10042,5 @@
                 </roles>
             </item> <!-- Piste Route -->
-            <item name="Ski Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Ski Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski" />
@@ -10064,5 +10064,5 @@
             </item> <!-- Ski Route -->
             <separator/>
-            <item name="Detour Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Detour Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=detour" />
@@ -10081,5 +10081,5 @@
                 </roles>
             </item> <!-- Detour Route -->
-            <item name="Power Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Power Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=power" />
                 <space/>
@@ -10091,5 +10091,5 @@
                 </roles>
             </item> <!-- Power Route -->
-            <item name="Railway Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Railway Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
@@ -10105,5 +10105,5 @@
                 </roles>
             </item> <!-- Railway Route -->
-            <item name="Road Route" icon="presets/path.png" type="relation" preset_name_label="true">
+            <item name="Road Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=road"
@@ -10125,5 +10125,5 @@
             </item> <!-- Road Route -->
         </group> <!-- Routes -->
-        <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
+        <item name="Route Network" icon="presets/misc/path.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
             <space />
@@ -10139,5 +10139,5 @@
         </item> <!-- Route Network -->
         <separator/>
-        <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
+        <item name="Associated Street" icon="presets/misc/addresses.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
@@ -10168,5 +10168,5 @@
             </roles>
         </item> <!-- Street -->
-        <item name="Destination Sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
+        <item name="Destination Sign" icon="presets/misc/information/guidepost.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
@@ -10238,5 +10238,5 @@
             </roles>
         </item> <!-- Bridge -->
-        <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
+        <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
             <space />