Changeset 10706 in josm


Ignore:
Timestamp:
2016-08-02T15:00:40+02:00 (9 months ago)
Author:
Klumbumbus
Message:

see #13217 - replace about 166 png icons by svg from https://trac.openstreetmap.org/browser/subversion/applications/share/map-icons/svg reworked most of them (white background or halo, resizing, pixel alignement), draw a few new svg icons from png derived; remove duplicate icons; reorder icons; adapt internal preset and mappaint styles

Location:
trunk
Files:
203 added
259 deleted
4 edited
23 copied
100 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r10676 r10706  
    955955            <preset_link preset_name="Road Restrictions" />
    956956        </item> <!-- Roundabout -->
    957         <item name="Ford" icon="presets/misc/ford.svg" type="node,way" preset_name_label="true">
     957        <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
    958958            <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
    959959                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
     
    15561556        </item> <!-- Grit Bin -->
    15571557        <separator/>
    1558         <item name="Mountain Pass" icon="presets/misc/landmark/mountain_pass.svg" type="node" preset_name_label="true">
     1558        <item name="Mountain Pass" icon="presets/landmark/mountain_pass.svg" type="node" preset_name_label="true">
    15591559            <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
    15601560                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:mountain_pass"
     
    15721572        </item> <!-- Mountain Pass -->
    15731573    </group> <!-- Waypoints -->
    1574     <group name="Barriers" icon="presets/barrier.png"> <!-- *** Node Barriers *** -->
    1575         <item name="Block" icon="presets/vehicle/block.svg" type="node,way,closedway" preset_name_label="true">
     1574    <group name="Barriers" icon="presets/barrier/barrier.png"> <!-- *** Node Barriers *** -->
     1575        <item name="Block" icon="presets/barrier/block.svg" type="node,way,closedway" preset_name_label="true">
    15761576            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
    15771577                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=block"
     
    15851585            </optional>
    15861586        </item> <!-- Block -->
    1587         <item name="Bollard" icon="presets/bollard.png" type="node,way" preset_name_label="true">
     1587        <item name="Bollard" icon="presets/barrier/bollard.svg" type="node,way" preset_name_label="true">
    15881588            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard"
    15891589                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=bollard"
     
    16021602            </optional>
    16031603        </item> <!-- Bollard -->
    1604         <item name="Cycle Barrier" icon="presets/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
     1604        <item name="Cycle Barrier" icon="presets/barrier/cycle_barrier.svg" type="node" preset_name_label="true">
    16051605            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
    16061606                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cycle_barrier"
     
    16111611            <reference ref="optional_maxwidth" />
    16121612        </item> <!-- Cycle Barrier -->
    1613         <item name="Cattle Grid" icon="presets/vehicle/cattle_grid.png" type="node" preset_name_label="true">
     1613        <item name="Cattle Grid" icon="presets/barrier/cattle_grid.png" type="node" preset_name_label="true">
    16141614            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
    16151615                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
     
    16181618            <reference ref="barrier_4" />
    16191619        </item> <!-- Cattle Grid -->
    1620         <item name="Bus Trap" icon="presets/empty.png" type="node" preset_name_label="true">
     1620        <item name="Bus Trap" type="node" preset_name_label="true">
    16211621            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bus_trap"
    16221622                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=bus_trap" />
     
    16241624            <reference ref="optional_maxwidth" />
    16251625        </item> <!-- Bus Trap -->
    1626         <item name="Spikes" icon="presets/vehicle/spikes.svg" type="node" preset_name_label="true">
     1626        <item name="Spikes" icon="presets/barrier/spikes.svg" type="node" preset_name_label="true">
    16271627            <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
    16281628                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
     
    16411641            <reference ref="barrier_5" />
    16421642        </item> <!-- Spikes -->
    1643         <item name="Toll Booth" icon="presets/toll_station.png" type="node,closedway" preset_name_label="true">
     1643        <item name="Toll Booth" icon="presets/barrier/toll_station.png" type="node,closedway" preset_name_label="true">
    16441644            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth"
    16451645                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=toll_booth"
     
    16561656            </optional>
    16571657        </item> <!-- Toll Booth -->
    1658         <item name="Border Control" icon="presets/douane.png" type="node" preset_name_label="true">
     1658        <item name="Border Control" icon="presets/barrier/douane.png" type="node" preset_name_label="true">
    16591659            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=border_control" />
    16601660            <key key="barrier" value="border_control" />
     
    16621662        </item> <!-- Border Control -->
    16631663        <separator/> <!-- *** Linear Barriers *** -->
    1664         <item name="Hedge" icon="presets/hedge.png" type="way,closedway,multipolygon" preset_name_label="true">
     1664        <item name="Hedge" icon="presets/barrier/hedge.svg" type="way,closedway,multipolygon" preset_name_label="true">
    16651665            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge"
    16661666                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=hedge"
     
    16801680            </optional>
    16811681        </item> <!-- Hedge -->
    1682         <item name="Fence" icon="presets/fence.png" type="way,closedway" preset_name_label="true">
     1682        <item name="Fence" icon="presets/barrier/fence.svg" type="way,closedway" preset_name_label="true">
    16831683            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence"
    16841684                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=fence"
     
    17021702            <reference ref="optional_height" />
    17031703        </item> <!-- Guard Rail -->
    1704         <item name="Wall" icon="presets/wall.png" type="way,closedway" preset_name_label="true">
     1704        <item name="Wall" icon="presets/barrier/wall.svg" type="way,closedway" preset_name_label="true">
    17051705            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=wall"
    17061706                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=wall"
     
    17151715            <combo key="wall" text="Type" values="dry_stone,noise_barrier" />
    17161716        </item> <!-- Wall -->
    1717         <item name="City Wall" icon="presets/city_wall.png" type="way,closedway" preset_name_label="true">
     1717        <item name="City Wall" icon="presets/barrier/city_wall.svg" type="way,closedway" preset_name_label="true">
    17181718            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall"
    17191719                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=city_wall"
     
    17251725            <reference ref="optional_height" />
    17261726        </item> <!-- City Wall -->
    1727         <item name="Retaining Wall" icon="presets/retaining_wall.png" type="way,closedway" preset_name_label="true">
     1727        <item name="Retaining Wall" icon="presets/barrier/retaining_wall.svg" type="way,closedway" preset_name_label="true">
    17281728            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall"
    17291729                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=retaining_wall"
     
    17561756            </optional>
    17571757        </item> <!-- Ditch -->
    1758         <item name="Kerb" icon="presets/vehicle/kerb.svg" type="node,way,closedway" preset_name_label="true">
     1758        <item name="Kerb" icon="presets/barrier/kerb.svg" type="node,way,closedway" preset_name_label="true">
    17591759            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
    17601760                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb"
     
    17661766        </item> <!-- Kerb -->
    17671767        <separator/> <!-- *** Access *** -->
    1768         <item name="Entrance (Barrier Opening)" icon="presets/vehicle/entrance.png" type="node" preset_name_label="true">
     1768        <item name="Entrance (Barrier Opening)" icon="presets/barrier/entrance.svg" type="node" preset_name_label="true">
    17691769            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
    17701770                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=entrance"
     
    17751775            <reference ref="optional_maxwidth" />
    17761776        </item> <!-- Entrance (Barrier Opening) -->
    1777         <item name="Gate" icon="presets/vehicle/gate.png" type="node" preset_name_label="true">
     1777        <item name="Gate" icon="presets/barrier/gate.png" type="node" preset_name_label="true">
    17781778            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
    17791779                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
     
    17881788            <reference ref="general_access" />
    17891789        </item> <!-- Gate -->
    1790         <item name="Lift Gate" icon="presets/lift_gate.png" type="node" preset_name_label="true">
     1790        <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
    17911791            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=lift_gate"
    17921792                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=lift_gate"
     
    18001800            <reference ref="general_access" />
    18011801        </item> <!-- Lift Gate -->
    1802         <item name="Swing Gate" icon="presets/swing_gate.png" type="node" preset_name_label="true">
     1802        <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
    18031803            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=swing_gate" />
    18041804            <key key="barrier" value="swing_gate" />
     
    18081808            <reference ref="general_access" />
    18091809        </item> <!-- Swing Gate -->
    1810         <item name="Hampshire Gate" icon="presets/empty.png" type="node" preset_name_label="true">
     1810        <item name="Hampshire Gate" type="node" preset_name_label="true">
    18111811            <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
    18121812                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
     
    18241824            <reference ref="optional_maxwidth" />
    18251825        </item> <!-- Hampshire Gate -->
    1826         <item name="Bump Gate" icon="presets/empty.png" type="node" preset_name_label="true">
     1826        <item name="Bump Gate" type="node" preset_name_label="true">
    18271827            <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
    18281828                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
     
    18401840            <reference ref="optional_maxwidth" />
    18411841        </item> <!-- Bump Gate -->
    1842         <item name="Kissing Gate" icon="presets/empty.png" type="node" preset_name_label="true">
     1842        <item name="Kissing Gate" type="node" preset_name_label="true">
    18431843            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kissing_gate"
    18441844                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=kissing_gate" />
     
    18471847            <reference ref="optional_maxwidth" />
    18481848        </item> <!-- Kissing Gate -->
    1849         <item name="Chain" icon="presets/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
     1849        <item name="Chain" icon="presets/barrier/chain.svg" type="node,way,closedway" preset_name_label="true">
    18501850            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
    18511851                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
     
    18541854            <reference ref="optional_maxwidth" />
    18551855        </item> <!-- Chain -->
    1856         <item name="Stile" icon="presets/vehicle/stile.svg" type="node" preset_name_label="true">
     1856        <item name="Stile" icon="presets/barrier/stile.svg" type="node" preset_name_label="true">
    18571857            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
    18581858            <space />
     
    18641864            <reference ref="barrier_2" />
    18651865        </item> <!-- Stile -->
    1866         <item name="Turnstile" icon="presets/vehicle/turnstile.png" type="node" preset_name_label="true">
     1866        <item name="Turnstile" icon="presets/barrier/turnstile.svg" type="node" preset_name_label="true">
    18671867            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=turnstile"
    18681868                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=turnstile"
     
    18711871            <reference ref="barrier_2" />
    18721872        </item> <!-- Turnstile -->
    1873         <item name="Sally Port" icon="presets/vehicle/sally_port.png" type="node" preset_name_label="true">
     1873        <item name="Sally Port" icon="presets/barrier/sally_port.svg" type="node" preset_name_label="true">
    18741874            <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=sally_port"
    18751875                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=sally_port"
     
    20742074        </item> <!-- Canal -->
    20752075        <separator/>
    2076         <item name="Spring" icon="presets/misc/landmark/spring.svg" type="node,closedway" preset_name_label="true">
     2076        <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">
    20772077            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
    20782078                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=spring"
     
    21632163        </item> <!-- Culvert -->
    21642164        <separator/>
    2165         <item name="Basin" icon="presets/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
     2165        <item name="Basin" icon="presets/landuse/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
    21662166            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=basin"
    21672167                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=basin"
     
    21752175            <text key="name" text="Name" />
    21762176        </item> <!-- Basin -->
    2177         <item name="Reservoir" icon="presets/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
     2177        <item name="Reservoir" icon="presets/landuse/landuse_water.png" type="node,closedway,multipolygon" preset_name_label="true">
    21782178            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir"
    21792179                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=reservoir"
     
    21862186            <text key="name" text="Name" />
    21872187        </item> <!-- Reservoir -->
    2188         <item name="Covered Reservoir" icon="presets/reservoir_covered.png" type="node,closedway,multipolygon" preset_name_label="true">
     2188        <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
    21892189            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=reservoir_covered"
    21902190                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=reservoir_covered"
     
    22522252        </item> <!-- Riverbank -->
    22532253        <separator/>
    2254         <item name="Wetland" icon="presets/misc/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
     2254        <item name="Wetland" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
    22552255            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
    22562256                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
     
    22712271            <check key="seasonal" text="Seasonal" disable_off="true" />
    22722272        </item> <!-- Wetland -->
    2273         <item name="Mud" icon="presets/misc/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
     2273        <item name="Mud" icon="presets/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
    22742274            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
    22752275                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
     
    23992399            <check key="floating" text="Floating" />
    24002400        </item> <!-- Pier -->
    2401         <item name="Lock Gate" icon="presets/lock_gate.png" type="node" preset_name_label="true">
     2401        <item name="Lock Gate" icon="presets/nautical/lock_gate.svg" type="node" preset_name_label="true">
    24022402            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate"
    24032403                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=lock_gate"
     
    24102410            <key key="waterway" value="lock_gate" />
    24112411        </item> <!-- Lock Gate -->
    2412         <item name="Turning Point" icon="presets/turning.png" type="node" preset_name_label="true">
     2412        <item name="Turning Point" icon="presets/nautical/turning.svg" type="node" preset_name_label="true">
    24132413            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point"
    24142414                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=turning_point"
     
    24292429            </optional>
    24302430        </item> <!-- Slipway -->
    2431         <item name="Boatyard" icon="presets/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
     2431        <item name="Boatyard" icon="presets/nautical/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
    24322432            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard"
    24332433                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=boatyard"
     
    24412441            <text key="name" text="Name" />
    24422442        </item> <!-- Boatyard -->
    2443         <item name="Dock" icon="presets/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
     2443        <item name="Dock" icon="presets/nautical/boatyard.png" type="node,closedway,multipolygon" preset_name_label="true">
    24442444            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock"
    24452445                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dock"
     
    26582658        </item> <!-- Railway Milestone -->
    26592659    </group> <!-- Railway -->
    2660     <group name="Aerialway" icon="presets/aerialway.png">
    2661         <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
     2660    <group name="Aerialway" icon="presets/transport/aerialway/gondola.svg">
     2661        <item name="Cable Car" icon="presets/transport/aerialway/cable_car.svg" type="way" preset_name_label="true">
    26622662            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
    26632663                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=cable_car"
     
    26782678            </optional>
    26792679        </item> <!-- Cable Car -->
    2680         <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
     2680        <item name="Chair Lift" icon="presets/transport/aerialway/chair_lift.svg" type="way" preset_name_label="true">
    26812681            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
    26822682                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
     
    26922692            </optional>
    26932693        </item> <!-- Chair Lift -->
    2694         <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
     2694        <item name="Gondola" icon="presets/transport/aerialway/gondola.svg" type="way" preset_name_label="true">
    26952695            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=gondola" />
    26962696            <space />
     
    27042704            </optional>
    27052705        </item> <!-- Gondola -->
    2706         <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.png" type="way" preset_name_label="true">
     2706        <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true">
    27072707            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
    27082708            <space />
     
    27172717            </optional>
    27182718        </item> <!-- Mixed Lift -->
    2719         <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
     2719        <item name="Drag Lift" icon="presets/transport/aerialway/drag_lift.svg" type="way" preset_name_label="true">
    27202720            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift"
    27212721                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=drag_lift"
     
    27392739            </optional>
    27402740        </item> <!-- Magic Carpet -->
    2741         <item name="Goods" icon="presets/goods.png" type="way" preset_name_label="true">
     2741        <item name="Goods" icon="presets/transport/aerialway/goods.svg" type="way" preset_name_label="true">
    27422742            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=goods"
    27432743                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aerialway=goods" />
     
    27502750        </item> <!-- Goods -->
    27512751        <separator/>
    2752         <item name="Station" name_context="aerialway" icon="presets/aerialway_station.png" type="node,closedway" preset_name_label="true">
     2752        <item name="Station" name_context="aerialway" icon="presets/transport/aerialway/station.svg" type="node,closedway" preset_name_label="true">
    27532753            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=station"
    27542754                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aerialway=station" />
     
    27652765    </group> <!-- Aerialway -->
    27662766    <separator/>
    2767     <group name="Car" icon="presets/car.png">
    2768         <item name="Parking" icon="presets/parking.png" type="node,closedway,multipolygon" preset_name_label="true">
     2767    <group name="Car" icon="presets/shop/vehicle.svg">
     2768        <item name="Parking" icon="presets/vehicle/parking/parking.svg" type="node,closedway,multipolygon" preset_name_label="true">
    27692769            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
    27702770                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking"
     
    28102810            <check key="covered" text="Covered (with roof)" />
    28112811        </item> <!-- Parking Space -->
    2812         <item name="Parking Entrance" icon="presets/parking.png" type="node" preset_name_label="true">
     2812        <item name="Parking Entrance" icon="presets/vehicle/parking/parking.svg" type="node" preset_name_label="true">
    28132813            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_entrance"
    28142814                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_entrance"
     
    28262826        </item> <!-- Parking Entrance -->
    28272827        <separator/>
    2828         <item name="Fuel" icon="presets/fuel.png" type="node,closedway,multipolygon" preset_name_label="true">
     2828        <item name="Fuel" icon="presets/vehicle/fuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    28292829            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
    28302830                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
     
    28802880            <preset_link preset_name="Building" />
    28812881        </item> <!-- Fuel -->
    2882         <item name="Charging Station" icon="presets/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
     2882        <item name="Charging Station" icon="presets/vehicle/charging_station.png" type="node" preset_name_label="true">
    28832883            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
    28842884                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station"
     
    29282928            <preset_link preset_name="Payment Methods" />
    29292929        </item> <!-- Charging Station -->
    2930         <item name="Wash" icon="presets/car_wash.png" type="node,closedway,multipolygon" preset_name_label="true">
     2930        <item name="Wash" icon="presets/vehicle/car_wash.svg" type="node,closedway,multipolygon" preset_name_label="true">
    29312931            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_wash"
    29322932                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_wash"
     
    29432943        </item> <!-- Wash -->
    29442944        <separator/>
    2945         <item name="Car Dealer" icon="presets/car.png" type="node,closedway,multipolygon" preset_name_label="true">
     2945        <item name="Car Dealer" icon="presets/shop/vehicle.svg" type="node,closedway,multipolygon" preset_name_label="true">
    29462946            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car"
    29472947                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car"
     
    29612961            <reference ref="link_contact_address_payment" />
    29622962        </item> <!-- Car Dealer -->
    2963         <item name="Repair" icon="presets/car_repair.png" type="node,closedway,multipolygon" preset_name_label="true">
     2963        <item name="Repair" icon="presets/vehicle/repair_shop.svg" type="node,closedway,multipolygon" preset_name_label="true">
    29642964            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_repair"
    29652965                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_repair"
     
    29842984            <reference ref="link_contact_address_payment" />
    29852985        </item> <!-- Parts -->
    2986         <item name="Tires" icon="presets/tyres.png" type="node,closedway,multipolygon" preset_name_label="true">
     2986        <item name="Tires" icon="presets/vehicle/tyres.svg" type="node,closedway,multipolygon" preset_name_label="true">
    29872987            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tyres"
    29882988                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tyres"
     
    29942994        </item> <!-- Tires -->
    29952995        <separator/>
    2996         <item name="Rental" icon="presets/car_rental.png" type="node,closedway,multipolygon" preset_name_label="true">
     2996        <item name="Rental" icon="presets/vehicle/car_rental.svg" type="node,closedway,multipolygon" preset_name_label="true">
    29972997            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
    29982998                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_rental"
     
    30083008            <reference ref="link_contact_address_payment" />
    30093009        </item> <!-- Rental -->
    3010         <item name="Sharing" icon="presets/car_sharing.png" type="node,closedway,multipolygon" preset_name_label="true">
     3010        <item name="Sharing" icon="presets/vehicle/car_sharing.svg" type="node,closedway,multipolygon" preset_name_label="true">
    30113011            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing"
    30123012                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=car_sharing"
     
    30243024        </item> <!-- Sharing -->
    30253025    </group> <!-- Car -->
    3026     <group name="Motorcycle" icon="presets/motorbike.png">
    3027         <item name="Parking" icon="presets/vehicle/parking/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
     3026    <group name="Motorcycle" icon="presets/vehicle/motorbike.svg">
     3027        <item name="Parking" icon="presets/vehicle/parking/motorbike.svg" type="node,closedway,multipolygon" preset_name_label="true">
    30283028            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=motorcycle_parking"
    30293029                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=motorcycle_parking"
     
    30393039            <check key="covered" text="Covered (with roof)" />
    30403040        </item> <!-- Parking -->
    3041         <item name="Motorcycle Dealer" icon="presets/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
     3041        <item name="Motorcycle Dealer" icon="presets/vehicle/motorbike.svg" type="node,closedway,multipolygon" preset_name_label="true">
    30423042            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=motorcycle"
    30433043                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=motorcycle"
     
    30653065        </item> <!-- Motorcycle Dealer -->
    30663066    </group> <!-- Motorcycle -->
    3067     <group name="Bicycle" icon="presets/bike.png">
    3068         <item name="Parking" icon="presets/vehicle/parking/bicycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
     3067    <group name="Bicycle" icon="presets/shop/bicycle.svg">
     3068        <item name="Parking" icon="presets/vehicle/parking/bicycle.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    30693069            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking"
    30703070                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_parking"
     
    30883088            <reference ref="supervised_lit_oh" />
    30893089        </item> <!-- Parking -->
    3090         <item name="Bike Dealer" icon="presets/bike.png" type="node,closedway,multipolygon" preset_name_label="true">
     3090        <item name="Bike Dealer" icon="presets/shop/bicycle.svg" type="node,closedway,multipolygon" preset_name_label="true">
    30913091            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
    30923092                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bicycle"
     
    31103110            <reference ref="link_contact_address_payment" />
    31113111        </item> <!-- Bike Dealer -->
    3112         <item name="Rental" icon="presets/bicycle_rental.png" type="node,closedway,multipolygon" preset_name_label="true">
     3112        <item name="Rental" icon="presets/vehicle/bicycle_rental.svg" type="node,closedway,multipolygon" preset_name_label="true">
    31133113            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
    31143114                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_rental"
     
    31453145        </item> <!-- Public Bicycle Repair Station -->
    31463146    </group> <!-- Bicycle -->
    3147     <group name="Public Transport" icon="presets/bus.png">
    3148         <item name="Public Transport Route (Rail)" icon="presets/path.png" type="relation" preset_name_label="true">
     3147    <group name="Public Transport" icon="presets/transport/bus_old.svg">
     3148        <item name="Public Transport Route (Rail)" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    31493149            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
    31503150            <space />
     
    31663166            </roles>
    31673167        </item> <!-- Public Transport Route (Rail) -->
    3168         <item name="Public Transport Route (Bus)" icon="presets/path.png" type="relation" preset_name_label="true">
     3168        <item name="Public Transport Route (Bus)" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    31693169            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route" />
    31703170            <space />
     
    31863186            </roles>
    31873187        </item> <!-- Public Transport Route (Bus) -->
    3188         <item name="Route Master" icon="presets/path.png" type="relation" preset_name_label="true">
     3188        <item name="Route Master" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    31893189            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Route_master" />
    31903190            <space />
     
    32013201            </roles>
    32023202        </item> <!-- Route Master -->
    3203         <item name="Stop Area" type="relation" icon="presets/interpolation.png" preset_name_label="true">
     3203        <item name="Stop Area" type="relation" icon="presets/misc/interpolation.png" preset_name_label="true">
    32043204            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_area" />
    32053205            <space />
     
    32813281        </item> <!-- Station -->
    32823282        <separator/> <!-- *** Access *** -->
    3283         <item name="Subway Entrance" icon="presets/underground.png" type="node" preset_name_label="true">
     3283        <item name="Subway Entrance" icon="presets/transport/underground.png" type="node" preset_name_label="true">
    32843284            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
    32853285                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway_entrance"
     
    32953295            </optional>
    32963296        </item> <!-- Subway Entrance -->
    3297         <item name="Ticket Machine" icon="presets/transport/ticket-machine.png" type="node" preset_name_label="true">
     3297        <item name="Ticket Machine" icon="presets/transport/ticket-machine.svg" type="node" preset_name_label="true">
    32983298            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
    32993299                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
     
    33113311        </item> <!-- Ticket Machine -->
    33123312    </group> <!-- Public Transport -->
    3313     <group name="Public Transport (Legacy)" icon="presets/bus.png">
    3314         <item name="Public transport route (Legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
     3313    <group name="Public Transport (Legacy)" icon="presets/transport/bus_old.svg">
     3314        <item name="Public transport route (Legacy)" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    33153315            <key key="type" value="route" />
    33163316            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
     
    33363336            </roles>
    33373337        </item> <!-- Public transport route (Legacy) -->
    3338         <item name="Station" name_context="railway" icon="presets/transport/railway_station.png" type="node,closedway,multipolygon" preset_name_label="true">
     3338        <item name="Station" name_context="railway" icon="presets/transport/railway_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
    33393339            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
    33403340                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
     
    33503350            </optional>
    33513351        </item> <!-- Station -->
    3352         <item name="Railway Halt" icon="presets/station.png" type="node" preset_name_label="true">
     3352        <item name="Railway Halt" icon="presets/transport/station.png" type="node" preset_name_label="true">
    33533353            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt"
    33543354                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=halt"
     
    33613361            </optional>
    33623362        </item> <!-- Railway Halt -->
    3363         <item name="Tram Stop" icon="presets/transport/tram.png" type="node" preset_name_label="true">
     3363        <item name="Tram Stop" icon="presets/transport/tram.svg" type="node" preset_name_label="true">
    33643364           <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
    33653365                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
     
    33713371            </optional>
    33723372        </item> <!-- Tram Stop -->
    3373         <item name="Railway Platform" icon="presets/platform_rail.png" type="way,closedway,multipolygon" preset_name_label="true">
     3373        <item name="Railway Platform" icon="presets/transport/platform_rail.png" type="way,closedway,multipolygon" preset_name_label="true">
    33743374            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
    33753375                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform"
     
    33833383        </item> <!-- Railway Platform -->
    33843384        <separator/>
    3385         <item name="Bus Station" icon="presets/bus.png" type="node,closedway,multipolygon" preset_name_label="true">
     3385        <item name="Bus Station" icon="presets/transport/bus_old.svg" type="node,closedway,multipolygon" preset_name_label="true">
    33863386            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
    33873387                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station"
     
    33953395            </optional>
    33963396        </item> <!-- Bus Station -->
    3397         <item name="Bus Stop" icon="presets/bus_small.png" type="node" preset_name_label="true">
     3397        <item name="Bus Stop" icon="presets/transport/bus_small.png" type="node" preset_name_label="true">
    33983398            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
    33993399                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
     
    34143414            </optional>
    34153415        </item> <!-- Bus Stop -->
    3416         <item name="Bus Platform" icon="presets/platform_bus.png" type="node,way,closedway,multipolygon" preset_name_label="true">
     3416        <item name="Bus Platform" icon="presets/transport/platform_bus.png" type="node,way,closedway,multipolygon" preset_name_label="true">
    34173417            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=platform"
    34183418                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=platform"
     
    34283428        </item> <!-- Bus Platform -->
    34293429    </group> <!-- Public Transport -->
    3430     <item name="Taxi" icon="presets/taxi.png" type="node,closedway,multipolygon" preset_name_label="true">
     3430    <item name="Taxi" icon="presets/transport/taxi.svg" type="node,closedway,multipolygon" preset_name_label="true">
    34313431        <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi"
    34323432                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=taxi"
     
    34443444    </item> <!-- Taxi -->
    34453445    <separator/>
    3446     <group name="Airport" icon="presets/plane.png">
    3447         <item name="Airport Ground" icon="presets/plane.png" type="node,closedway,multipolygon" preset_name_label="true">
     3446    <group name="Airport" icon="presets/transport/airport.svg">
     3447        <item name="Airport Ground" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
    34483448            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome"
    34493449                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=aerodrome"
     
    34553455        </item> <!-- Airport Ground -->
    34563456        <separator/>
    3457         <item name="Runway" icon="presets/runway.png" type="way,closedway" preset_name_label="true">
     3457        <item name="Runway" icon="presets/transport/airport/runway.png" type="way,closedway" preset_name_label="true">
    34583458            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway"
    34593459                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=runway"
     
    34673467            </optional>
    34683468        </item> <!-- Runway -->
    3469         <item name="Taxiway" icon="presets/taxiway.png" type="way,closedway" preset_name_label="true">
     3469        <item name="Taxiway" icon="presets/transport/airport/taxiway.png" type="way,closedway" preset_name_label="true">
    34703470            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway"
    34713471                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=taxiway"
     
    34783478            </optional>
    34793479        </item> <!-- Taxiway -->
    3480         <item name="Helipad" icon="presets/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
     3480        <item name="Helipad" icon="presets/transport/airport/helipad.svg" type="node,closedway" preset_name_label="true">
    34813481            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
    34823482                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=helipad"
     
    34903490            </optional>
    34913491        </item> <!-- Helipad -->
    3492         <item name="Apron" icon="presets/apron.png" type="closedway,multipolygon" preset_name_label="true">
     3492        <item name="Apron" icon="presets/transport/airport/apron.svg" type="closedway,multipolygon" preset_name_label="true">
    34933493            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron"
    34943494                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=apron"
     
    35043504            <text key="ref" text="Reference" />
    35053505        </item> <!-- Plane Parking Position -->
    3506         <item name="Hangar" icon="presets/hangar.png" type="node,closedway,multipolygon" preset_name_label="true">
     3506        <item name="Hangar" icon="presets/transport/airport/hangar.svg" type="node,closedway,multipolygon" preset_name_label="true">
    35073507            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar"
    35083508                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=hangar"
     
    35133513            <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
    35143514        </item> <!-- Hangar -->
    3515         <item name="Beacon" icon="presets/misc/landmark/beacon.png" type="node" preset_name_label="true">
     3515        <item name="Beacon" icon="presets/landmark/beacon.png" type="node" preset_name_label="true">
    35163516            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
    35173517                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
     
    35203520            <key key="man_made" value="beacon" />
    35213521        </item> <!-- Beacon -->
    3522         <item name="Windsock" icon="presets/transport/airport/windsock.png" type="node" preset_name_label="true">
     3522        <item name="Windsock" icon="presets/transport/airport/windsock.svg" type="node" preset_name_label="true">
    35233523            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
    35243524                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock"
     
    35273527        </item> <!-- Windsock -->
    35283528        <separator/>
    3529         <item name="Terminal" icon="presets/transport/airport/terminal.png" type="node,closedway,multipolygon" preset_name_label="true">
     3529        <item name="Terminal" icon="presets/transport/airport/terminal.svg" type="node,closedway,multipolygon" preset_name_label="true">
    35303530            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
    35313531                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=terminal"
     
    35403540            <reference ref="link_contact_address" />
    35413541        </item> <!-- Terminal -->
    3542         <item name="Gate" name_context="airport" icon="presets/aeroway_gate.png" type="node" preset_name_label="true">
     3542        <item name="Gate" name_context="airport" icon="presets/transport/airport/gate.svg" type="node" preset_name_label="true">
    35433543            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate"
    35443544                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=gate"
     
    35513551    </group> <!-- Airport -->
    35523552  </group> <!-- Transport -->
    3553   <group name="Facilities" icon="presets/bed.png">
    3554     <group name="Accommodation" icon="presets/bed.png">
     3553  <group name="Facilities" icon="presets/accommodation/hotel.svg">
     3554    <group name="Accommodation" icon="presets/accommodation/hotel.svg">
    35553555        <item name="Hotel" icon="presets/accommodation/hotel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    35563556            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
     
    35983598            <preset_link preset_name="Building" />
    35993599        </item> <!-- Motel -->
    3600         <item name="Guest House/Bed &amp; Breakfast" icon="presets/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
     3600        <item name="Guest House/Bed &amp; Breakfast" icon="presets/accommodation/guest_house.svg" type="node,closedway,multipolygon" preset_name_label="true">
    36013601            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
    36023602                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=guest_house"
     
    37053705        </item> <!-- Wilderness Hut -->
    37063706        <separator/>
    3707         <item name="Caravan Site/RV Park" icon="presets/accommodation/camping/caravan.png" type="node,closedway,multipolygon" preset_name_label="true">
     3707        <item name="Caravan Site/RV Park" icon="presets/accommodation/caravan.svg" type="node,closedway,multipolygon" preset_name_label="true">
    37083708            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
    37093709                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=caravan_site"
     
    37283728            <reference ref="link_contact_address_payment" />
    37293729        </item> <!-- Caravan Site/RV Park -->
    3730         <item name="Camping Site" icon="presets/accommodation/camping.png" type="node,closedway,multipolygon" preset_name_label="true">
     3730        <item name="Camping Site" icon="presets/accommodation/camping.svg" type="node,closedway,multipolygon" preset_name_label="true">
    37313731            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
    37323732                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=camp_site"
     
    37753775            <reference ref="link_contact_address_payment" />
    37763776        </item> <!-- Restaurant -->
    3777         <item name="Fast Food" icon="presets/fastfood.png" type="node,closedway,multipolygon" preset_name_label="true">
     3777        <item name="Fast Food" icon="presets/food/fastfood.png" type="node,closedway,multipolygon" preset_name_label="true">
    37783778            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food"
    37793779                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
     
    38133813            <reference ref="link_contact_address_payment" />
    38143814        </item> <!-- Food Court -->
    3815         <item name="Cafe" icon="presets/cafe.png" type="node,closedway,multipolygon" preset_name_label="true">
     3815        <item name="Cafe" icon="presets/food/cafe.png" type="node,closedway,multipolygon" preset_name_label="true">
    38163816            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe"
    38173817                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cafe"
     
    38873887            <reference ref="link_contact_address_payment" />
    38883888        </item> <!-- Beer Garden -->
    3889         <item name="Bar" icon="presets/food/bar.png" type="node,closedway,multipolygon" preset_name_label="true">
     3889        <item name="Bar" icon="presets/food/bar.svg" type="node,closedway,multipolygon" preset_name_label="true">
    38903890            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
    38913891                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
     
    39083908        </item> <!-- Bar -->
    39093909    </group> <!-- Food+Drinks -->
    3910     <group name="Tourism" icon="presets/sightseeing.png">
    3911         <item name="Attraction" icon="presets/sightseeing.png" type="node,closedway,multipolygon" preset_name_label="true">
     3910    <group name="Tourism" icon="presets/sightseeing/attraction.svg">
     3911        <item name="Attraction" icon="presets/sightseeing/attraction.svg" type="node,closedway,multipolygon" preset_name_label="true">
    39123912            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=attraction"
    39133913                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=attraction"
     
    39213921            <reference ref="name_oh_wheelchair" />
    39223922        </item> <!-- Attraction -->
    3923         <item name="Viewpoint" icon="presets/sightseeing/viewpoint.png" type="node,closedway,multipolygon" preset_name_label="true">
     3923        <item name="Viewpoint" icon="presets/sightseeing/viewpoint.svg" type="node,closedway,multipolygon" preset_name_label="true">
    39243924            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
    39253925                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=viewpoint"
     
    39363936        </item> <!-- Viewpoint -->
    39373937        <separator/>
    3938         <item name="Information Office" icon="presets/informationoffice.png" type="node,closedway,multipolygon" preset_name_label="true">
     3938        <item name="Information Office" icon="presets/misc/information/informationoffice.svg" type="node,closedway,multipolygon" preset_name_label="true">
    39393939            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    39403940                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:information"
     
    39523952            <reference ref="link_contact_address_payment" />
    39533953        </item> <!-- Information Office -->
    3954         <item name="Map" icon="presets/map.png" type="node" preset_name_label="true">
     3954        <item name="Map" icon="presets/misc/information/map.svg" type="node" preset_name_label="true">
    39553955            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    39563956                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
     
    39773977            </optional>
    39783978        </item> <!-- Map -->
    3979         <item name="Information Board" icon="presets/board.png" type="node" preset_name_label="true">
     3979        <item name="Information Board" icon="presets/misc/information/board.svg" type="node" preset_name_label="true">
    39803980            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    39813981                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
     
    39923992            <text key="description" text="Closer Description" />
    39933993        </item> <!-- Information Board -->
    3994         <item name="Guidepost" icon="presets/guidepost.png" type="node" preset_name_label="true">
     3994        <item name="Guidepost" icon="presets/misc/information/guidepost.svg" type="node" preset_name_label="true">
    39953995            <link href="http://wiki.openstreetmap.org/wiki/Tag:information=guidepost"
    39963996                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:information=guidepost"
     
    40154015            </optional>
    40164016        </item> <!-- Guidepost -->
    4017         <item name="Information Terminal" icon="presets/misc/information.png" type="node" preset_name_label="true">
     4017        <item name="Information Terminal" icon="presets/misc/information/information.svg" type="node" preset_name_label="true">
    40184018            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    40194019                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
     
    40334033            <reference ref="internet" />
    40344034        </item> <!-- Information Terminal -->
    4035         <item name="Audio Guide" icon="presets/misc/information.png" type="node" preset_name_label="true">
     4035        <item name="Audio Guide" icon="presets/misc/information/information.svg" type="node" preset_name_label="true">
    40364036            <link href="http://wiki.openstreetmap.org/wiki/Key:information"
    40374037                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
     
    40534053            <text key="phone" text="Phone number" />
    40544054        </item> <!-- Audio Guide -->
    4055         <item name="Other Information Point" icon="presets/misc/information.png" type="node,closedway" preset_name_label="true">
     4055        <item name="Other Information Point" icon="presets/misc/information/information.svg" type="node,closedway" preset_name_label="true">
    40564056            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
    40574057                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=information"
     
    40684068        </item> <!-- Other Information Point -->
    40694069    </group> <!-- Tourism -->
    4070     <group name="Leisure" icon="presets/theme_park.png">
    4071         <item name="Movie Theater/Cinema" icon="presets/cinema.png" type="node,closedway,multipolygon" preset_name_label="true">
     4070    <group name="Leisure" icon="presets/leisure/theme_park.svg">
     4071        <item name="Movie Theater/Cinema" icon="presets/leisure/cinema.svg" type="node,closedway,multipolygon" preset_name_label="true">
    40724072            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
    40734073                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=cinema"
     
    40874087            <preset_link preset_name="Building" />
    40884088        </item> <!-- Movie Theater/Cinema -->
    4089         <item name="Zoo" icon="presets/zoo.png" type="node,closedway,multipolygon" preset_name_label="true">
     4089        <item name="Zoo" icon="presets/leisure/zoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
    40904090            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
    40914091                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=zoo"
     
    41034103            <reference ref="link_contact_address_payment" />
    41044104        </item> <!-- Zoo -->
    4105         <item name="Dog Park" icon="presets/dogpark.png" type="node,closedway,multipolygon" preset_name_label="true">
     4105        <item name="Dog Park" icon="presets/leisure/dogpark.png" type="node,closedway,multipolygon" preset_name_label="true">
    41064106            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=dog_park"
    41074107                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:leisure=dog_park"
     
    41214121            <check key="lit" text="Lit" />
    41224122        </item> <!-- Dog Park -->
    4123         <item name="Amusement/Theme Park" icon="presets/theme_park.png" type="node,closedway,multipolygon" preset_name_label="true">
     4123        <item name="Amusement/Theme Park" icon="presets/leisure/theme_park.svg" type="node,closedway,multipolygon" preset_name_label="true">
    41244124            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=theme_park"
    41254125                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=theme_park"
     
    41494149            <reference ref="link_contact_address_payment" />
    41504150        </item> <!-- Water Park -->
    4151         <item name="Swimming Pool" icon="presets/sport/pool.png" type="node,closedway" preset_name_label="true">
     4151        <item name="Swimming Pool" icon="presets/sport/swimming.svg" type="node,closedway" preset_name_label="true">
    41524152            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
    41534153                  ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:leisure=swimming_pool"
     
    41724172            <text key="description" text="Description" />
    41734173        </item> <!-- Fitness Station -->
    4174         <item name="Sauna" icon="presets/sauna.png" type="node,closedway,multipolygon" preset_name_label="true">
     4174        <item name="Sauna" icon="presets/leisure/sauna.png" type="node,closedway,multipolygon" preset_name_label="true">
    41754175            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=sauna"
    41764176                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=sauna"
     
    41844184            <reference ref="link_contact_address_payment" />
    41854185        </item> <!-- Sauna -->
    4186         <item name="Horse Riding" icon="presets/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
     4186        <item name="Horse Riding" icon="presets/leisure/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
    41874187            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=horse_riding" />
    41884188            <space />
     
    41944194        </item> <!-- Horse Riding -->
    41954195        <separator/>
    4196         <item name="Playground" icon="presets/leisure/playground.png" type="node,closedway,multipolygon" preset_name_label="true">
     4196        <item name="Playground" icon="presets/leisure/playground.svg" type="node,closedway,multipolygon" preset_name_label="true">
    41974197            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
    41984198                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=playground"
     
    42294229            <check key="covered" text="Covered" />
    42304230        </item> <!-- Picnic Table -->
    4231         <item name="Public Grill" icon="presets/bbq.png" type="node,closedway,multipolygon" preset_name_label="true">
     4231        <item name="Public Grill" icon="presets/leisure/bbq.png" type="node,closedway,multipolygon" preset_name_label="true">
    42324232            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bbq"
    42334233                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bbq"
     
    43314331        </item> <!-- Brothel -->
    43324332    </group> <!-- Leisure -->
    4333     <group name="Culture" icon="presets/theater.png">
     4333    <group name="Culture" icon="presets/leisure/theater.png">
    43344334        <item name="Museum" icon="presets/sightseeing/museum.svg" type="node,closedway,multipolygon" preset_name_label="true">
    43354335            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
     
    43484348            <preset_link preset_name="Building" />
    43494349        </item> <!-- Museum -->
    4350         <item name="Theatre" icon="presets/theater.png" type="node,closedway,multipolygon" preset_name_label="true">
     4350        <item name="Theatre" icon="presets/leisure/theater.png" type="node,closedway,multipolygon" preset_name_label="true">
    43514351            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
    43524352                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=theatre"
     
    43784378            <preset_link preset_name="Building" />
    43794379        </item> <!-- Library -->
    4380         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
     4380        <item name="Arts Centre" icon="presets/service/arts_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
    43814381            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre"
    43824382                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=arts_centre"
     
    43904390            <preset_link preset_name="Building" />
    43914391        </item> <!-- Arts Centre -->
    4392         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway,multipolygon" preset_name_label="true">
     4392        <item name="Artwork" icon="presets/service/arts_centre.png" type="node,way,closedway,multipolygon" preset_name_label="true">
    43934393            <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork"
    43944394                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=artwork"
     
    44074407            <text key="artist_name" text="Artist Name" />
    44084408        </item> <!-- Artwork -->
    4409         <item name="Studio" icon="presets/studio.png" type="node,closedway,multipolygon" preset_name_label="true">
     4409        <item name="Studio" icon="presets/service/studio.png" type="node,closedway,multipolygon" preset_name_label="true">
    44104410            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=studio"
    44114411                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=studio"
     
    44214421        </item> <!-- Studio -->
    44224422    </group> <!-- Culture -->
    4423     <group name="Place of Worship" icon="presets/religion.png">
    4424         <item name="Church" icon="presets/religion/church.png" type="node,closedway,multipolygon" preset_name_label="true">
     4423    <group name="Place of Worship" icon="presets/religion/religion.svg">
     4424        <item name="Church" icon="presets/religion/church.svg" type="node,closedway,multipolygon" preset_name_label="true">
    44254425            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    44264426                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    44484448            <preset_link preset_name="Building" />
    44494449        </item> <!-- Church -->
    4450         <item name="Mosque" icon="presets/religion/muslim.png" type="node,closedway,multipolygon" preset_name_label="true">
     4450        <item name="Mosque" icon="presets/religion/muslim.svg" type="node,closedway,multipolygon" preset_name_label="true">
    44514451            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    44524452                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    44734473            <preset_link preset_name="Building" />
    44744474        </item> <!-- Mosque -->
    4475         <item name="Synagogue" icon="presets/religion/jewish.png" type="node,closedway,multipolygon" preset_name_label="true">
     4475        <item name="Synagogue" icon="presets/religion/jewish.svg" type="node,closedway,multipolygon" preset_name_label="true">
    44764476            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    44774477                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    44984498            <preset_link preset_name="Building" />
    44994499        </item> <!-- Synagogue -->
    4500         <item name="Buddhist Temple" icon="presets/religion/buddhism.png" type="node,closedway,multipolygon" preset_name_label="true">
     4500        <item name="Buddhist Temple" icon="presets/religion/buddhism.svg" type="node,closedway,multipolygon" preset_name_label="true">
    45014501            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    45024502                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    45224522            <preset_link preset_name="Building" />
    45234523        </item> <!-- Buddhist Temple -->
    4524         <item name="Hindu Temple" icon="presets/religion/hinduism.png" type="node,closedway,multipolygon" preset_name_label="true">
     4524        <item name="Hindu Temple" icon="presets/religion/hinduism.svg" type="node,closedway,multipolygon" preset_name_label="true">
    45254525            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    45264526                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    45464546            <preset_link preset_name="Building" />
    45474547        </item> <!-- Hindu Temple -->
    4548         <item name="Shinto Shrine" icon="presets/religion/shinto.png" type="node,closedway,multipolygon" preset_name_label="true">
     4548        <item name="Shinto Shrine" icon="presets/religion/shinto.svg" type="node,closedway,multipolygon" preset_name_label="true">
    45494549            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    45504550                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    45694569            <preset_link preset_name="Building" />
    45704570        </item> <!-- Shinto Shrine -->
    4571         <item name="Other Place of Worship" icon="presets/religion.png" type="node,closedway,multipolygon" preset_name_label="true">
     4571        <item name="Other Place of Worship" icon="presets/religion/religion.svg" type="node,closedway,multipolygon" preset_name_label="true">
    45724572            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
    45734573                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
     
    45934593        </item> <!-- Other Place of Worship -->
    45944594    </group> <!-- Place of Worship -->
    4595     <group name="Public Building" icon="presets/townhall.png">
    4596         <item name="Town Hall" icon="presets/townhall.png" type="node,closedway,multipolygon" preset_name_label="true">
     4595    <group name="Public Building" icon="presets/service/townhall.png">
     4596        <item name="Town Hall" icon="presets/service/townhall.png" type="node,closedway,multipolygon" preset_name_label="true">
    45974597            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall"
    45984598                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=townhall"
     
    46084608            <preset_link preset_name="Building" />
    46094609        </item> <!-- Town Hall -->
    4610         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
     4610        <item name="Community Centre" icon="presets/service/community_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
    46114611            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=community_centre"
    46124612                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=community_centre"
     
    46234623            <preset_link preset_name="Building" />
    46244624        </item> <!-- Community Centre -->
    4625         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,multipolygon" preset_name_label="true">
     4625        <item name="Embassy" icon="presets/service/embassy.png" type="node,closedway,multipolygon" preset_name_label="true">
    46264626            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy"
    46274627                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=embassy"
     
    46364636            <reference ref="link_contact_address" />
    46374637        </item> <!-- Embassy -->
    4638         <item name="Courthouse" icon="presets/service/administration/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4638        <item name="Courthouse" icon="presets/service/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
    46394639            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
    46404640                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
     
    46494649            <preset_link preset_name="Building" />
    46504650        </item> <!-- Courthouse -->
    4651         <item name="Prison" icon="presets/service/administration/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
     4651        <item name="Prison" icon="presets/service/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
    46524652            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
    46534653                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
     
    46614661            <reference ref="link_contact_address" />
    46624662        </item> <!-- Prison -->
    4663         <item name="Police" icon="presets/service/police.png" type="node,closedway,multipolygon" preset_name_label="true">
     4663        <item name="Police" icon="presets/service/police.svg" type="node,closedway,multipolygon" preset_name_label="true">
    46644664            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
    46654665                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=police"
     
    46834683            <reference ref="link_contact_address" />
    46844684        </item> <!-- Ranger Station -->
    4685         <item name="Fire Station" icon="presets/firebrigade.png" type="node,closedway,multipolygon" preset_name_label="true">
     4685        <item name="Fire Station" icon="presets/service/firebrigade.svg" type="node,closedway,multipolygon" preset_name_label="true">
    46864686            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
    46874687                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fire_station"
     
    47164716        </item> <!-- Post Office -->
    47174717    </group> <!-- Public Buildings -->
    4718     <group name="Education" icon="presets/school.png">
    4719         <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,multipolygon" preset_name_label="true">
     4718    <group name="Education" icon="presets/education/school.png">
     4719        <item name="Kindergarten" icon="presets/education/kindergarten.svg" type="node,closedway,multipolygon" preset_name_label="true">
    47204720            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=kindergarten"
    47214721                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=kindergarten"
     
    47324732            <preset_link preset_name="Building" />
    47334733        </item> <!-- Kindergarten -->
    4734         <item name="School" icon="presets/school.png" type="node,closedway,multipolygon" preset_name_label="true">
     4734        <item name="School" icon="presets/education/school.png" type="node,closedway,multipolygon" preset_name_label="true">
    47354735            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
    47364736                  ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:amenity=school"
     
    49234923            <reference ref="link_contact_address" />
    49244924        </item> <!-- Ambulance Station -->
    4925         <item name="Automated Defibrillator" icon="presets/aed.svg" type="node" preset_name_label="true">
     4925        <item name="Automated Defibrillator" icon="presets/emergency/aed.svg" type="node" preset_name_label="true">
    49264926            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=defibrillator"
    49274927                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=defibrillator"
     
    49634963            <text key="operator" text="Operator" />
    49644964        </item> <!-- Fire Hose -->
    4965         <item name="Fire Hydrant" icon="presets/fire_hydrant.png" type="node" preset_name_label="true">
     4965        <item name="Fire Hydrant" icon="presets/service/fire_hydrant.svg" type="node" preset_name_label="true">
    49664966            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
    49674967                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
     
    50035003            <reference ref="name_ref_operator" />
    50045004        </item> <!-- Assembly Point -->
    5005         <item name="Emergency Phone" icon="presets/vehicle/emergency_phone.png" type="node" preset_name_label="true">
     5005        <item name="Emergency Phone" icon="presets/vehicle/emergency_phone.svg" type="node" preset_name_label="true">
    50065006            <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
    50075007                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
     
    51155115        </item> <!-- Food Bank -->
    51165116    </group> <!-- Social Facility -->
    5117     <group name="Facilities" icon="presets/telephone.png">
    5118         <item name="Toilets/Restrooms" icon="presets/toilet.png" type="node,closedway" preset_name_label="true">
     5117    <group name="Facilities" icon="presets/service/telephone.svg">
     5118        <item name="Toilets/Restrooms" icon="presets/service/toilets.svg" type="node,closedway" preset_name_label="true">
    51195119            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
    51205120                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets"
     
    51735173            <check key="drive_through" text="Drive through" />
    51745174        </item> <!-- Post Box -->
    5175         <item name="Telephone" icon="presets/telephone.png" type="node" preset_name_label="true">
     5175        <item name="Telephone" icon="presets/service/telephone.svg" type="node" preset_name_label="true">
    51765176            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
    51775177                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=telephone"
     
    51905190            <preset_link preset_name="Payment Methods" />
    51915191        </item> <!-- Telephone -->
    5192         <item name="Internet Access" icon="presets/network-wireless.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
     5192        <item name="Internet Access" icon="presets/service/network-wireless.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
    51935193            <link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
    51945194                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:internet_access"
     
    52935293            <reference ref="link_contact_address_payment" />
    52945294        </item> <!-- Recycling Centre-->
    5295         <item name="Waste Basket/Trash Can" icon="presets/service/recycling/trash-bin.png" type="node" preset_name_label="true">
     5295        <item name="Waste Basket/Trash Can" icon="presets/service/recycling/trash-bin.svg" type="node" preset_name_label="true">
    52965296            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
    52975297                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
     
    53305330        </item> <!-- Sanitary Dump Station -->
    53315331        <separator/>
    5332         <item name="Bench" icon="presets/bench.png" type="node,way" preset_name_label="true">
     5332        <item name="Bench" icon="presets/leisure/bench.png" type="node,way" preset_name_label="true">
    53335333            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench"
    53345334                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bench"
     
    53725372            </combo>
    53735373        </item> <!-- Shelter -->
    5374         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node" preset_name_label="true">
     5374        <item name="Hunting Stand" icon="presets/landmark/hunting_stand.png" type="node" preset_name_label="true">
    53755375            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hunting_stand"
    53765376                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=hunting_stand"
     
    54045404            </optional>
    54055405        </item> <!-- Drinking Water -->
    5406         <item name="Water Point" icon="presets/accommodation/camping/water.png" type="node" preset_name_label="true">
     5406        <item name="Water Point" icon="presets/accommodation/chalet.svg" type="node" preset_name_label="true">
    54075407            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=water_point" />
    54085408            <space />
     
    54495449    </group> <!-- Facilities -->
    54505450  </group>  <!-- Facilities -->
    5451   <group name="Sports" icon="presets/sport/soccer.png">
    5452     <group name="Sport Facilities" icon="presets/stadium.png">
     5451  <group name="Sports" icon="presets/sport/soccer.svg">
     5452    <group name="Sport Facilities" icon="presets/sport/stadium.png">
    54535453        <item name="Stadium" icon="presets/sport/stadium.png" type="node,closedway,multipolygon" preset_name_label="true">
    54545454            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
     
    54805480            <preset_link preset_name="Building" />
    54815481        </item> <!-- Sports Centre -->
    5482         <item name="Fitness Centre" icon="presets/fitness_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
     5482        <item name="Fitness Centre" icon="presets/sport/fitness_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
    54835483            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fitness_centre" />
    54845484            <space />
     
    56605660        </item> <!-- Miniature Golf -->
    56615661    </group> <!-- Sport Facilities -->
    5662     <group name="Sport" icon="presets/rowing.png">
    5663         <item name="Multi" icon="presets/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
     5662    <group name="Sport" icon="presets/sport/multi.svg">
     5663        <item name="Multi" icon="presets/sport/multi.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56645664            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi"
    56655665                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=multi" />
     
    56695669            <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
    56705670        </item> <!-- Multi -->
    5671         <item name="Nine-pin Bowling" icon="presets/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
     5671        <item name="Nine-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56725672            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
    56735673                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
     
    56775677            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    56785678        </item> <!-- Nine-pin Bowling -->
    5679         <item name="Ten-pin Bowling" icon="presets/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
     5679        <item name="Ten-pin Bowling" icon="presets/sport/10pin.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56805680            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
    56815681                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
     
    56855685            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    56865686        </item> <!-- Ten-pin Bowling -->
    5687         <item name="Archery" icon="presets/sport/archery.png" type="node,closedway,multipolygon" preset_name_label="true">
     5687        <item name="Archery" icon="presets/sport/archery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    56885688            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
    56895689                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
     
    56935693            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    56945694        </item> <!-- Archery -->
    5695         <item name="Track and Field Athletics" icon="presets/athletics.png" type="node,closedway,multipolygon" preset_name_label="true">
     5695        <item name="Track and Field Athletics" icon="presets/sport/athletics.png" type="node,closedway,multipolygon" preset_name_label="true">
    56965696            <link href="http://wiki.openstreetmap.org/wiki/Tag:sports=athletics" />
    56975697            <space />
     
    57075707            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
    57085708        </item> <!-- Running -->
    5709         <item name="Climbing" icon="presets/sport/climbing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
     5709        <item name="Climbing" icon="presets/sport/climbing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    57105710            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
    57115711                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
     
    57235723            <text key="name" text="Name" />
    57245724        </item> <!-- Canoeing/Kayaking -->
    5725         <item name="Cycling" icon="presets/sport/cycling.png" type="node,closedway,multipolygon" preset_name_label="true">
     5725        <item name="Cycling" icon="presets/sport/cycling.svg" type="node,closedway,multipolygon" preset_name_label="true">
    57265726            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
    57275727            <space />
     
    57375737            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
    57385738        </item> <!-- Dog Racing -->
    5739         <item name="Equestrian" icon="presets/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
     5739        <item name="Equestrian" icon="presets/leisure/equestrian.png" type="node,closedway,multipolygon" preset_name_label="true">
    57405740            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=equestrian" />
    57415741            <space />
     
    57445744            <reference ref="riding_surface" />
    57455745        </item> <!-- Equestrian -->
    5746         <item name="Horse Racing" icon="presets/sport/riding.png" type="node,closedway,multipolygon" preset_name_label="true">
     5746        <item name="Horse Racing" icon="presets/sport/riding.svg" type="node,closedway,multipolygon" preset_name_label="true">
    57475747            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
    57485748            <space />
     
    57515751            <reference ref="riding_surface" />
    57525752        </item> <!-- Horse Racing -->
    5753         <item name="Gymnastics" icon="presets/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5753        <item name="Gymnastics" icon="presets/sport/gymnastics.svg" type="node,closedway,multipolygon" preset_name_label="true">
    57545754            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gymnastics" />
    57555755            <space />
     
    57585758            <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium" />
    57595759        </item> <!-- Gymnastics -->
    5760         <item name="Ice Skating" icon="presets/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
     5760        <item name="Ice Skating" icon="presets/sport/skating.png" type="node,closedway,multipolygon" preset_name_label="true">
    57615761            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_skating" />
    57625762            <space />
     
    57725772            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    57735773        </item> <!-- Roller Skating -->
    5774         <item name="Skateboard" icon="presets/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
     5774        <item name="Skateboard" icon="presets/sport/skateboard.svg" type="node,closedway,multipolygon" preset_name_label="true">
    57755775            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
    57765776                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
     
    57805780            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
    57815781        </item> <!-- Skateboard -->
    5782         <item name="Swimming" icon="presets/sport/pool.png" type="node,closedway,multipolygon" preset_name_label="true">
     5782        <item name="Swimming" icon="presets/sport/swimming.svg" type="node,closedway,multipolygon" preset_name_label="true">
    57835783            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
    57845784                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=swimming"
     
    57975797            <text key="name" text="Name" />
    57985798        </item> <!-- Scuba Diving -->
    5799         <item name="Skiing" icon="presets/sport/skiing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
     5799        <item name="Skiing" icon="presets/sport/skiing.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    58005800            <link href="http://wiki.openstreetmap.org/wiki/Piste_Maps"
    58015801                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
     
    58105810            </optional>
    58115811        </item> <!-- Skiing -->
    5812         <item name="Shooting" icon="presets/range.png" type="node,closedway,multipolygon" preset_name_label="true">
     5812        <item name="Shooting" icon="presets/sport/range.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58135813            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting"
    58145814                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=shooting"
     
    58225822        </item> <!-- Shooting -->
    58235823    </group> <!-- Sport -->
    5824     <group name="Sport (Ball)" icon="presets/sport/soccer.png">
    5825         <item name="Soccer" icon="presets/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
     5824    <group name="Sport (Ball)" icon="presets/sport/soccer.svg">
     5825        <item name="Soccer" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58265826            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
    58275827                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
     
    58335833            <reference ref="name_leisure_pitch" />
    58345834        </item> <!-- Soccer -->
    5835         <item name="Australian Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
     5835        <item name="Australian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58365836            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
    58375837            <space />
     
    58395839            <reference ref="name_leisure_pitch" />
    58405840        </item> <!-- Australian Football -->
    5841         <item name="American Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
     5841        <item name="American Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58425842            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=american_football" />
    58435843            <space />
     
    58455845            <reference ref="name_leisure_pitch" />
    58465846        </item> <!-- American Football -->
    5847         <item name="Canadian Football" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
     5847        <item name="Canadian Football" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58485848            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canadian_football" />
    58495849            <space />
     
    58515851            <reference ref="name_leisure_pitch" />
    58525852        </item> <!-- Canadian Football -->
    5853         <item name="Gaelic Games" icon="presets/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
     5853        <item name="Gaelic Games" icon="presets/sport/soccer.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58545854            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
    58555855            <space />
     
    58635863            </optional>
    58645864        </item> <!-- Gaelic Games -->
    5865         <item name="Rugby League" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
     5865        <item name="Rugby League" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58665866            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_league"
    58675867                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_league" />
     
    58705870            <reference ref="name_leisure_pitch" />
    58715871        </item> <!-- Rugby League -->
    5872         <item name="Rugby Union" icon="presets/sport/football.png" type="node,closedway,multipolygon" preset_name_label="true">
     5872        <item name="Rugby Union" icon="presets/sport/football.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58735873            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rugby_union"
    58745874                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:sport=rugby_union" />
     
    58775877            <reference ref="name_leisure_pitch" />
    58785878        </item> <!-- Rugby Union -->
    5879         <item name="Baseball" icon="presets/sport/baseball.png" type="node,closedway,multipolygon" preset_name_label="true">
     5879        <item name="Baseball" icon="presets/sport/baseball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58805880            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
    58815881            <space />
     
    58835883            <reference ref="name_leisure_pitch" />
    58845884        </item> <!-- Baseball -->
    5885         <item name="Basketball" icon="presets/sport/basketball.png" type="node,closedway,multipolygon" preset_name_label="true">
     5885        <item name="Basketball" icon="presets/sport/basketball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58865886            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=basketball" />
    58875887            <space />
     
    58895889            <reference ref="name_leisure_pitch" />
    58905890        </item> <!-- Basketball -->
    5891         <item name="Handball" icon="presets/sport/handball.png" type="node,closedway,multipolygon" preset_name_label="true">
     5891        <item name="Handball" icon="presets/sport/handball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58925892            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=handball" />
    58935893            <space />
     
    58965896            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    58975897        </item> <!-- Handball -->
    5898         <item name="Volleyball" icon="presets/sport/volleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
     5898        <item name="Volleyball" icon="presets/sport/volleyball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    58995899            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
    59005900            <space />
     
    59035903            <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
    59045904        </item> <!-- Volleyball -->
    5905         <item name="Beach Volleyball" icon="presets/beachvolleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
     5905        <item name="Beach Volleyball" icon="presets/sport/beachvolleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
    59065906            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=beachvolleyball" />
    59075907            <space />
     
    59275927            <combo key="leisure" text="Type" values="golf_course,pitch,sports_centre,stadium" default="golf_course" />
    59285928        </item> <!-- Golf -->
    5929         <item name="Boule" icon="presets/boule.png" type="node,closedway,multipolygon" preset_name_label="true">
     5929        <item name="Boule" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59305930            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=boules" />
    59315931            <space />
     
    59335933            <reference ref="name_leisure_pitch" />
    59345934        </item> <!-- Boule -->
    5935         <item name="Lawn Bowling" icon="presets/boule.png" type="node,closedway,multipolygon" preset_name_label="true">
     5935        <item name="Lawn Bowling" icon="presets/sport/boule.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59365936            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=bowls" />
    59375937            <space />
     
    59395939            <reference ref="name_leisure_pitch" />
    59405940        </item> <!-- Lawn Bowling -->
    5941         <item name="Cricket" icon="presets/sport/cricket.png" type="node,closedway,multipolygon" preset_name_label="true">
     5941        <item name="Cricket" icon="presets/sport/cricket.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59425942            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
    59435943            <space />
     
    59455945            <reference ref="name_leisure_pitch" />
    59465946        </item> <!-- Cricket -->
    5947         <item name="Croquet" icon="presets/sport/croquet.png" type="node,closedway,multipolygon" preset_name_label="true">
     5947        <item name="Croquet" icon="presets/sport/croquet.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59485948            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
    59495949            <space />
     
    59515951            <reference ref="name_leisure_pitch" />
    59525952        </item> <!-- Croquet -->
    5953         <item name="Field Hockey" icon="presets/field_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
     5953        <item name="Field Hockey" icon="presets/sport/field_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
    59545954            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=field_hockey" />
    59555955            <space />
     
    59585958            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    59595959        </item> <!-- Field Hockey -->
    5960         <item name="Ice Hockey" icon="presets/ice_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
     5960        <item name="Ice Hockey" icon="presets/sport/ice_hockey.png" type="node,closedway,multipolygon" preset_name_label="true">
    59615961            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=ice_hockey" />
    59625962            <space />
     
    59655965            <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" />
    59665966        </item> <!-- Ice Hockey -->
    5967         <item name="Pelota" icon="presets/pelota.png" type="node,closedway,multipolygon" preset_name_label="true">
     5967        <item name="Pelota" icon="presets/sport/pelota.png" type="node,closedway,multipolygon" preset_name_label="true">
    59685968            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=pelota"
    59695969                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=pelota" />
     
    59725972            <reference ref="name_leisure_pitch" />
    59735973        </item> <!-- Pelota -->
    5974         <item name="Racquetball" icon="presets/sport/racquetball.png" type="node,closedway,multipolygon" preset_name_label="true">
     5974        <item name="Racquetball" icon="presets/sport/racquetball.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59755975            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
    59765976                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
     
    59805980            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    59815981        </item> <!-- Racquetball -->
    5982         <item name="Table Tennis/Ping-Pong" icon="presets/table_tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
     5982        <item name="Table Tennis/Ping-Pong" icon="presets/sport/table_tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59835983            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=table_tennis" />
    59845984            <space />
     
    59875987            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    59885988        </item> <!-- Table Tennis/Ping-Pong -->
    5989         <item name="Tennis" icon="presets/sport/tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
     5989        <item name="Tennis" icon="presets/sport/tennis.svg" type="node,closedway,multipolygon" preset_name_label="true">
    59905990            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
    59915991            <space />
     
    59945994        </item> <!-- Tennis -->
    59955995    </group> <!-- Sport (Ball) -->
    5996     <group name="Motorsport" icon="presets/motorbike.png">
     5996    <group name="Motorsport" icon="presets/vehicle/motorbike.svg">
    59975997        <item name="Motorsport" icon="presets/sport/motor.png" type="node,closedway,multipolygon" preset_name_label="true">
    59985998            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motor"
     
    60036003            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
    60046004        </item> <!-- Motorsport -->
    6005         <item name="Kart Racing" icon="presets/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
     6005        <item name="Kart Racing" icon="presets/sports/karting.png" type="node,closedway,multipolygon" preset_name_label="true">
    60066006            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=karting"
    60076007                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=karting" />
     
    60116011            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
    60126012        </item> <!-- Kart Racing -->
    6013         <item name="Motocross" icon="presets/sport/motocross.png" type="node,closedway,multipolygon" preset_name_label="true">
     6013        <item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
    60146014            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
    60156015                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motocross"
     
    60216021        </item> <!-- Motocross -->
    60226022        <separator/>
    6023         <item name="Model Aerodrome" icon="presets/plane.png" type="node,closedway,multipolygon" preset_name_label="true">
     6023        <item name="Model Aerodrome" icon="presets/transport/airport.svg" type="node,closedway,multipolygon" preset_name_label="true">
    60246024            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=model_aerodrome" />
    60256025            <space />
     
    60286028            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
    60296029        </item> <!-- Model Aerodrome -->
    6030         <item name="RC Car" icon="presets/transport/car.png" type="node,closedway,multipolygon" preset_name_label="true">
     6030        <item name="RC Car" icon="presets/sport/rc_car.svg" type="node,closedway,multipolygon" preset_name_label="true">
    60316031            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
    60326032                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
     
    60486048    </group> <!-- Motorsport -->
    60496049  </group> <!-- Sports -->
    6050   <group name="Man Made" icon="presets/works.png">
    6051     <group name="Man Made" icon="presets/works.png">
    6052         <item name="Building" icon="presets/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
     6050  <group name="Man Made" icon="presets/landmark/works.svg">
     6051    <group name="Man Made" icon="presets/landmark/works.svg">
     6052        <item name="Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
    60536053            <link href="http://wiki.openstreetmap.org/wiki/Key:building"
    60546054                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
     
    60746074            <preset_link preset_name="Addresses" />
    60756075        </item> <!-- Building -->
    6076         <item name="Residential Building" icon="presets/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
     6076        <item name="Residential Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
    60776077            <link href="http://wiki.openstreetmap.org/wiki/Key:building"
    60786078                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
     
    60976097            <preset_link preset_name="Addresses" />
    60986098        </item> <!-- Residential Building -->
    6099         <item name="Building part" icon="presets/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
     6099        <item name="Building part" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
    61006100            <link href="http://wiki.openstreetmap.org/wiki/Key:building:part"
    61016101                  de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building:part"
     
    61386138            </optional>
    61396139        </item> <!-- Entrance -->
    6140         <item name="Tower" icon="presets/misc/landmark/tower.png" type="node,closedway" preset_name_label="true">
     6140        <item name="Tower" icon="presets/landmark/tower.png" type="node,closedway" preset_name_label="true">
    61416141            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
    61426142                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=tower"
     
    61566156            </optional>
    61576157        </item> <!-- Tower -->
    6158         <item name="Flagpole" icon="presets/flag.png" type="node" preset_name_label="true">
     6158        <item name="Flagpole" icon="presets/misc/flag.png" type="node" preset_name_label="true">
    61596159            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=flagpole"
    61606160                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=flagpole"
     
    61656165        </item> <!-- Flagpole -->
    61666166        <separator/>
    6167         <item name="Works" icon="presets/misc/landmark/works.png" type="node,closedway,multipolygon" preset_name_label="true">
     6167        <item name="Works" icon="presets/landmark/works.svg" type="node,closedway,multipolygon" preset_name_label="true">
    61686168            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
    61696169                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=works"
     
    61776177            <text key="name" text="Name" />
    61786178        </item> <!-- Works -->
    6179         <item name="Chimney" icon="presets/chimney.png" type="node,closedway" preset_name_label="true">
     6179        <item name="Chimney" icon="presets/landmark/chimney.png" type="node,closedway" preset_name_label="true">
    61806180            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=chimney"
    61816181                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=chimney"
     
    61876187            <text key="height" text="Height (meters)" />
    61886188        </item> <!-- Chimney -->
    6189         <item name="Windmill" icon="presets/misc/landmark/windmill.png" type="node,closedway" preset_name_label="true">
     6189        <item name="Windmill" icon="presets/landmark/windmill.svg" type="node,closedway" preset_name_label="true">
    61906190            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
    61916191                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=windmill"
     
    62006200            <text key="name" text="Name" />
    62016201        </item> <!-- Windmill -->
    6202         <item name="Gasometer" icon="presets/gasometer.png" type="node,closedway" preset_name_label="true">
     6202        <item name="Gasometer" icon="presets/landmark/gasometer.svg" type="node,closedway" preset_name_label="true">
    62036203            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=gasometer"
    62046204                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=gasometer"
     
    62126212            </optional>
    62136213        </item> <!-- Gasometer -->
    6214         <item name="Silo" icon="presets/silo.png" type="node,closedway" preset_name_label="true">
     6214        <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
    62156215            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=silo" />
    62166216            <space />
     
    62226222            </optional>
    62236223        </item> <!-- Silo -->
    6224         <item name="Storage Tank" icon="presets/storage_tank.png" type="node,closedway">
     6224        <item name="Storage Tank" icon="presets/landmark/storage_tank.svg" type="node,closedway">
    62256225            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=storage_tank"
    62266226                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=storage_tank"
     
    62356235            </optional>
    62366236        </item> <!-- Storage Tank -->
    6237         <item name="Bunker Silo" icon="presets/bunker_silo.svg" type="node,closedway" preset_name_label="true">
     6237        <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
    62386238            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo"
    62396239                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bunker_silo"
     
    62466246            </optional>
    62476247        </item> <!-- Bunker Silo -->
    6248         <item name="Crane" icon="presets/crane.png" type="node,way,closedway" preset_name_label="true">
     6248        <item name="Crane" icon="presets/landmark/crane.svg" type="node,way,closedway" preset_name_label="true">
    62496249            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane"
    62506250                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=crane"
     
    62576257            <text key="name" text="Name" />
    62586258        </item> <!-- Crane -->
    6259         <item name="Mineshaft" icon="presets/mineshaft.png" type="node,closedway" preset_name_label="true">
     6259        <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
    62606260            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=mineshaft"
    62616261                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=mineshaft"
     
    62746274            <check key="disused" text="Disused" />
    62756275        </item> <!-- Mineshaft -->
    6276         <item name="Adit" icon="presets/adit.png" type="node" preset_name_label="true">
     6276        <item name="Adit" icon="presets/landmark/adit.svg" type="node" preset_name_label="true">
    62776277            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=adit"
    62786278                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=adit"
     
    63026302        </item> <!-- Embankment -->
    63036303        <separator/>
    6304         <item name="Pipeline" icon="presets/path.png" type="way" preset_name_label="true">
     6304        <item name="Pipeline" icon="presets/misc/path.png" type="way" preset_name_label="true">
    63056305            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
    63066306                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pipeline"
     
    63346334        </item> <!-- Pipeline Valve -->
    63356335        <separator/>
    6336         <item name="Water Tower" icon="presets/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
     6336        <item name="Water Tower" icon="presets/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
    63376337            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
    63386338                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_tower"
     
    63496349            </optional>
    63506350        </item> <!-- Water Tower -->
    6351         <item name="Water Works" icon="presets/water_works.png" type="node,closedway,multipolygon" preset_name_label="true">
     6351        <item name="Water Works" icon="presets/landmark/water_works.png" type="node,closedway,multipolygon" preset_name_label="true">
    63526352            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_works"
    63536353                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_works"
     
    63616361            <reference ref="name_operator" />
    63626362        </item> <!-- Water Works -->
    6363         <item name="Wastewater Treatment Plant" icon="presets/wastewater_plant.png" type="node,closedway,multipolygon" preset_name_label="true">
     6363        <item name="Wastewater Treatment Plant" icon="presets/landmark/wastewater_plant.svg" type="node,closedway,multipolygon" preset_name_label="true">
    63646364            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
    63656365                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=wastewater_plant"
     
    63756375            <text key="name" text="Name" />
    63766376        </item> <!-- Wastewater Treatment Plant -->
    6377         <item name="Watermill" icon="presets/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
     6377        <item name="Watermill" icon="presets/landmark/watermill.png" type="node,closedway" preset_name_label="true">
    63786378            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
    63796379                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
     
    64036403            <text key="name" text="Name" />
    64046404        </item> <!-- Fountain -->
    6405         <item name="Water Well" icon="presets/water_well.png" type="node,closedway" preset_name_label="true">
     6405        <item name="Water Well" icon="presets/landmark/water_well.svg" type="node,closedway" preset_name_label="true">
    64066406            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
    64076407                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_well"
     
    64186418        </item> <!-- Water Well -->
    64196419        <separator/>
    6420         <item name="Lighthouse" icon="presets/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
     6420        <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway" preset_name_label="true">
    64216421            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse"
    64226422                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=lighthouse"
     
    64296429            <text key="name" text="Name" />
    64306430        </item> <!-- Lighthouse -->
    6431         <item name="Beacon" icon="presets/misc/landmark/beacon.png" type="node,closedway" preset_name_label="true">
     6431        <item name="Beacon" icon="presets/landmark/beacon.png" type="node,closedway" preset_name_label="true">
    64326432            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
    64336433                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
     
    64466446            <combo key="opening_hours" text="Operation times" values="Mo-Fr 22:00-05:00" values_no_i18n="true" />
    64476447        </item> <!-- Street Lamp -->
    6448         <item name="Monitoring Station" icon="presets/monitoring_station.png" type="node,closedway" preset_name_label="true">
     6448        <item name="Monitoring Station" icon="presets/misc/monitoring_station.png" type="node,closedway" preset_name_label="true">
    64496449            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=monitoring_station"
    64506450                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=monitoring_station"
     
    64846484            </checkgroup>
    64856485        </item> <!-- Monitoring Station -->
    6486         <item name="Survey Point" icon="presets/misc/landmark/survey_point.png" type="node" preset_name_label="true">
     6486        <item name="Survey Point" icon="presets/landmark/survey_point.svg" type="node" preset_name_label="true">
    64876487            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
    64886488                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=survey_point"
     
    64986498            <text key="ele" text="Elevation" />
    64996499        </item> <!-- Survey Point -->
    6500         <item name="Surveillance Camera" icon="presets/surveillance.png" type="node,closedway" preset_name_label="true">
     6500        <item name="Surveillance Camera" icon="presets/service/surveillance.png" type="node,closedway" preset_name_label="true">
    65016501            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance"
    65026502                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=surveillance"
     
    65746574        </item> <!-- Bridge outline -->
    65756575    </group> <!-- Bridges -->
    6576     <group name="Military" name_context="preset group" icon="presets/military.png">
    6577         <item name="Airfield" icon="presets/transport/airport/airfield.png" type="node,closedway,multipolygon" preset_name_label="true">
     6576    <group name="Military" name_context="preset group" icon="presets/landuse/military.svg">
     6577        <item name="Airfield" icon="presets/transport/airport/airfield.svg" type="node,closedway,multipolygon" preset_name_label="true">
    65786578            <link href="http://wiki.openstreetmap.org/wiki/Tag:military=airfield"
    65796579                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=airfield"
     
    65916591            <key key="military" value="barracks" />
    65926592        </item> <!-- Barracks -->
    6593         <item name="Bunker" icon="presets/misc/landmark/bunker.png" type="node,closedway,multipolygon" preset_name_label="true">
     6593        <item name="Bunker" icon="presets/landmark/bunker.svg" type="node,closedway,multipolygon" preset_name_label="true">
    65946594            <link href="http://wiki.openstreetmap.org/wiki/Tag:military=bunker"
    65956595                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:military=bunker"
     
    66066606            <check key="ruins" text="Ruins" />
    66076607        </item> <!-- Bunker -->
    6608         <item name="Range" icon="presets/misc/landmark/range.png" type="node,closedway,multipolygon" preset_name_label="true">
     6608        <item name="Range" icon="presets/sport/range.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66096609            <link href="http://wiki.openstreetmap.org/wiki/Tag:military=range"
    66106610                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=range"
     
    66406640        </item> <!-- Power Plant -->
    66416641        <group name="Power Generator" icon="presets/power/generator.svg">
    6642             <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6642            <item name="Biofuel Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66436643                <key key="generator:source" value="biofuel" />
    66446644                <reference ref="power_generator" />
     
    66476647                <reference ref="power_output" />
    66486648            </item> <!-- Power Generator -->
    6649             <item name="Biogas Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6649            <item name="Biogas Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66506650                <key key="generator:source" value="biogas" />
    66516651                <reference ref="power_generator" />
     
    66546654                <reference ref="power_output" />
    66556655            </item> <!-- Biogas Power Generator -->
    6656             <item name="Biomass Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6656            <item name="Biomass Power Generator" icon="presets/power/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66576657                <key key="generator:source" value="biomass" />
    66586658                <reference ref="power_generator" />
     
    66666666                <reference ref="power_output" />
    66676667            </item> <!-- Biomass Power Generator -->
    6668             <item name="Coal Power Generator" icon="presets/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6668            <item name="Coal Power Generator" icon="presets/power/power_source-coal.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66696669                <key key="generator:source" value="coal" />
    66706670                <reference ref="power_generator" />
     
    66736673                <reference ref="power_output" />
    66746674            </item> <!-- Coal Power Generator -->
    6675             <item name="Gas Power Generator" icon="presets/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6675            <item name="Gas Power Generator" icon="presets/power/power_source-gas.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66766676                <key key="generator:source" value="gas" />
    66776677                <reference ref="power_generator" />
     
    66806680                <reference ref="power_output" />
    66816681            </item> <!-- Gas Power Generator -->
    6682             <item name="Oil Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6682            <item name="Oil Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66836683                <key key="generator:source" value="oil" />
    66846684                <reference ref="power_generator" />
     
    66876687                <reference ref="power_output" />
    66886688            </item> <!-- Oil Power Generator -->
    6689             <item name="Diesel Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6689            <item name="Diesel Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66906690                <key key="generator:source" value="diesel" />
    66916691                <reference ref="power_generator" />
     
    66946694                <reference ref="power_output" />
    66956695            </item> <!-- Diesel Power Generator -->
    6696             <item name="Gasoline Power Generator" icon="presets/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6696            <item name="Gasoline Power Generator" icon="presets/power/power_source-oil.svg" type="node,closedway,multipolygon" preset_name_label="true">
    66976697                <key key="generator:source" value="gasoline" />
    66986698                <reference ref="power_generator" />
     
    67016701                <reference ref="power_output" />
    67026702            </item> <!-- Gasoline Power Generator -->
    6703             <item name="Nuclear Reactor" icon="presets/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6703            <item name="Nuclear Reactor" icon="presets/power/power_source-nuclear.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67046704                <key key="generator:source" value="nuclear" />
    67056705                <reference ref="power_generator" />
     
    67266726                <reference ref="power_output" />
    67276727            </item> <!-- Nuclear Reactor -->
    6728             <item name="Solar Power Generator" icon="presets/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6728            <item name="Solar Power Generator" icon="presets/power/power_source-sun.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67296729                <key key="generator:source" value="solar" />
    67306730                <reference ref="power_generator" />
     
    67376737                <reference ref="power_output" />
    67386738            </item> <!-- Solar Power Generator -->
    6739             <item name="Waste Power Generator" icon="presets/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6739            <item name="Waste Power Generator" icon="presets/power/power_source-waste.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67406740                <key key="generator:source" value="waste" />
    67416741                <reference ref="power_generator" />
     
    67506750                <reference ref="power_output" />
    67516751            </item> <!-- Waste Power Generator -->
    6752             <item name="Water Turbine" icon="presets/power_source-water.svg" type="node,closedway" preset_name_label="true">
     6752            <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
    67536753                <key key="generator:source" value="hydro" />
    67546754                <reference ref="power_generator" />
     
    67626762                <reference ref="power_output" />
    67636763            </item> <!-- Water Turbine -->
    6764             <item name="Tidal Water Turbine" icon="presets/power_source-water.svg" type="node,closedway" preset_name_label="true">
     6764            <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
    67656765                <key key="generator:source" value="tidal" />
    67666766                <reference ref="power_generator" />
     
    67736773                <reference ref="power_output" />
    67746774            </item> <!-- Tidal Water Turbine -->
    6775             <item name="Wave Energy Converter" icon="presets/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6775            <item name="Wave Energy Converter" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67766776                <key key="generator:source" value="wave" />
    67776777                <reference ref="power_generator" />
    67786778                <reference ref="power_output" />
    67796779            </item> <!-- Wave Energy Converter -->
    6780             <item name="Osmotic Power Generator" icon="presets/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6780            <item name="Osmotic Power Generator" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67816781                <key key="generator:source" value="osmotic" />
    67826782                <reference ref="power_generator" />
    67836783                <reference ref="power_output" />
    67846784            </item> <!-- Osmotic Power Generator -->
    6785             <item name="Geothermal Power Generator" icon="presets/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
     6785            <item name="Geothermal Power Generator" icon="presets/power/power_source-geothermal.svg" type="node,closedway,multipolygon" preset_name_label="true">
    67866786                <key key="generator:source" value="geothermal" />
    67876787                <reference ref="power_generator" />
     
    67896789                <reference ref="power_output" />
    67906790            </item> <!-- Geothermal Power Generator -->
    6791             <item name="Wind Turbine" icon="presets/power_source-wind.svg" type="node,closedway" preset_name_label="true">
     6791            <item name="Wind Turbine" icon="presets/power/power_source-wind.svg" type="node,closedway" preset_name_label="true">
    67926792                <key key="generator:source" value="wind" />
    67936793                <reference ref="power_generator" />
     
    70627062            <reference ref="link_contact_address_payment" />
    70637063        </item> <!-- Castle -->
    7064         <item name="Ruins" icon="presets/ruins.png" type="node,closedway,multipolygon" preset_name_label="true">
     7064        <item name="Ruins" icon="presets/sightseeing/ruins.svg" type="node,closedway,multipolygon" preset_name_label="true">
    70657065            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=ruins"
    70667066                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=ruins"
     
    70747074            <reference ref="name_oh_wheelchair" />
    70757075        </item> <!-- Ruins -->
    7076         <item name="Archaeological Site" icon="presets/sightseeing/archaeological.png" type="node,closedway,multipolygon" preset_name_label="true">
     7076        <item name="Archaeological Site" icon="presets/sightseeing/archaeological.svg" type="node,closedway,multipolygon" preset_name_label="true">
    70777077            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
    70787078                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
     
    70867086            <reference ref="name_oh_wheelchair" />
    70877087        </item> <!-- Archaeological Site -->
    7088         <item name="Battlefield" icon="presets/battlefield.png" type="node,closedway,multipolygon" preset_name_label="true">
     7088        <item name="Battlefield" icon="presets/sightseeing/battlefield.svg" type="node,closedway,multipolygon" preset_name_label="true">
    70897089            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield"
    70907090                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=battlefield"
     
    70987098            <text key="name" text="Name" />
    70997099        </item> <!-- Battlefield -->
    7100         <item name="Palaeontological Site" icon="presets/palaeontological_site.png" type="node,closedway,multipolygon" preset_name_label="true">
     7100        <item name="Palaeontological Site" icon="presets/sightseeing/palaeontological_site.png" type="node,closedway,multipolygon" preset_name_label="true">
    71017101            <link href="http://wiki.openstreetmap.org/wiki/Tag:geological=palaeontological_site"
    71027102                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:geological=palaeontological_site"
     
    71097109        </item> <!-- Palaeontological Site -->
    71107110        <separator/>
    7111         <item name="Monument" icon="presets/monument.png" type="node,closedway,multipolygon" preset_name_label="true">
     7111        <item name="Monument" icon="presets/sightseeing/monument.svg" type="node,closedway,multipolygon" preset_name_label="true">
    71127112            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=monument"
    71137113                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=monument"
     
    71227122            <text key="name" text="Name" />
    71237123        </item> <!-- Monument -->
    7124         <item name="Memorial" icon="presets/memorial.png" type="node,closedway,multipolygon" preset_name_label="true">
     7124        <item name="Memorial" icon="presets/sightseeing/memorial.svg" type="node,closedway,multipolygon" preset_name_label="true">
    71257125            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial"
    71267126                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=memorial"
     
    71427142            </optional>
    71437143        </item> <!-- Memorial -->
    7144         <item name="Wayside Cross" icon="presets/wayside_cross.png" type="node,closedway" preset_name_label="true">
     7144        <item name="Wayside Cross" icon="presets/religion/wayside_cross.svg" type="node,closedway" preset_name_label="true">
    71457145            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_cross"
    71467146                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_cross"
     
    71577157            <text key="inscription" text="Inscription" />
    71587158        </item> <!-- Wayside Cross -->
    7159         <item name="Wayside Shrine" icon="presets/wayside_shrine.png" type="node,closedway" preset_name_label="true">
     7159        <item name="Wayside Shrine" icon="presets/religion/wayside_shrine.svg" type="node,closedway" preset_name_label="true">
    71607160            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=wayside_shrine"
    71617161                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=wayside_shrine"
     
    71767176            <text key="inscription" text="Inscription" />
    71777177        </item> <!-- Wayside Shrine -->
    7178         <item name="Boundary Stone" icon="presets/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
     7178        <item name="Boundary Stone" icon="presets/misc/boundary_stone.png" type="node,closedway" preset_name_label="true">
    71797179            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=boundary_stone"
    71807180                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=boundary_stone"
     
    71897189    </group> <!-- Historic Places -->
    71907190  </group> <!-- Man Made -->
    7191   <group name="Shops" icon="presets/shop/mall.png">
     7191  <group name="Shops" icon="presets/shop/mall.svg">
    71927192    <group name="Food" icon="presets/shop/supermarket.svg">
    71937193        <item name="Supermarket" icon="presets/shop/supermarket.svg" type="node,closedway,multipolygon" preset_name_label="true">
     
    72057205            <reference ref="link_contact_address_payment" />
    72067206        </item> <!-- Supermarket -->
    7207         <item name="Convenience Store" icon="presets/convenience.png" type="node,closedway,multipolygon" preset_name_label="true">
     7207        <item name="Convenience Store" icon="presets/shop/convenience.png" type="node,closedway,multipolygon" preset_name_label="true">
    72087208            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience"
    72097209                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=convenience"
     
    72197219            <reference ref="link_contact_address_payment" />
    72207220        </item> <!-- Convenience Store -->
    7221         <item name="Kiosk" icon="presets/kiosk.png" type="node,closedway,multipolygon" preset_name_label="true">
     7221        <item name="Kiosk" icon="presets/shop/kiosk.svg" type="node,closedway,multipolygon" preset_name_label="true">
    72227222            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk"
    72237223                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kiosk"
     
    72347234        </item> <!-- Kiosk -->
    72357235        <separator/>
    7236         <item name="Bakery" icon="presets/baker.png" type="node,closedway,multipolygon" preset_name_label="true">
     7236        <item name="Bakery" icon="presets/shop/groceries/bakery.png" type="node,closedway,multipolygon" preset_name_label="true">
    72377237            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery"
    72387238                  ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:shop=bakery"
     
    72667266            <reference ref="link_contact_address_payment" />
    72677267        </item> <!-- Butcher -->
    7268         <item name="Seafood" icon="presets/seafood.png" type="node,closedway,multipolygon" preset_name_label="true">
     7268        <item name="Seafood" icon="presets/shop/groceries/seafood.png" type="node,closedway,multipolygon" preset_name_label="true">
    72697269            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=seafood"
    72707270                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=seafood"
     
    72787278            <reference ref="link_contact_address_payment" />
    72797279        </item> <!-- Seafood -->
    7280         <item name="Deli (Fine Food)" icon="presets/deli.png" type="node,closedway,multipolygon" preset_name_label="true">
     7280        <item name="Deli (Fine Food)" icon="presets/shop/groceries/deli.png" type="node,closedway,multipolygon" preset_name_label="true">
    72817281            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=deli"
    72827282                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=deli"
     
    72917291            <reference ref="link_contact_address_payment" />
    72927292        </item> <!-- Deli (Fine Food) -->
    7293         <item name="Candy Store" icon="presets/confectionery.png" type="node,closedway,multipolygon" preset_name_label="true">
     7293        <item name="Candy Store" icon="presets/shop/groceries/confectionery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    72947294            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=confectionery"
    72957295                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=confectionery"
     
    73267326        </item> <!-- Coffee -->
    73277327        <separator/>
    7328         <item name="Public Market" icon="presets/place/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
     7328        <item name="Public Market" icon="presets/shop/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
    73297329            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
    73307330                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
     
    73427342            <combo key="organic" text="Organic" values="only,yes,no" />
    73437343        </item> <!-- Public Market -->
    7344         <item name="Greengrocer" icon="presets/greengrocer.png" type="node,closedway,multipolygon" preset_name_label="true">
     7344        <item name="Greengrocer" icon="presets/shop/groceries/greengrocer.png" type="node,closedway,multipolygon" preset_name_label="true">
    73457345            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
    73467346                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=greengrocer"
     
    73567356            <reference ref="link_contact_address_payment" />
    73577357        </item> <!-- Greengrocer -->
    7358         <item name="Farm Stand" icon="presets/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
     7358        <item name="Farm Stand" icon="presets/shop/apple.png" type="node,closedway,multipolygon" preset_name_label="true">
    73597359            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=farm"
    73607360                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=farm"
     
    73867386        </item> <!-- Fair Trade -->
    73877387        <separator/>
    7388         <item name="Alcohol" icon="presets/shop/alcohol.png" type="node,closedway,multipolygon" preset_name_label="true">
     7388        <item name="Alcohol" icon="presets/shop/alcohol.svg" type="node,closedway,multipolygon" preset_name_label="true">
    73897389            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
    73907390                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=alcohol"
     
    74007400            <reference ref="link_contact_address_payment" />
    74017401        </item> <!-- Alcohol -->
    7402         <item name="Beverages" icon="presets/shop/beverages.png" type="node,closedway,multipolygon" preset_name_label="true">
     7402        <item name="Beverages" icon="presets/shop/beverages.svg" type="node,closedway,multipolygon" preset_name_label="true">
    74037403            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
    74047404                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
     
    74227422        </item> <!-- Wine -->
    74237423    </group> <!-- Food -->
    7424     <group name="Clothes" icon="presets/shop/clothes.png">
    7425         <item name="Clothes" icon="presets/shop/clothes.png" type="node,closedway,multipolygon" preset_name_label="true">
     7424    <group name="Clothes" icon="presets/shop/clothes.svg">
     7425        <item name="Clothes" icon="presets/shop/clothes.svg" type="node,closedway,multipolygon" preset_name_label="true">
    74267426            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
    74277427                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=clothes"
     
    74407440            <reference ref="link_contact_address_payment" />
    74417441        </item> <!-- Clothes -->
    7442         <item name="Boutique" icon="presets/boutique.png" type="node,closedway,multipolygon" preset_name_label="true">
     7442        <item name="Boutique" icon="presets/shop/boutique.png" type="node,closedway,multipolygon" preset_name_label="true">
    74437443            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=boutique"
    74447444                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=boutique"
     
    74527452            <reference ref="link_contact_address_payment" />
    74537453        </item> <!-- Boutique -->
    7454         <item name="Shoes" icon="presets/shop/shoes.png" type="node,closedway,multipolygon" preset_name_label="true">
     7454        <item name="Shoes" icon="presets/shop/shoes.svg" type="node,closedway,multipolygon" preset_name_label="true">
    74557455            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
    74567456                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
     
    74647464            <reference ref="link_contact_address_payment" />
    74657465        </item> <!-- Shoes -->
    7466         <item name="Outdoor" icon="presets/shop/outdoor.png" type="node,closedway,multipolygon" preset_name_label="true">
     7466        <item name="Outdoor" icon="presets/shop/outdoor.svg" type="node,closedway,multipolygon" preset_name_label="true">
    74677467            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
    74687468                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
     
    74757475            <reference ref="link_contact_address_payment" />
    74767476        </item> <!-- Outdoor -->
    7477         <item name="Sports" icon="presets/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
     7477        <item name="Sports" icon="presets/sport/multi.svg" type="node,closedway,multipolygon" preset_name_label="true">
    74787478             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
    74797479                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=sports"
     
    74867486        </item> <!-- Sports -->
    74877487        <separator/>
    7488         <item name="Dry Cleaning" icon="presets/laundry.png" type="node,closedway,multipolygon" preset_name_label="true">
     7488        <item name="Dry Cleaning" icon="presets/shop/laundry.svg" type="node,closedway,multipolygon" preset_name_label="true">
    74897489            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning"
    74907490                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=dry_cleaning"
     
    74987498            <reference ref="link_contact_address_payment" />
    74997499        </item> <!-- Dry Cleaning -->
    7500         <item name="Laundry" icon="presets/laundry.png" type="node,closedway,multipolygon" preset_name_label="true">
     7500        <item name="Laundry" icon="presets/shop/laundry.svg" type="node,closedway,multipolygon" preset_name_label="true">
    75017501            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=laundry"
    75027502                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=laundry"
     
    75087508            <reference ref="link_contact_address_payment" />
    75097509        </item> <!-- Laundry -->
    7510         <item name="Tailor" icon="presets/shop/tailor.png" type="node,closedway,multipolygon" preset_name_label="true">
     7510        <item name="Tailor" icon="presets/shop/tailor.svg" type="node,closedway,multipolygon" preset_name_label="true">
    75117511            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tailor"
    75127512                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=tailor" />
     
    75167516            <reference ref="link_contact_address_payment" />
    75177517        </item> <!-- Tailor -->
    7518         <item name="Fabric" icon="presets/fabric.png" type="node,closedway,multipolygon" preset_name_label="true">
     7518        <item name="Fabric" icon="presets/shop/fabric.png" type="node,closedway,multipolygon" preset_name_label="true">
    75197519            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=fabric"
    75207520                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=fabric"
     
    75277527        </item> <!-- Fabric -->
    75287528    </group> <!-- Clothes -->
    7529     <group name="Electronic" icon="presets/shop/electronics.png">
    7530         <item name="Computer" icon="presets/shop/computer.png" type="node,closedway,multipolygon" preset_name_label="true">
     7529    <group name="Electronic" icon="presets/shop/electronics.svg">
     7530        <item name="Computer" icon="presets/shop/computer.svg" type="node,closedway,multipolygon" preset_name_label="true">
    75317531            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=computer"
    75327532                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=computer"
     
    75397539            <reference ref="link_contact_address_payment" />
    75407540        </item> <!-- Computer -->
    7541         <item name="Electronics" icon="presets/shop/electronics.png" type="node,closedway,multipolygon" preset_name_label="true">
     7541        <item name="Electronics" icon="presets/shop/electronics.svg" type="node,closedway,multipolygon" preset_name_label="true">
    75427542            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
    75437543                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
     
    75497549            <reference ref="link_contact_address_payment" />
    75507550        </item> <!-- Computer -->
    7551         <item name="Mobile Phone" icon="presets/mobile_phone.png" type="node,closedway,multipolygon" preset_name_label="true">
     7551        <item name="Mobile Phone" icon="presets/shop/mobile_phone.png" type="node,closedway,multipolygon" preset_name_label="true">
    75527552            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mobile_phone"
    75537553                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mobile_phone"
     
    75597559            <reference ref="link_contact_address_payment" />
    75607560        </item> <!-- Mobile Phone -->
    7561         <item name="Vacuum Cleaner" icon="presets/vacuum_cleaner.png" type="node,closedway,multipolygon" preset_name_label="true">
     7561        <item name="Vacuum Cleaner" icon="presets/shop/vacuum_cleaner.png" type="node,closedway,multipolygon" preset_name_label="true">
    75627562            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=vacuum_cleaner"
    75637563                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=vacuum_cleaner"
     
    76087608    </group> <!-- Electronic -->
    76097609    <group name="Cash" icon="presets/money/dollar.svg">
    7610         <item name="Bank" icon="presets/money/bank.png" type="node,closedway,multipolygon" preset_name_label="true">
     7610        <item name="Bank" icon="presets/money/bank.svg" type="node,closedway,multipolygon" preset_name_label="true">
    76117611            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
    76127612                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=bank"
     
    76287628            <preset_link preset_name="Building" />
    76297629        </item> <!-- Bank -->
    7630         <item name="Money Exchange" icon="presets/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">
     7630        <item name="Money Exchange" icon="presets/money/exchange.svg" type="node,closedway,multipolygon" preset_name_label="true">
    76317631            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
    76327632                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
     
    76407640            <reference ref="link_contact_address" />
    76417641        </item> <!-- Money Exchange -->
    7642         <item name="Automated Teller Machine" icon="presets/money/atm.png" type="node" preset_name_label="true">
     7642        <item name="Automated Teller Machine" icon="presets/money/atm.svg" type="node" preset_name_label="true">
    76437643            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
    76447644                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=atm"
     
    76597659            <reference ref="oh_wheelchair" />
    76607660        </item> <!-- Automated Teller Machine -->
    7661         <item name="Pawnbroker" icon="presets/pawnbroker.svg" type="node,closedway,multipolygon" preset_name_label="true">
     7661        <item name="Pawnbroker" icon="presets/shop/pawnbroker.svg" type="node,closedway,multipolygon" preset_name_label="true">
    76627662            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pawnbroker"
    76637663                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pawnbroker"
     
    76717671    </group> <!-- Cash -->
    76727672    <group name="Home decoration" icon="presets/shop/interior_decoration.svg">
    7673         <item name="Furniture" icon="presets/shop/furniture.png" type="node,closedway,multipolygon" preset_name_label="true">
     7673        <item name="Furniture" icon="presets/shop/furniture.svg" type="node,closedway,multipolygon" preset_name_label="true">
    76747674            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"
    76757675                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=furniture"
     
    76837683            <reference ref="link_contact_address_payment" />
    76847684        </item> <!-- Furniture -->
    7685         <item name="Kitchen" icon="presets/kitchen.png" type="node,closedway,multipolygon" preset_name_label="true">
     7685        <item name="Kitchen" icon="presets/shop/kitchen.png" type="node,closedway,multipolygon" preset_name_label="true">
    76867686            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kitchen"
    76877687                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=kitchen"
     
    77067706            <reference ref="link_contact_address_payment" />
    77077707        </item> <!-- Houseware -->
    7708         <item name="Curtain" icon="presets/curtain.png" type="node,closedway,multipolygon" preset_name_label="true">
     7708        <item name="Curtain" icon="presets/shop/curtain.png" type="node,closedway,multipolygon" preset_name_label="true">
    77097709            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=curtain"
    77107710                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=curtain"
     
    77277727            <reference ref="link_contact_address_payment" />
    77287728        </item> <!-- Art -->
    7729         <item name="Frame" icon="presets/frame.png" type="node,closedway,multipolygon" preset_name_label="true">
     7729        <item name="Frame" icon="presets/shop/frame.png" type="node,closedway,multipolygon" preset_name_label="true">
    77307730            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=frame"
    77317731                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=frame"
     
    77727772        </item> <!-- Antiques -->
    77737773    </group> <!-- Home decoration -->
    7774     <group name="Printed Material" icon="presets/stationery.png">
    7775         <item name="Stationery" icon="presets/stationery.png" type="node,closedway,multipolygon" preset_name_label="true">
     7774    <group name="Printed Material" icon="presets/shop/stationery.png">
     7775        <item name="Stationery" icon="presets/shop/stationery.png" type="node,closedway,multipolygon" preset_name_label="true">
    77767776            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=stationery"
    77777777                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=stationery"
     
    77847784            <reference ref="link_contact_address_payment" />
    77857785        </item> <!-- Stationery -->
    7786         <item name="Copy Shop" icon="presets/copyshop.png" type="node,closedway,multipolygon" preset_name_label="true">
     7786        <item name="Copy Shop" icon="presets/shop/copyshop.png" type="node,closedway,multipolygon" preset_name_label="true">
    77877787            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
    77887788                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
     
    78327832    </group> <!-- Printed Material -->
    78337833    <group name="For the body" icon="presets/shop/body.svg">
    7834         <item name="Chemist" icon="presets/shop/chemist.png" type="node,closedway,multipolygon" preset_name_label="true">
     7834        <item name="Chemist" icon="presets/shop/chemist.svg" type="node,closedway,multipolygon" preset_name_label="true">
    78357835            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
    78367836                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
     
    78797879            <reference ref="link_contact_address_payment" />
    78807880        </item> <!-- Tobacco -->
    7881         <item name="Hairdresser/Barber" icon="presets/shop/hairdresser.png" type="node,closedway,multipolygon" preset_name_label="true">
     7881        <item name="Hairdresser/Barber" icon="presets/shop/hairdresser.svg" type="node,closedway,multipolygon" preset_name_label="true">
    78827882            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
    78837883                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
     
    79197919            <reference ref="link_contact_address_payment" />
    79207920        </item> <!-- Optician -->
    7921         <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway,multipolygon" preset_name_label="true">
     7921        <item name="Hearing Aids" icon="presets/shop/hearing_aids.png" type="node,closedway,multipolygon" preset_name_label="true">
    79227922            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
    79237923                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hearing_aids"
     
    79397939            <reference ref="link_contact_address_payment" />
    79407940        </item> <!-- Medical Supply -->
    7941         <item name="Jewellery" icon="presets/shop/jewelry.png" type="node,closedway,multipolygon" preset_name_label="true">
     7941        <item name="Jewellery" icon="presets/shop/jewelry.svg" type="node,closedway,multipolygon" preset_name_label="true">
    79427942            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
    79437943                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
     
    79507950            <reference ref="link_contact_address_payment" />
    79517951        </item> <!-- Jewellery -->
    7952         <item name="Erotic" icon="presets/erotic.png" type="node,closedway,multipolygon" preset_name_label="true">
     7952        <item name="Erotic" icon="presets/shop/erotic.png" type="node,closedway,multipolygon" preset_name_label="true">
    79537953            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
    79547954                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=erotic"
     
    79617961        </item> <!-- Erotic -->
    79627962    </group> <!-- For the body -->
    7963     <group name="Other" icon="presets/shop/mall.png">
    7964         <item name="Department Store" icon="presets/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
     7963    <group name="Other" icon="presets/shop/mall.svg">
     7964        <item name="Department Store" icon="presets/shop/mall.svg" type="node,closedway,multipolygon" preset_name_label="true">
    79657965            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
    79667966                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=department_store"
     
    79757975            <reference ref="link_contact_address_payment" />
    79767976        </item> <!-- Department Store -->
    7977         <item name="Mall" icon="presets/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
     7977        <item name="Mall" icon="presets/shop/mall.svg" type="node,closedway,multipolygon" preset_name_label="true">
    79787978            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
    79797979                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mall"
     
    79887988        </item> <!-- Mall -->
    79897989        <separator/>
    7990         <item name="Florist" icon="presets/shop/florist.png" type="node,closedway,multipolygon" preset_name_label="true">
     7990        <item name="Florist" icon="presets/shop/florist.svg" type="node,closedway,multipolygon" preset_name_label="true">
    79917991            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
    79927992                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=florist"
     
    80018001            <reference ref="link_contact_address_payment" />
    80028002        </item> <!-- Florist -->
    8003         <item name="Garden Centre" icon="presets/shop/garden_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
     8003        <item name="Garden Centre" icon="presets/shop/garden_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
    80048004            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
    80058005                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
     
    80158015        </item> <!-- Garden Centre -->
    80168016        <separator/>
    8017         <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.png" type="node,closedway,multipolygon" preset_name_label="true">
     8017        <item name="Do-It-Yourself Store" icon="presets/shop/diy_store.svg" type="node,closedway,multipolygon" preset_name_label="true">
    80188018            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
    80198019                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
     
    80288028            <reference ref="link_contact_address_payment" />
    80298029        </item> <!-- Do-It-Yourself Store -->
    8030         <item name="Hardware" icon="presets/hardware.png" type="node,closedway,multipolygon" preset_name_label="true">
     8030        <item name="Hardware" icon="presets/shop/hardware.png" type="node,closedway,multipolygon" preset_name_label="true">
    80318031            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware"
    80328032                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hardware"
     
    80398039            <reference ref="link_contact_address_payment" />
    80408040        </item> <!-- Hardware -->
    8041         <item name="Paint" icon="presets/paint.png" type="node,closedway,multipolygon" preset_name_label="true">
     8041        <item name="Paint" icon="presets/shop/paint.png" type="node,closedway,multipolygon" preset_name_label="true">
    80428042            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=paint"
    80438043                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=paint"
     
    80518051        </item> <!-- Paint -->
    80528052        <separator/>
    8053         <item name="Travel Agency" icon="presets/travel.png" type="node,closedway,multipolygon" preset_name_label="true">
     8053        <item name="Travel Agency" icon="presets/shop/travel.png" type="node,closedway,multipolygon" preset_name_label="true">
    80548054            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=travel_agency"
    80558055                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=travel_agency"
     
    80618061            <reference ref="link_contact_address_payment" />
    80628062        </item> <!-- Travel Agency -->
    8063         <item name="Musical Instrument" icon="presets/musical_instrument.png" type="node,closedway,multipolygon" preset_name_label="true">
     8063        <item name="Musical Instrument" icon="presets/shop/musical_instrument.png" type="node,closedway,multipolygon" preset_name_label="true">
    80648064            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=musical_instrument"
    80658065                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=musical_instrument"
     
    80718071            <reference ref="link_contact_address_payment" />
    80728072        </item> <!-- Musical Instrument -->
    8073         <item name="Toys" icon="presets/shop/toys.png" type="node,closedway,multipolygon" preset_name_label="true">
     8073        <item name="Toys" icon="presets/shop/toys.svg" type="node,closedway,multipolygon" preset_name_label="true">
    80748074            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
    80758075                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
     
    80828082            <reference ref="link_contact_address_payment" />
    80838083        </item> <!-- Toys -->
    8084         <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8084        <item name="Gift/Souvenir" icon="presets/shop/present.svg" type="node,closedway,multipolygon" preset_name_label="true">
    80858085            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
    80868086                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
     
    80998099            <reference ref="link_contact_address_payment" />
    81008100        </item> <!-- Gift/Souvenir -->
    8101         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway,multipolygon" preset_name_label="true">
     8101        <item name="Variety Store" icon="presets/shop/variety_store.png" type="node,closedway,multipolygon" preset_name_label="true">
    81028102            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"
    81038103                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=variety_store"
     
    81118111            <reference ref="link_contact_address_payment" />
    81128112        </item> <!-- Variety Store -->
    8113         <item name="Bookmaker" icon="presets/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8113        <item name="Bookmaker" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    81148114            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bookmaker"
    81158115                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bookmaker" />
     
    81198119            <reference ref="link_contact_address_payment" />
    81208120        </item> <!-- Bookmaker -->
    8121         <item name="Lottery" icon="presets/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
     8121        <item name="Lottery" icon="presets/shop/lottery.svg" type="node,closedway,multipolygon" preset_name_label="true">
    81228122            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=lottery"
    81238123                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=lottery"
     
    81738173    </group> <!-- Other -->
    81748174        <separator/>
    8175     <item name="Vending Machine" icon="presets/transport/ticket-machine.png" type="node" preset_name_label="true">
     8175    <item name="Vending Machine" icon="presets/transport/ticket-machine.svg" type="node" preset_name_label="true">
    81768176        <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
    81778177              de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
     
    86328632    </item> <!-- Tiler -->
    86338633  </group> <!-- Craft -->
    8634   <group name="Geography" icon="presets/peak.svg">
    8635     <group name="Boundaries" icon="presets/boundaries.png">
    8636         <item name="Administrative" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
     8634  <group name="Geography" icon="presets/landmark/peak.svg">
     8635    <group name="Boundaries" icon="presets/misc/boundaries.png">
     8636        <item name="Administrative" icon="presets/misc/boundaries.png" type="way,closedway,relation" preset_name_label="true">
    86378637            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative"
    86388638                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=administrative"
     
    86488648            <check key="maritime" text="Maritime" disable_off="true" />
    86498649        </item> <!-- Administrative -->
    8650         <item name="Political" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
     8650        <item name="Political" icon="presets/misc/boundaries.png" type="closedway,relation" preset_name_label="true">
    86518651            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=political"
    86528652                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:boundary=political"
     
    86588658            <text key="name" text="Name" />
    86598659        </item> <!-- Political -->
    8660         <item name="Postal Code" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
     8660        <item name="Postal Code" icon="presets/misc/boundaries.png" type="way,closedway,relation" preset_name_label="true">
    86618661            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code"
    86628662                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=postal_code"
     
    86668666            <text key="postal_code" text="Postal Code" />
    86678667        </item> <!-- Postal Code -->
    8668         <item name="National Park" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
     8668        <item name="National Park" icon="presets/misc/boundaries.png" type="closedway,relation" preset_name_label="true">
    86698669            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
    86708670                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
     
    86758675            <text key="name" text="Name" />
    86768676        </item> <!-- National Park -->
    8677         <item name="Protected Area" icon="presets/boundaries.png" type="closedway,relation" preset_name_label="true">
     8677        <item name="Protected Area" icon="presets/misc/boundaries.png" type="closedway,relation" preset_name_label="true">
    86788678            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area"
    86798679                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=protected_area"
     
    86928692            </optional>
    86938693        </item> <!-- Protected Area -->
    8694         <item name="Maritime" icon="presets/boundaries.png" type="way,closedway,relation" preset_name_label="true">
     8694        <item name="Maritime" icon="presets/misc/boundaries.png" type="way,closedway,relation" preset_name_label="true">
    86958695            <link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=maritime"
    86968696                  no.href="http://wiki.openstreetmap.org/wiki/No:Tag:boundary=maritime"
     
    88578857        </item> <!-- Farm -->
    88588858        <separator/>
    8859         <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
     8859        <item name="Locality" icon="presets/place/locality.svg" type="node,closedway" preset_name_label="true">
    88608860            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality"
    88618861                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=locality"
     
    88708870        </item> <!-- Locality -->
    88718871    </group> <!-- Places -->
    8872     <group name="Geography" icon="presets/peak.svg">
    8873         <item name="Peak" icon="presets/peak.svg" type="node" preset_name_label="true">
     8872    <group name="Geography" icon="presets/landmark/peak.svg">
     8873        <item name="Peak" icon="presets/landmark/peak.svg" type="node" preset_name_label="true">
    88748874            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak"
    88758875                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=peak"
     
    88868886            <text key="ele" text="Elevation" />
    88878887        </item> <!-- Peak -->
    8888         <item name="Saddle" icon="presets/saddle.svg" type="node" preset_name_label="true">
     8888        <item name="Saddle" icon="presets/landmark/saddle.svg" type="node" preset_name_label="true">
    88898889            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=saddle"
    88908890                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=saddle"
     
    89008900            <text key="ele" text="Elevation" />
    89018901        </item> <!-- Saddle -->
    8902         <item name="Glacier" icon="presets/glacier.png" type="closedway,multipolygon" preset_name_label="true">
     8902        <item name="Glacier" icon="presets/landmark/glacier.svg" type="closedway,multipolygon" preset_name_label="true">
    89038903            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier"
    89048904                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=glacier"
     
    89148914            <text key="ele" text="Elevation" />
    89158915        </item> <!-- Glacier -->
    8916         <item name="Volcano" icon="presets/volcano.png" type="node" preset_name_label="true">
     8916        <item name="Volcano" icon="presets/landmark/volcano.svg" type="node" preset_name_label="true">
    89178917            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano"
    89188918                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=volcano"
     
    89328932            </optional>
    89338933        </item> <!-- Volcano -->
    8934         <item name="Ridge" icon="presets/ridge.svg" type="way" preset_name_label="true">
     8934        <item name="Ridge" icon="presets/landmark/ridge.svg" type="way" preset_name_label="true">
    89358935            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=ridge"
    89368936                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=ridge"
     
    89468946            <text key="ele" text="Elevation" />
    89478947        </item> <!-- Ridge -->
    8948         <item name="Valley" icon="presets/valley.svg" type="way" preset_name_label="true">
     8948        <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
    89498949            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=valley"
    89508950                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=valley"
     
    89718971            <text key="height" text="Height (meters)" />
    89728972        </item> <!-- Cliff -->
    8973         <item name="Cave Entrance" icon="presets/cave_entrance.png" type="node,closedway" preset_name_label="true">
     8973        <item name="Cave Entrance" icon="presets/landmark/cave_entrance.png" type="node,closedway" preset_name_label="true">
    89748974            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance"
    89758975                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cave_entrance"
     
    89888988        </item> <!-- Cave Entrance -->
    89898989        <separator/>
    8990         <item name="Island" icon="presets/island.png" type="node,closedway,multipolygon" preset_name_label="true">
     8990        <item name="Island" icon="presets/place/island.svg" type="node,closedway,multipolygon" preset_name_label="true">
    89918991            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island"
    89928992                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=island"
     
    89998999            <reference ref="name_wikipedia" />
    90009000        </item> <!-- Island -->
    9001         <item name="Islet" icon="presets/islet.png" type="node,closedway,multipolygon" preset_name_label="true">
     9001        <item name="Islet" icon="presets/place/islet.svg" type="node,closedway,multipolygon" preset_name_label="true">
    90029002            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet"
    90039003                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=islet"
     
    90189018        </item> <!-- Islet -->
    90199019    </group> <!-- Geography -->
    9020     <group name="Nature" icon="presets/misc/landmark/trees.png">
    9021         <item name="Tree" icon="presets/misc/landmark/trees.png" type="node" preset_name_label="true">
     9020    <group name="Nature" icon="presets/landmark/trees.svg">
     9021        <item name="Tree" icon="presets/landmark/trees.svg" type="node" preset_name_label="true">
    90229022            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
    90239023                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree"
     
    90419041            <reference ref="leaf" />
    90429042        </item> <!-- Tree -->
    9043         <item name="Tree Row" icon="presets/misc/landmark/tree_row.svg" type="way" preset_name_label="true">
     9043        <item name="Tree Row" icon="presets/landmark/tree_row.svg" type="way" preset_name_label="true">
    90449044            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
    90459045                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
     
    90609060            </optional>
    90619061        </item> <!-- Tree Row -->
    9062         <item name="Wood" icon="presets/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
     9062        <item name="Wood" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
    90639063            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
    90649064                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wood"
     
    90759075            <reference ref="leaf" />
    90769076        </item> <!-- Wood -->
    9077         <item name="Forest" icon="presets/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
     9077        <item name="Forest" icon="presets/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
    90789078            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
    90799079                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=forest"
     
    90909090            <reference ref="leaf" />
    90919091        </item> <!-- Forest -->
    9092         <item name="Cutline" icon="presets/misc/landmark/cutline.svg" type="way" preset_name_label="true">
     9092        <item name="Cutline" icon="presets/landmark/cutline.svg" type="way" preset_name_label="true">
    90939093            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline"
    90949094                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=cutline"
     
    91039103            <combo key="cutline" text="Type" values="border,firebreak,hunting,loggingmachine,pipeline,piste,section" values_context="cutline" />
    91049104        </item> <!-- Cutline -->
    9105         <item name="Grassland" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
     9105        <item name="Grassland" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
    91069106            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
    91079107                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=grassland"
     
    91339133        </item> <!-- Nature Reserve -->
    91349134        <separator/>
    9135         <item name="Scree" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
     9135        <item name="Scree" type="closedway,multipolygon" preset_name_label="true">
    91369136            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
    91379137                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scree"
     
    91499149            <text key="name" text="Name" />
    91509150        </item> <!-- Scree -->
    9151         <item name="Fell" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
     9151        <item name="Fell" type="closedway,multipolygon" preset_name_label="true">
    91529152            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
    91539153                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=fell"
     
    91629162            <text key="name" text="Name" />
    91639163        </item> <!-- Fell -->
    9164         <item name="Scrub" icon="presets/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
     9164        <item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
    91659165            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
    91669166                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=scrub"
     
    91809180            </optional>
    91819181        </item> <!-- Scrub -->
    9182         <item name="Heath" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
     9182        <item name="Heath" type="closedway,multipolygon" preset_name_label="true">
    91839183            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
    91849184                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"
     
    91969196            <text key="name" text="Name" />
    91979197        </item> <!-- Heath -->
    9198         <item name="Sand" icon="presets/misc/sand.svg" type="closedway,multipolygon" preset_name_label="true">
     9198        <item name="Sand" icon="presets/landuse/sand.svg" type="closedway,multipolygon" preset_name_label="true">
    91999199            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
    92009200                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=sand"
     
    92079207            <text key="name" text="Name" />
    92089208        </item> <!-- Sand -->
    9209         <item name="Bare Rock" icon="presets/empty.png" type="closedway,multipolygon" preset_name_label="true">
     9209        <item name="Bare Rock" type="closedway,multipolygon" preset_name_label="true">
    92109210            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bare_rock"
    92119211                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bare_rock"
     
    92529252        </item> <!-- Stone -->
    92539253    </group> <!-- Nature -->
    9254     <group name="Land use" icon="presets/landuse.png">
    9255         <item name="Farmyard" icon="presets/misc/landuse/farmyard.png" type="closedway,multipolygon" preset_name_label="true">
     9254    <group name="Land use" icon="presets/landuse/landuse.png">
     9255        <item name="Farmyard" icon="presets/landuse/farmyard.png" type="closedway,multipolygon" preset_name_label="true">
    92569256            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
    92579257                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=farmyard"
     
    92659265            <text key="name" text="Name" />
    92669266        </item> <!-- Farmyard -->
    9267         <item name="Farmland" icon="presets/misc/landuse/farmland.png" type="closedway,multipolygon" preset_name_label="true">
     9267        <item name="Farmland" icon="presets/landuse/farmland.png" type="closedway,multipolygon" preset_name_label="true">
    92689268            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmland"
    92699269                  ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:landuse=farmland"
     
    92799279            <combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop" values_context="crop" />
    92809280        </item> <!-- Farmland -->
    9281         <item name="Meadow" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
     9281        <item name="Meadow" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
    92829282            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
    92839283                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=meadow"
     
    92929292            <text key="name" text="Name" />
    92939293        </item> <!-- Meadow -->
    9294         <item name="Orchard" icon="presets/misc/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
     9294        <item name="Orchard" icon="presets/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
    92959295            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
    92969296                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=orchard"
     
    93059305            <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" />
    93069306        </item> <!-- Orchard -->
    9307         <item name="Vineyard" icon="presets/fruits.png" type="closedway,multipolygon" preset_name_label="true">
     9307        <item name="Vineyard" icon="presets/landuse/vineyard.png" type="closedway,multipolygon" preset_name_label="true">
    93089308            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=vineyard"
    93099309                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=vineyard"
     
    93169316            <text key="name" text="Name" />
    93179317        </item> <!-- Vineyard -->
    9318         <item name="Greenhouse Horticulture" icon="presets/greenhouse_horticulture.png" type="closedway,multipolygon" preset_name_label="true">
     9318        <item name="Greenhouse Horticulture" icon="presets/landuse/greenhouse_horticulture.png" type="closedway,multipolygon" preset_name_label="true">
    93199319            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenhouse_horticulture"
    93209320                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenhouse_horticulture"
     
    93319331            <text key="operator" text="Operator" />
    93329332        </item> <!-- Greenhouse Horticulture -->
    9333         <item name="Plant Nursery" icon="presets/misc/landmark/plant.png" type="closedway,multipolygon" preset_name_label="true">
     9333        <item name="Plant Nursery" icon="presets/landmark/plant.svg" type="closedway,multipolygon" preset_name_label="true">
    93349334            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=plant_nursery"
    93359335                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=plant_nursery"
     
    93469346            <text key="species" text="Species" />
    93479347        </item> <!-- Plant Nursery -->
    9348         <item name="Allotments" icon="presets/misc/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
     9348        <item name="Allotments" icon="presets/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
    93499349            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
    93509350                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=allotments"
     
    93729372            <text key="name" text="Name" />
    93739373        </item> <!-- Garden -->
    9374         <item name="Grass" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
     9374        <item name="Grass" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
    93759375            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
    93769376                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=grass"
     
    94379437        </item> <!-- Recreation Ground -->
    94389438        <separator/>
    9439         <item name="Residential Area" icon="presets/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
     9439        <item name="Residential Area" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
    94409440            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=residential"
    94419441                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=residential"
     
    94509450            <text key="name" text="Name" />
    94519451        </item> <!-- Residential Area -->
    9452         <item name="Graveyard" icon="presets/graveyard.png" type="node,closedway,multipolygon" preset_name_label="true">
     9452        <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
    94539453            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard"
    94549454                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=grave_yard"
     
    94649464            <reference ref="religious" />
    94659465        </item> <!-- Graveyard -->
    9466         <item name="Cemetery" icon="presets/cemetery.png" type="closedway,multipolygon" preset_name_label="true">
     9466        <item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
    94679467            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
    94689468                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=cemetery"
     
    94809480            <reference ref="religious" />
    94819481        </item> <!-- Cemetery -->
    9482         <item name="Religious" icon="presets/religion.png" type="closedway,multipolygon" preset_name_label="true">
     9482        <item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
    94839483            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
    94849484                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
     
    94899489            <reference ref="religious" />
    94909490        </item> <!-- Religious -->
    9491         <item name="Retail" icon="presets/shop/mall.png" type="closedway,multipolygon" preset_name_label="true">
     9491        <item name="Retail" icon="presets/shop/mall.svg" type="closedway,multipolygon" preset_name_label="true">
    94929492            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
    94939493                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=retail"
     
    95029502            <text key="name" text="Name" />
    95039503        </item> <!-- Retail -->
    9504         <item name="Commercial" icon="presets/misc/landuse/commercial.png" type="closedway,multipolygon" preset_name_label="true">
     9504        <item name="Commercial" icon="presets/landuse/commercial.svg" type="closedway,multipolygon" preset_name_label="true">
    95059505            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
    95069506                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=commercial"
     
    95159515            <text key="name" text="Name" />
    95169516        </item> <!-- Commercial -->
    9517         <item name="Industrial" icon="presets/misc/landmark/works.png" type="closedway,multipolygon" preset_name_label="true">
     9517        <item name="Industrial" icon="presets/landmark/works.svg" type="closedway,multipolygon" preset_name_label="true">
    95189518            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
    95199519                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=industrial"
     
    95299529            <text key="name" text="Name" />
    95309530        </item> <!-- Industrial -->
    9531         <item name="Garages" icon="presets/garages.png" type="closedway,multipolygon" preset_name_label="true">
     9531        <item name="Garages" icon="presets/landuse/garages.png" type="closedway,multipolygon" preset_name_label="true">
    95329532            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
    95339533                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=garages"
     
    95429542            <text key="operator" text="Operator" />
    95439543        </item> <!-- Garages -->
    9544         <item name="Railway Land" icon="presets/rail_light.png" type="closedway,multipolygon" preset_name_label="true">
     9544        <item name="Railway Land" icon="presets/landuse/rail_light.png" type="closedway,multipolygon" preset_name_label="true">
    95459545            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway"
    95469546                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=railway"
     
    95549554            <text key="name" text="Name" />
    95559555        </item> <!-- Railway Land -->
    9556         <item name="Military" icon="presets/military.png" type="closedway,multipolygon" preset_name_label="true">
     9556        <item name="Military" icon="presets/landuse/military.svg" type="closedway,multipolygon" preset_name_label="true">
    95579557            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
    95589558                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=military"
     
    95669566        </item> <!-- Military -->
    95679567        <separator/>
    9568         <item name="Construction Area" icon="presets/construction.png" type="closedway,multipolygon" preset_name_label="true">
     9568        <item name="Construction Area" icon="presets/landuse/construction.svg" type="closedway,multipolygon" preset_name_label="true">
    95699569            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
    95709570                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=construction"
     
    95799579            <text key="name" text="Name" />
    95809580        </item> <!-- Construction Area -->
    9581         <item name="Brownfield" icon="presets/landuse.png" type="closedway,multipolygon" preset_name_label="true">
     9581        <item name="Brownfield" icon="presets/landuse/landuse.png" type="closedway,multipolygon" preset_name_label="true">
    95829582            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
    95839583                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=brownfield"
     
    95929592            <text key="name" text="Name" />
    95939593        </item> <!-- Brownfield -->
    9594         <item name="Greenfield" icon="presets/landuse.png" type="closedway,multipolygon" preset_name_label="true">
     9594        <item name="Greenfield" icon="presets/landuse/landuse.png" type="closedway,multipolygon" preset_name_label="true">
    95959595            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
    95969596                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenfield"
     
    96039603            <text key="name" text="Name" />
    96049604        </item> <!-- Greenfield -->
    9605         <item name="Landfill" icon="presets/misc/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
     9605        <item name="Landfill" icon="presets/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
    96069606            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
    96079607                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=landfill"
     
    96159615            <text key="name" text="Name" />
    96169616        </item> <!-- Landfill -->
    9617         <item name="Quarry" icon="presets/mine.png" type="closedway,multipolygon" preset_name_label="true">
     9617        <item name="Quarry" icon="presets/landmark/mine.svg" type="closedway,multipolygon" preset_name_label="true">
    96189618            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
    96199619                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=quarry"
     
    96299629    </group> <!-- Landuse -->
    96309630  </group> <!-- Geography -->
    9631     <group name="Annotation" icon="presets/addresses.png">
    9632         <item name="Name" icon="presets/message.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     9631    <group name="Annotation" icon="presets/misc/addresses.png">
     9632        <item name="Name" icon="presets/misc/message.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
    96339633            <link href="http://wiki.openstreetmap.org/wiki/Key:name"
    96349634                  ar.href="http://wiki.openstreetmap.org/wiki/Ar:Key:name"
     
    96619661            </optional>
    96629662        </item> <!-- Name -->
    9663         <item name="Addresses" icon="presets/addresses.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     9663        <item name="Addresses" icon="presets/misc/addresses.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
    96649664            <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
    96659665                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:addr"
     
    96979697            </optional>
    96989698        </item> <!-- Addresses -->
    9699         <item name="Address Interpolation" icon="presets/interpolation.png" type="way" preset_name_label="true">
     9699        <item name="Address Interpolation" icon="presets/misc/interpolation.png" type="way" preset_name_label="true">
    97009700           <link href="http://wiki.openstreetmap.org/wiki/Key:addr"
    97019701                 de.href="http://wiki.openstreetmap.org/wiki/DE:Key:addr"
     
    97169716            </optional>
    97179717        </item> <!-- Address Interpolation -->
    9718         <item name="Contact (Common Schema)" icon="presets/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     9718        <item name="Contact (Common Schema)" icon="presets/misc/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
    97199719            <link href="http://wiki.openstreetmap.org/wiki/Annotations"
    97209720                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
     
    97329732            <text key="image" text="Image" />
    97339733        </item> <!-- Contact (Common Schema) -->
    9734         <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
     9734        <item name="Contact (Schema with 'contact:*' Prefix)" icon="presets/misc/contact.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
    97359735            <link href="http://wiki.openstreetmap.org/wiki/Key:contact"
    97369736                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:contact"
     
    98119811        </item> <!-- Fixme -->
    98129812    </group> <!-- Annotation -->
    9813     <group name="Relations" icon="presets/relations.png">
    9814         <item name="Multipolygon" icon="presets/multipolygon.png" type="relation,multipolygon" preset_name_label="true">
     9813    <group name="Relations" icon="presets/misc/relations.png">
     9814        <item name="Multipolygon" icon="presets/misc/multipolygon.png" type="relation,multipolygon" preset_name_label="true">
    98159815            <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
    98169816                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Relation:multipolygon"
     
    98339833            </roles>
    98349834        </item> <!-- Multipolygon -->
    9835         <item name="Boundary" icon="presets/boundaries.png" type="relation,multipolygon" preset_name_label="true">
     9835        <item name="Boundary" icon="presets/misc/boundaries.png" type="relation,multipolygon" preset_name_label="true">
    98369836            <link href="http://wiki.openstreetmap.org/wiki/Relation:boundary"
    98379837                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:boundary"
     
    98739873        </item> <!-- Site -->
    98749874        <separator/>
    9875         <item name="Turn Restriction" icon="presets/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
     9875        <item name="Turn Restriction" icon="presets/vehicle/restriction/turn_restrictions/no_u_turn.svg" type="relation" preset_name_label="true">
    98769876            <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
    98779877                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
     
    99189918        </item> <!-- Enforcement -->
    99199919        <separator/>
    9920         <group name="Routes" icon="presets/path.png">
    9921             <item name="Bicycle Route" icon="presets/path.png" type="relation" preset_name_label="true">
     9920        <group name="Routes" icon="presets/misc/path.png">
     9921            <item name="Bicycle Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    99229922                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=bicycle"
    99239923                  de.href="http://wiki.openstreetmap.org/wiki/DE:Cycle_routes"
     
    99419941                </roles>
    99429942            </item> <!-- Bicycle Route -->
    9943             <item name="Mountain Biking Route" icon="presets/path.png" type="relation" preset_name_label="true">
     9943            <item name="Mountain Biking Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    99449944                <link href="http://wiki.openstreetmap.org/wiki/Mountain_biking"
    99459945                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Mountain_biking"
     
    99649964                </roles>
    99659965            </item> <!-- Mountain Biking Route -->
    9966             <item name="Hiking Route" icon="presets/path.png" type="relation" preset_name_label="true">
     9966            <item name="Hiking Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    99679967                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=hiking#Tagging_walking_and_hiking_Route_Networks"
    99689968                  de.href="http://wiki.openstreetmap.org/wiki/DE:Hiking"
     
    99889988                </roles>
    99899989            </item> <!-- Hiking Route -->
    9990             <item name="Walking Route" icon="presets/path.png" type="relation" preset_name_label="true">
     9990            <item name="Walking Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    99919991                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=foot" />
    99929992                <space/>
     
    1000410004                </roles>
    1000510005            </item> <!-- Walking Route -->
    10006             <item name="Riding Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10006            <item name="Riding Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1000710007                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=horse" />
    1000810008                <space/>
     
    1002010020                </roles>
    1002110021            </item> <!-- Riding Route -->
    10022             <item name="Piste Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10022            <item name="Piste Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1002310023                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=piste"
    1002410024                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=piste"
     
    1004210042                </roles>
    1004310043            </item> <!-- Piste Route -->
    10044             <item name="Ski Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10044            <item name="Ski Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1004510045                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ski"
    1004610046                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=ski" />
     
    1006410064            </item> <!-- Ski Route -->
    1006510065            <separator/>
    10066             <item name="Detour Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10066            <item name="Detour Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1006710067                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=detour"
    1006810068                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:route=detour" />
     
    1008110081                </roles>
    1008210082            </item> <!-- Detour Route -->
    10083             <item name="Power Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10083            <item name="Power Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1008410084                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=power" />
    1008510085                <space/>
     
    1009110091                </roles>
    1009210092            </item> <!-- Power Route -->
    10093             <item name="Railway Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10093            <item name="Railway Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1009410094                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=railway"
    1009510095                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=railway"
     
    1010510105                </roles>
    1010610106            </item> <!-- Railway Route -->
    10107             <item name="Road Route" icon="presets/path.png" type="relation" preset_name_label="true">
     10107            <item name="Road Route" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1010810108                <link href="http://wiki.openstreetmap.org/wiki/Tag:route=road"
    1010910109                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:route=road"
     
    1012510125            </item> <!-- Road Route -->
    1012610126        </group> <!-- Routes -->
    10127         <item name="Route Network" icon="presets/path.png" type="relation" preset_name_label="true">
     10127        <item name="Route Network" icon="presets/misc/path.png" type="relation" preset_name_label="true">
    1012810128            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Network" />
    1012910129            <space />
     
    1013910139        </item> <!-- Route Network -->
    1014010140        <separator/>
    10141         <item name="Associated Street" icon="presets/addresses.png" type="relation" preset_name_label="true">
     10141        <item name="Associated Street" icon="presets/misc/addresses.png" type="relation" preset_name_label="true">
    1014210142            <link href="http://wiki.openstreetmap.org/wiki/Relation:associatedStreet"
    1014310143                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:associatedStreet"
     
    1016810168            </roles>
    1016910169        </item> <!-- Street -->
    10170         <item name="Destination Sign" icon="presets/guidepost.png" type="relation" preset_name_label="true">
     10170        <item name="Destination Sign" icon="presets/misc/information/guidepost.svg" type="relation" preset_name_label="true">
    1017110171            <link href="http://wiki.openstreetmap.org/wiki/Relation:destination_sign"
    1017210172                  de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:destination_sign"
     
    1023810238            </roles>
    1023910239        </item> <!-- Bridge -->
    10240         <item name="Tunnel" icon="presets/tunnel.png" type="relation" preset_name_label="true">
     10240        <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="relation" preset_name_label="true">
    1024110241            <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels" />
    1024210242            <space />
  • trunk/styles/standard/elemstyles.mapcss

    r10579 r10706  
    7070}
    7171relation[restriction=no_left_turn][setting("alt_turn_icons")] {
    72     icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
     72    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg";
    7373    set icon_z17;
    7474    text: auto;
     
    8080}
    8181relation[restriction=no_right_turn][setting("alt_turn_icons")] {
    82     icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
     82    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg";
    8383    set icon_z17;
    8484    text: auto;
     
    9090}
    9191relation[restriction=no_straight_on][setting("alt_turn_icons")] {
    92     icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
     92    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg";
    9393    set icon_z17;
    9494    text: auto;
    9595}
    9696relation[restriction=no_u_turn] {
    97     icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
     97    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg";
    9898    set icon_z17;
    9999    text: auto;
    100100}
    101101relation[restriction=only_left_turn] {
    102     icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
     102    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg";
    103103    set icon_z17;
    104104    text: auto;
    105105}
    106106relation[restriction=only_right_turn] {
    107     icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
     107    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg";
    108108    set icon_z17;
    109109    text: auto;
    110110}
    111111relation[restriction=only_straight_on] {
    112     icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
     112    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg";
    113113    set icon_z17;
    114114    text: auto;
    115115}
    116116node[restriction] {
    117     icon-image: "presets/misc/deprecated.png";
     117    icon-image: "presets/misc/deprecated.svg";
    118118    set icon_z17;
    119119    text: auto;
     
    155155node[cutting?!],
    156156node[embankment?!] {
    157     icon-image: "presets/misc/deprecated.png";
     157    icon-image: "presets/misc/deprecated.svg";
    158158    set icon_z17;
    159159}
     
    188188}
    189189node[traffic_sign][access?!] {
    190     icon-image: "presets/vehicle/restriction/access.png";
     190    icon-image: "presets/vehicle/restriction/restrictions.svg";
    191191    set icon_z17;
    192192}
     
    194194node[traffic_sign][access=private][!is_prop_set(icon-image)],
    195195node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
    196     icon-image: "presets/misc/no_icon.png";
     196    icon-image: "presets/misc/no_icon.svg";
    197197    set icon_z17;
    198198}
    199199node[traffic_sign][bicycle?!] {
    200     icon-image: "presets/vehicle/restriction/bicycle.png";
     200    icon-image: "presets/vehicle/restriction/bicycle.svg";
    201201    set icon_z17;
    202202}
    203203node[traffic_sign][bicycle=designated] {
    204     icon-image: "presets/vehicle/restriction/bicycle-designated.png";
     204    icon-image: "presets/vehicle/restriction/bicycle-designated.svg";
    205205    set icon_z17;
    206206}
    207207node[traffic_sign][foot?!] {
    208     icon-image: "presets/vehicle/restriction/foot.png";
     208    icon-image: "presets/vehicle/restriction/foot.svg";
    209209    set icon_z17;
    210210}
    211211node[traffic_sign][foot=designated] {
    212     icon-image: "presets/vehicle/restriction/foot-designated.png";
     212    icon-image: "presets/vehicle/restriction/foot-designated.svg";
    213213    set icon_z17;
    214214}
    215215node[traffic_sign][goods?!],
    216216node[traffic_sign][hgv?!] {
    217     icon-image: "presets/vehicle/restriction/goods.png";
     217    icon-image: "presets/vehicle/restriction/goods.svg";
    218218    set icon_z17;
    219219}
    220220node[traffic_sign][horse?!] {
    221     icon-image: "presets/vehicle/restriction/horse.png";
     221    icon-image: "presets/vehicle/restriction/horse.svg";
    222222    set icon_z17;
    223223}
    224224node[traffic_sign][horse=designated] {
    225     icon-image: "presets/vehicle/restriction/horse-designated.png";
     225    icon-image: "presets/vehicle/restriction/horse-designated.svg";
    226226    set icon_z17;
    227227}
    228228node[traffic_sign][motorcycle?!] {
    229     icon-image: "presets/vehicle/restriction/motorbike.png";
     229    icon-image: "presets/vehicle/restriction/motorbike.svg";
    230230    set icon_z17;
    231231}
    232232node[traffic_sign][motorcar?!] {
    233     icon-image: "presets/vehicle/restriction/motorcar.png";
     233    icon-image: "presets/vehicle/restriction/motorcar.svg";
    234234    set icon_z17;
    235235}
    236236node[traffic_sign][psv?!] {
    237     icon-image: "presets/vehicle/restriction/psv.png";
     237    icon-image: "presets/vehicle/restriction/psv.svg";
    238238    set icon_z17;
    239239}
    240240node[traffic_sign][motorboat?!][!is_prop_set(icon-image)],
    241241node[traffic_sign][boat?!][!is_prop_set(icon-image)] {
    242     icon-image: "presets/misc/no_icon.png";
     242    icon-image: "presets/misc/no_icon.svg";
    243243    set icon_z17;
    244244}
    245245node[noexit=yes] {
    246     icon-image: "presets/vehicle/restriction/dead_end.png";
     246    icon-image: "presets/vehicle/restriction/dead_end.svg";
    247247    set icon_z17;
    248248}
    249249node[traffic_sign][maxweight] {
    250     icon-image: "presets/vehicle/restriction/maxweight.png";
     250    icon-image: "presets/vehicle/restriction/maxweight.svg";
    251251    set icon_z17;
    252252}
    253253node[traffic_sign][maxheight] {
    254     icon-image: "presets/vehicle/restriction/maxheight.png";
     254    icon-image: "presets/vehicle/restriction/maxheight.svg";
    255255    set icon_z17;
    256256}
    257257node[traffic_sign][maxwidth] {
    258     icon-image: "presets/vehicle/restriction/maxwidth.png";
     258    icon-image: "presets/vehicle/restriction/maxwidth.svg";
    259259    set icon_z17;
    260260}
    261261node[traffic_sign][maxlength] {
    262     icon-image: "presets/vehicle/restriction/maxlength.png";
     262    icon-image: "presets/vehicle/restriction/maxlength.svg";
    263263    set icon_z17;
    264264}
    265265node[traffic_sign][minspeed] {
    266     icon-image: "presets/vehicle/restriction/minspeed.png";
     266    icon-image: "presets/vehicle/restriction/minspeed.svg";
    267267    set icon_z17;
    268268}
    269269node[traffic_sign][maxstay][!is_prop_set(icon-image)],
    270270node[traffic_sign][toll][!is_prop_set(icon-image)] {
    271     icon-image: "presets/misc/no_icon.png";
     271    icon-image: "presets/misc/no_icon.svg";
    272272    set icon_z17;
    273273}
     
    305305}
    306306node[building][!building?!] {
    307     icon-image: "presets/misc/landmark/building.png";
     307    icon-image: "presets/landmark/building.svg";
    308308    set icon_z17;
    309309}
    310310node[building=garage] {
    311     icon-image: "presets/misc/landuse/garages.png";
     311    icon-image: "presets/landuse/garages.png";
    312312    set icon_z17;
    313313}
    314314node[building=garages] {
    315     icon-image: "presets/misc/landuse/garages.png";
     315    icon-image: "presets/landuse/garages.png";
    316316    set icon_z17;
    317317}
     
    343343node[building=entrance],
    344344node[building:part] {
    345     icon-image: "presets/misc/deprecated.png";
     345    icon-image: "presets/misc/deprecated.svg";
    346346    set icon_z17;
    347347}
     
    357357}
    358358node[barrier=bollard] {
    359     icon-image: "presets/bollard.png";
     359    icon-image: "presets/barrier/bollard.svg";
    360360    set icon_z17;
    361361}
    362362node[barrier=gate] {
    363     icon-image: "presets/vehicle/gate.png";
     363    icon-image: "presets/barrier/gate.png";
    364364    set icon_z17;
    365365}
     
    390390node[barrier=retaining_wall],
    391391node[barrier=ditch] {
    392     icon-image: "presets/misc/deprecated.png";
     392    icon-image: "presets/misc/deprecated.svg";
    393393    set icon_z17;
    394394}
    395395node[barrier=kerb] {
    396     icon-image: "presets/vehicle/kerb.svg";
     396    icon-image: "presets/barrier/kerb.svg";
    397397    set icon_z17;
    398398}
    399399node[barrier=block] {
    400     icon-image: "presets/vehicle/block.svg";
     400    icon-image: "presets/barrier/block.svg";
    401401    set icon_z17;
    402402}
    403403node[barrier=chain] {
    404     icon-image: "presets/vehicle/chain.svg";
     404    icon-image: "presets/barrier/chain.svg";
    405405    set icon_z17;
    406406}
    407407node[barrier=stile] {
    408     icon-image: "presets/vehicle/stile.svg";
     408    icon-image: "presets/barrier/stile.svg";
    409409    set icon_z17;
    410410}
    411411node[barrier=turnstile] {
    412     icon-image: "presets/vehicle/turnstile.png";
     412    icon-image: "presets/barrier/turnstile.svg";
    413413    set icon_z17;
    414414}
    415415node[barrier=cycle_barrier] {
    416     icon-image: "presets/vehicle/cycle_barrier.png";
     416    icon-image: "presets/barrier/cycle_barrier.svg";
    417417    set icon_z17;
    418418}
    419419node[barrier=lift_gate] {
    420     icon-image: "presets/vehicle/lift_gate.png";
     420    icon-image: "presets/barrier/lift_gate.svg";
    421421    set icon_z17;
    422422}
    423423node[barrier=swing_gate] {
    424     icon-image: "presets/vehicle/swing_gate.png";
     424    icon-image: "presets/barrier/swing_gate.svg";
    425425    set icon_z17;
    426426}
     
    429429}
    430430node[barrier=toll_booth] {
    431     icon-image: "presets/vehicle/toll_booth.png";
     431    icon-image: "presets/barrier/toll_station.png";
     432    icon-width: 16;
    432433    set icon_z17;
    433434}
    434435node[barrier=entrance] {
    435     icon-image: "presets/vehicle/entrance.png";
     436    icon-image: "presets/barrier/entrance.svg";
    436437    set icon_z17;
    437438}
    438439node[barrier=cattle_grid] {
    439     icon-image: "presets/vehicle/cattle_grid.png";
     440    icon-image: "presets/barrier/cattle_grid.png";
    440441    set icon_z17;
    441442}
    442443node[barrier=border_control] {
    443     icon-image: "presets/vehicle/border_control.png";
     444    icon-image: "presets/barrier/douane.png";
    444445    set icon_z17;
    445446}
    446447node[barrier=sally_port] {
    447     icon-image: "presets/vehicle/sally_port.png";
     448    icon-image: "presets/barrier/sally_port.svg";
    448449    set icon_z17;
    449450}
    450451node[barrier=spikes] {
    451     icon-image: "presets/vehicle/spikes.svg";
     452    icon-image: "presets/barrier/spikes.svg";
    452453    set icon_z17;
    453454}
     
    457458node[barrier=jersey_barrier][!is_prop_set(icon-image)],
    458459node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
    459     icon-image: "presets/misc/no_icon.png";
     460    icon-image: "presets/misc/no_icon.svg";
    460461    set icon_z17;
    461462}
     
    744745}
    745746node[highway=ford], node[ford?] {
    746     icon-image: "presets/misc/ford.svg";
     747    icon-image: "presets/vehicle/ford.svg";
    747748    set icon_z17;
    748749}
     
    785786}
    786787node[highway=construction] {
    787     icon-image: "presets/misc/construction.png";
     788    icon-image: "presets/misc/construction.svg";
    788789    set icon_z17;
    789790}
     
    814815node[highway=bus_guideway],
    815816node[highway=platform] {
    816     icon-image: "presets/misc/deprecated.png";
     817    icon-image: "presets/misc/deprecated.svg";
    817818    set icon_z17;
    818819}
     
    10251026node[cycleway=track], node[cycleway=opposite_track],
    10261027node[cycleway=opposite] {
    1027     icon-image: "presets/misc/deprecated.png";
     1028    icon-image: "presets/misc/deprecated.svg";
    10281029    set icon_z17;
    10291030}
     
    11191120node[piste:type=sleigh],
    11201121node[piste:type=snow_park] {
    1121     icon-image: "presets/sport/skiing.png";
     1122    icon-image: "presets/sport/skiing.svg";
    11221123    set icon_z17;
    11231124}
     
    11631164node[power=cable],
    11641165node[power=minor_line] {
    1165     icon-image: "presets/misc/deprecated.png";
     1166    icon-image: "presets/misc/deprecated.svg";
    11661167    set icon_z17;
    11671168}
     
    12321233}
    12331234node[generator:source=nuclear] {
    1234     icon-image: "presets/power_source-nuclear.svg";
     1235    icon-image: "presets/power/power_source-nuclear.svg";
    12351236    set icon_z17;
    12361237}
    12371238node[generator:source=wind] {
    1238     icon-image: "presets/power_source-wind.svg";
     1239    icon-image: "presets/power/power_source-wind.svg";
    12391240    set icon_z17;
    12401241}
     
    12431244node[generator:source=wave],
    12441245node[generator:source=osmotic] {
    1245     icon-image: "presets/power_source-water.svg";
     1246    icon-image: "presets/power/power_source-water.svg";
    12461247    set icon_z17;
    12471248}
    12481249node[generator:source=geothermal] {
    1249     icon-image: "presets/power_source-geothermal.svg";
     1250    icon-image: "presets/power/power_source-geothermal.svg";
    12501251    set icon_z17;
    12511252}
    12521253node[generator:source=solar] {
    1253     icon-image: "presets/power_source-sun.svg";
     1254    icon-image: "presets/power/power_source-sun.svg";
    12541255    set icon_z17;
    12551256}
    12561257node[generator:source=coal] {
    1257     icon-image: "presets/power_source-coal.svg";
     1258    icon-image: "presets/power/power_source-coal.svg";
    12581259    set icon_z17;
    12591260}
    12601261node[generator:source=gas] {
    1261     icon-image: "presets/power_source-gas.svg";
     1262    icon-image: "presets/power/power_source-gas.svg";
    12621263    set icon_z17;
    12631264}
     
    12651266node[generator:source=biofuel],
    12661267node[generator:source=biogas] {
    1267     icon-image: "presets/power_source-biofuel.svg";
     1268    icon-image: "presets/power/power_source-biofuel.svg";
    12681269    set icon_z17;
    12691270}
     
    12711272node[generator:source=diesel],
    12721273node[generator:source=gasoline] {
    1273     icon-image: "presets/power_source-oil.svg";
     1274    icon-image: "presets/power/power_source-oil.svg";
    12741275    set icon_z17;
    12751276}
    12761277node[generator:source=waste] {
    1277     icon-image: "presets/power_source-waste.svg";
     1278    icon-image: "presets/power/power_source-waste.svg";
    12781279    set icon_z17;
    12791280}
    12801281node[power_source] {
    1281     icon-image: "presets/misc/deprecated.png";
     1282    icon-image: "presets/misc/deprecated.svg";
    12821283    set icon_z17;
    12831284}
     
    13001301}
    13011302node[man_made=beacon] {
    1302     icon-image: "presets/misc/landmark/beacon.png";
     1303    icon-image: "presets/landmark/beacon.png";
    13031304    set icon_z17;
    13041305}
    13051306node[man_made=bridge] {
    1306     icon-image: "presets/misc/deprecated.png";
     1307    icon-image: "presets/misc/deprecated.svg";
    13071308    set icon_z17;
    13081309}
     
    13121313}
    13131314node[man_made=chimney] {
    1314     icon-image: "presets/misc/landmark/chimney.png";
     1315    icon-image: "presets/landmark/chimney.png";
     1316    icon-width: 16;
    13151317    set icon_z17;
    13161318}
    13171319node[man_made=flagpole] {
    13181320    icon-image: "presets/misc/flag.png";
     1321    icon-width: 16;
    13191322    set icon_z17;
    13201323}
    13211324node[man_made=gasometer] {
    1322     icon-image: "presets/gasometer.png";
     1325    icon-image: "presets/landmark/gasometer.svg";
    13231326    icon-width: 16;
    13241327    set icon_z17;
    13251328}
    13261329node[man_made=silo] {
    1327     icon-image: "presets/silo.png";
     1330    icon-image: "presets/landmark/silo.svg";
    13281331    icon-width: 16;
    13291332    set icon_z17;
    13301333}
    13311334node[man_made=storage_tank] {
    1332     icon-image: "presets/storage_tank.png";
     1335    icon-image: "presets/landmark/storage_tank.svg";
    13331336    icon-width: 16;
    13341337    set icon_z17;
    13351338}
    13361339node[man_made=bunker_silo] {
    1337     icon-image: "presets/bunker_silo.svg";
     1340    icon-image: "presets/landmark/bunker_silo.svg";
    13381341    set icon_z17;
    13391342}
     
    13531356}
    13541357node[man_made=lighthouse] {
    1355     icon-image: "presets/misc/landmark/lighthouse.png";
     1358    icon-image: "presets/landmark/lighthouse.svg";
    13561359    set icon_z17;
    13571360}
    13581361node[man_made=monitoring_station] {
    1359     icon-image: "presets/misc/landmark/measurement_station.png";
     1362    icon-image: "presets/landmark/measurement_station.png";
    13601363    set icon_z17;
    13611364}
    13621365node[man_made=mineshaft] {
    1363     icon-image: "presets/misc/landmark/mine.png";
     1366    icon-image: "presets/landmark/mine.svg";
    13641367    set icon_z17;
    13651368}