Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10564)
+++ /trunk/data/defaultpresets.xml	(revision 10565)
@@ -393,7 +393,7 @@
   </chunk>
   <!--  Groups -->
-  <group name="Highways" icon="styles/standard/transport/way/way_secondary.svg">
-    <group name="Streets" icon="styles/standard/transport/way/way_secondary.svg">
-        <item name="Motorway" icon="styles/standard/transport/way/way_motorway.svg" type="way" preset_name_label="true">
+  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
+    <group name="Streets" icon="presets/transport/way/way_secondary.svg">
+        <item name="Motorway" icon="presets/transport/way/way_motorway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway"
@@ -432,5 +432,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Motorway -->
-        <item name="Motorway Link" icon="styles/standard/transport/way/way_motorway_link.svg" type="way" preset_name_label="true">
+        <item name="Motorway Link" icon="presets/transport/way/way_motorway_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link"
@@ -461,5 +461,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Motorway Link -->
-        <item name="Trunk" icon="styles/standard/transport/way/way_trunk.svg" type="way" preset_name_label="true">
+        <item name="Trunk" icon="presets/transport/way/way_trunk.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk"
@@ -498,5 +498,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Trunk -->
-        <item name="Trunk Link" icon="styles/standard/transport/way/way_trunk_link.svg" type="way" preset_name_label="true">
+        <item name="Trunk Link" icon="presets/transport/way/way_trunk_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Highway_link" />
@@ -524,5 +524,5 @@
         </item> <!-- Trunk Link -->
         <separator/>
-        <item name="Primary" icon="styles/standard/transport/way/way_primary.svg" type="way,closedway" preset_name_label="true">
+        <item name="Primary" icon="presets/transport/way/way_primary.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary"
@@ -550,5 +550,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary -->
-        <item name="Primary Link" icon="styles/standard/transport/way/way_primary_link.svg" type="way" preset_name_label="true">
+        <item name="Primary Link" icon="presets/transport/way/way_primary_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -567,5 +567,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Primary Link -->
-        <item name="Secondary" icon="styles/standard/transport/way/way_secondary.svg" type="way,closedway" preset_name_label="true">
+        <item name="Secondary" icon="presets/transport/way/way_secondary.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
@@ -593,5 +593,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary -->
-        <item name="Secondary Link" icon="styles/standard/transport/way/way_secondary_link.svg" type="way" preset_name_label="true">
+        <item name="Secondary Link" icon="presets/transport/way/way_secondary_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -609,5 +609,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Secondary Link -->
-        <item name="Tertiary" icon="styles/standard/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
+        <item name="Tertiary" icon="presets/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=tertiary"
@@ -636,5 +636,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Tertiary -->
-        <item name="Tertiary Link" icon="styles/standard/transport/way/way_tertiary_link.svg" type="way" preset_name_label="true">
+        <item name="Tertiary Link" icon="presets/transport/way/way_tertiary_link.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Link_(highway)"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Link_(highway)"
@@ -651,5 +651,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Tertiary Link -->
-        <item name="Unclassified" icon="styles/standard/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
+        <item name="Unclassified" icon="presets/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
@@ -676,5 +676,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Unclassified -->
-        <item name="Residential" icon="styles/standard/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
+        <item name="Residential" icon="presets/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential"
@@ -702,5 +702,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Residential -->
-        <item name="Bicycle Road" icon="styles/standard/transport/way/way_bicycle_road.svg" type="way,closedway" preset_name_label="true">
+        <item name="Bicycle Road" icon="presets/transport/way/way_bicycle_road.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bicycle_road"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bicycle_road"
@@ -726,5 +726,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Bicycle Road -->
-        <item name="Living Street" icon="styles/standard/transport/way/way_living_street.svg" type="way,closedway" preset_name_label="true">
+        <item name="Living Street" icon="presets/transport/way/way_living_street.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street"
@@ -747,5 +747,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Living Street -->
-        <item name="Pedestrian" icon="styles/standard/transport/way/way_pedestrian.svg" type="way,closedway,multipolygon" preset_name_label="true">
+        <item name="Pedestrian" icon="presets/transport/way/way_pedestrian.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian"
@@ -771,5 +771,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Pedestrian -->
-        <item name="Service" icon="styles/standard/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
+        <item name="Service" icon="presets/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service"
@@ -794,5 +794,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Service -->
-        <item name="Parking Aisle" icon="styles/standard/transport/way/way_service_parking_aisle.svg" type="way,closedway" preset_name_label="true">
+        <item name="Parking Aisle" icon="presets/transport/way/way_service_parking_aisle.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
@@ -812,5 +812,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Parking Aisle -->
-        <item name="Escape" icon="styles/standard/transport/way/way_escape.svg" type="way" preset_name_label="true">
+        <item name="Escape" icon="presets/transport/way/way_escape.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=escape"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=escape"
@@ -826,5 +826,5 @@
             </optional>
         </item> <!-- Escape -->
-        <item name="Raceway" icon="styles/standard/sport/raceway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Raceway" icon="presets/sport/raceway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=raceway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=raceway"
@@ -838,5 +838,5 @@
             <text key="name" text="Name" />
         </item> <!-- Raceway -->
-        <item name="Road (Unknown Type)" icon="styles/standard/transport/way/way_road.svg" type="way,closedway" preset_name_label="true">
+        <item name="Road (Unknown Type)" icon="presets/transport/way/way_road.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=road"
@@ -857,5 +857,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Road (Unknown Type) -->
-        <item name="Construction" icon="styles/standard/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
+        <item name="Construction" icon="presets/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:construction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:construction"
@@ -878,5 +878,5 @@
         </item> <!-- Construction -->
         <separator/>
-        <item name="Road Restrictions" icon="styles/standard/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Road Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:access"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:access"
@@ -932,5 +932,5 @@
         </item> <!-- Road Restrictions -->
         <separator/>
-        <item name="Roundabout" icon="styles/standard/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
@@ -955,5 +955,5 @@
             <preset_link preset_name="Road Restrictions" />
         </item> <!-- Roundabout -->
-        <item name="Ford" icon="styles/standard/misc/ford.svg" type="node,way" preset_name_label="true">
+        <item name="Ford" icon="presets/misc/ford.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:ford"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:ford"
@@ -970,6 +970,6 @@
         </item> <!-- Ford -->
     </group> <!-- Streets -->
-    <group name="Ways" icon="styles/standard/transport/way/way_unclassified.svg">
-        <item name="Track" icon="styles/standard/transport/way/track.svg" type="way,closedway" preset_name_label="true">
+    <group name="Ways" icon="presets/transport/way/way_unclassified.svg">
+        <item name="Track" icon="presets/transport/way/track.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=track"
@@ -1007,5 +1007,5 @@
             </optional>
         </item> <!-- Track -->
-        <item name="Path" icon="styles/standard/transport/way/path.svg" type="way,closedway" preset_name_label="true">
+        <item name="Path" icon="presets/transport/way/path.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path"
@@ -1045,5 +1045,5 @@
         </item> <!-- Path -->
         <separator/>
-        <item name="Dedicated Bridleway" icon="styles/standard/transport/way/dedicated_bridleway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Dedicated Bridleway" icon="presets/transport/way/dedicated_bridleway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:highway=bridleway"
@@ -1061,5 +1061,5 @@
             </optional>
         </item> <!-- Dedicated Bridleway -->
-        <item name="Cycle Lane/Track" icon="styles/standard/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
+        <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Bicycle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
@@ -1085,5 +1085,5 @@
             </optional>
         </item> <!-- Cycle Lane/Track -->
-        <item name="Dedicated Cycleway" icon="styles/standard/transport/way/dedicated_cycleway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Dedicated Cycleway" icon="presets/transport/way/dedicated_cycleway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1103,5 +1103,5 @@
             </optional>
         </item> <!-- Dedicated Cycleway -->
-        <item name="Segregated Foot- and Cycleway" icon="styles/standard/transport/way/segregated_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Segregated Foot- and Cycleway" icon="presets/transport/way/segregated_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1117,5 +1117,5 @@
             </optional>
         </item> <!-- Segregated Foot- and Cycleway -->
-        <item name="Combined Foot- and Cycleway" icon="styles/standard/transport/way/combined_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Combined Foot- and Cycleway" icon="presets/transport/way/combined_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
@@ -1132,5 +1132,5 @@
             </optional>
         </item> <!-- Combined Foot- and Cycleway -->
-        <item name="Dedicated Footway" icon="styles/standard/transport/way/dedicated_footway.svg" type="way,closedway" preset_name_label="true">
+        <item name="Dedicated Footway" icon="presets/transport/way/dedicated_footway.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=footway"
@@ -1156,5 +1156,5 @@
             </optional>
         </item> <!-- Dedicated Footway -->
-        <item name="Steps" icon="styles/standard/transport/way/steps.svg" type="way" preset_name_label="true">
+        <item name="Steps" icon="presets/transport/way/steps.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
@@ -1198,6 +1198,6 @@
         </item> <!-- Steps -->
     </group> <!-- Ways -->
-    <group name="Waypoints" icon="styles/standard/vehicle/waypoints.svg">
-        <item name="Motorway Junction" icon="styles/standard/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
+    <group name="Waypoints" icon="presets/vehicle/waypoints.svg">
+        <item name="Motorway Junction" icon="presets/vehicle/motorway_junction.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_junction"
@@ -1212,5 +1212,5 @@
             <text key="ref" text="Number" />
         </item> <!-- Motorway Junction -->
-        <item name="Services" icon="styles/standard/vehicle/services.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Services" icon="presets/vehicle/services.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=services"
@@ -1227,5 +1227,5 @@
             </optional>
         </item> <!-- Services -->
-        <item name="Rest Area" icon="styles/standard/vehicle/rest_area.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Rest Area" icon="presets/vehicle/rest_area.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=rest_area"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=rest_area"
@@ -1245,5 +1245,5 @@
         </item> <!-- Rest Area -->
         <separator/>
-        <item name="Traffic Signal" icon="styles/standard/vehicle/traffic_signals.svg" type="node" preset_name_label="true">
+        <item name="Traffic Signal" icon="presets/vehicle/traffic_signals.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
@@ -1267,5 +1267,5 @@
             </optional>
             </item> <!-- Traffic Signal -->
-        <item name="Stop" icon="styles/standard/vehicle/restriction/stop.svg" type="node" preset_name_label="true">
+        <item name="Stop" icon="presets/vehicle/restriction/stop.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stop"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=stop"
@@ -1276,5 +1276,5 @@
             <key key="highway" value="stop" />
         </item> <!-- Stop -->
-        <item name="Give Way" icon="styles/standard/vehicle/restriction/give_way.svg" type="node" preset_name_label="true">
+        <item name="Give Way" icon="presets/vehicle/restriction/give_way.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=give_way"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=give_way"
@@ -1285,5 +1285,5 @@
             <key key="highway" value="give_way" />
         </item> <!-- Give Way -->
-        <item name="Mini-Roundabout" icon="styles/standard/vehicle/restriction/mini_roundabout_left.svg" type="node" preset_name_label="true">
+        <item name="Mini-Roundabout" icon="presets/vehicle/restriction/mini_roundabout_left.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
@@ -1297,5 +1297,5 @@
             <combo key="direction" text="Direction" values="clockwise" />
         </item> <!-- Mini-Roundabout -->
-        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/crossing.svg" type="node" preset_name_label="true">
+        <item name="Pedestrian Crossing" icon="presets/vehicle/crossing.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:crossing"
@@ -1311,8 +1311,8 @@
             <key key="highway" value="crossing" />
             <combo key="crossing" text="Pedestrian crossing type" >
-                <list_entry value="uncontrolled" icon="styles/standard/vehicle/crossing.svg" />
-                <list_entry value="traffic_signals" icon="styles/standard/vehicle/crossing_traffic_signals.svg" />
-                <list_entry value="island" icon="styles/standard/vehicle/crossing_island.svg" />
-                <list_entry value="unmarked" icon="styles/standard/vehicle/crossing_unmarked.svg" />
+                <list_entry value="uncontrolled" icon="presets/vehicle/crossing.svg" />
+                <list_entry value="traffic_signals" icon="presets/vehicle/crossing_traffic_signals.svg" />
+                <list_entry value="island" icon="presets/vehicle/crossing_island.svg" />
+                <list_entry value="unmarked" icon="presets/vehicle/crossing_unmarked.svg" />
             </combo>
             <combo key="crossing_ref" text="Crossing type name (UK)" values="zebra,pelican,toucan,puffin,pegasus,tiger" values_searchable="true" />
@@ -1325,6 +1325,6 @@
             <check key="traffic_signals:sound" text="Sound signals" />
         </item> <!-- Pedestrian Crossing -->
-        <group name="Traffic Calming" icon="styles/standard/vehicle/choker.svg"> 
-            <item name="Bump" icon="styles/standard/vehicle/bump.svg" type="node,way" preset_name_label="true">
+        <group name="Traffic Calming" icon="presets/vehicle/choker.svg"> 
+            <item name="Bump" icon="presets/vehicle/bump.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1342,5 +1342,5 @@
                 <key key="traffic_calming" value="bump" />
             </item> <!-- Bump -->
-            <item name="Chicane" icon="styles/standard/vehicle/chicane.svg" type="node,way" preset_name_label="true">
+            <item name="Chicane" icon="presets/vehicle/chicane.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1358,5 +1358,5 @@
                 <key key="traffic_calming" value="chicane" />
             </item> <!-- Chicane -->
-            <item name="Choker" icon="styles/standard/vehicle/choker.svg" type="node,way" preset_name_label="true">
+            <item name="Choker" icon="presets/vehicle/choker.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1374,5 +1374,5 @@
                 <key key="traffic_calming" value="choker" />
             </item> <!-- Choker -->
-            <item name="Cushion" icon="styles/standard/vehicle/cushion.svg" type="node,way" preset_name_label="true">
+            <item name="Cushion" icon="presets/vehicle/cushion.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1390,5 +1390,5 @@
                 <key key="traffic_calming" value="cushion" />
             </item> <!-- Cushion -->
-            <item name="Hump" icon="styles/standard/vehicle/hump.svg" type="node,way" preset_name_label="true">
+            <item name="Hump" icon="presets/vehicle/hump.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1406,5 +1406,5 @@
                 <key key="traffic_calming" value="hump" />
             </item> <!-- Hump -->
-            <item name="Island" name_context="traffic_calming" icon="styles/standard/vehicle/island.svg" type="node,way" preset_name_label="true">
+            <item name="Island" name_context="traffic_calming" icon="presets/vehicle/island.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1422,5 +1422,5 @@
                 <key key="traffic_calming" value="island" />
             </item> <!-- Island -->
-            <item name="Rumble strip" icon="styles/standard/vehicle/rumble_strip.svg" type="node,way" preset_name_label="true">
+            <item name="Rumble strip" icon="presets/vehicle/rumble_strip.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1438,5 +1438,5 @@
                 <key key="traffic_calming" value="rumble_strip" />
             </item> <!-- Rumble strip -->
-            <item name="Table" icon="styles/standard/vehicle/table.svg" type="node,way" preset_name_label="true">
+            <item name="Table" icon="presets/vehicle/table.svg" type="node,way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"
                       cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:traffic_calming"
@@ -1455,5 +1455,5 @@
             </item> <!-- Table -->
         </group> <!-- Traffic Calming -->
-        <item name="Passing Place" icon="styles/standard/vehicle/passing_place.svg" type="node" preset_name_label="true">
+        <item name="Passing Place" icon="presets/vehicle/passing_place.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=passing_place"
@@ -1462,5 +1462,5 @@
             <key key="highway" value="passing_place" />
         </item> <!-- Passing Place -->
-        <item name="Turning Circle" icon="styles/standard/vehicle/turning_circle.svg" type="node" preset_name_label="true">
+        <item name="Turning Circle" icon="presets/vehicle/turning_circle.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle"
@@ -1472,5 +1472,5 @@
             <key key="highway" value="turning_circle" />
         </item> <!-- Turning Circle -->
-        <item name="Turning Loop" icon="styles/standard/vehicle/turning_loop.svg" type="node" preset_name_label="true">
+        <item name="Turning Loop" icon="presets/vehicle/turning_loop.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_loop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_loop"
@@ -1478,5 +1478,5 @@
             <key key="highway" value="turning_loop" />
         </item> <!-- Turning Loop -->
-        <item name="City Limit Sign" icon="styles/standard/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
+        <item name="City Limit Sign" icon="presets/vehicle/restriction/city_limit.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1491,5 +1491,5 @@
             <text key="alt_name" text="Second Name" />
         </item> <!-- City Limit -->
-        <item name="Speed Limit Sign" icon="styles/standard/vehicle/restriction/maxspeed.svg" type="node" preset_name_label="true">
+        <item name="Speed Limit Sign" icon="presets/vehicle/restriction/maxspeed.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_sign"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:traffic_sign"
@@ -1503,5 +1503,5 @@
             <text key="maxspeed" text="Max. speed (km/h)" />
         </item> <!-- Speed Limit -->
-        <item name="Speed Camera" icon="styles/standard/vehicle/restriction/speed_camera.svg" type="node" preset_name_label="true">
+        <item name="Speed Camera" icon="presets/vehicle/restriction/speed_camera.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=speed_camera"
                   az.href="http://wiki.openstreetmap.org/wiki/Az:Tag:highway=speed_camera"
@@ -1517,10 +1517,10 @@
             </optional>
         </item> <!-- Speed Camera -->
-        <item name="Traffic Mirror" icon="styles/standard/vehicle/traffic_mirror.svg" type="node" preset_name_label="true">
+        <item name="Traffic Mirror" icon="presets/vehicle/traffic_mirror.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_mirror"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_mirror" />
             <key key="highway" value="traffic_mirror" />
         </item> <!-- Traffic Mirror -->
-        <item name="Highway milestone" icon="styles/standard/vehicle/milestone.svg" type="node" preset_name_label="true">
+        <item name="Highway milestone" icon="presets/vehicle/milestone.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=milestone"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=milestone"
@@ -1531,5 +1531,5 @@
             <text key="ref" text="Reference" />
         </item> <!-- Highway Milestone -->
-        <item name="Named Junction" name_context="junction=yes" icon="styles/standard/vehicle/junction.svg" type="node,closedway" preset_name_label="true">
+        <item name="Named Junction" name_context="junction=yes" icon="presets/vehicle/junction.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=yes"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:junction=yes" />
@@ -1539,5 +1539,5 @@
         </item> <!-- Named Junction -->
         <separator/>
-        <item name="Elevator" icon="styles/standard/service/elevator.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Elevator" icon="presets/service/elevator.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=elevator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=elevator"
@@ -1548,5 +1548,5 @@
         </item> <!-- Elevator -->
         <separator/>
-        <item name="Grit Bin" icon="styles/standard/misc/grit_bin.svg" type="node" preset_name_label="true">
+        <item name="Grit Bin" icon="presets/misc/grit_bin.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grit_bin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=grit_bin"
@@ -1556,5 +1556,5 @@
         </item> <!-- Grit Bin -->
         <separator/>
-        <item name="Mountain Pass" icon="styles/standard/misc/landmark/mountain_pass.svg" type="node" preset_name_label="true">
+        <item name="Mountain Pass" icon="presets/misc/landmark/mountain_pass.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:mountain_pass"
@@ -1573,5 +1573,5 @@
     </group> <!-- Waypoints -->
     <group name="Barriers" icon="presets/barrier.png"> <!-- *** Node Barriers *** -->
-        <item name="Block" icon="styles/standard/vehicle/block.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Block" icon="presets/vehicle/block.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=block"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=block"
@@ -1602,5 +1602,5 @@
             </optional>
         </item> <!-- Bollard -->
-        <item name="Cycle Barrier" icon="styles/standard/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
+        <item name="Cycle Barrier" icon="presets/vehicle/cycle_barrier.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cycle_barrier"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cycle_barrier"
@@ -1611,5 +1611,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Cycle Barrier -->
-        <item name="Cattle Grid" icon="styles/standard/vehicle/cattle_grid.png" type="node" preset_name_label="true">
+        <item name="Cattle Grid" icon="presets/vehicle/cattle_grid.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=cattle_grid"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=cattle_grid"
@@ -1624,5 +1624,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Bus Trap -->
-        <item name="Spikes" icon="styles/standard/vehicle/spikes.svg" type="node" preset_name_label="true">
+        <item name="Spikes" icon="presets/vehicle/spikes.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:barrier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:barrier"
@@ -1756,5 +1756,5 @@
             </optional>
         </item> <!-- Ditch -->
-        <item name="Kerb" icon="styles/standard/vehicle/kerb.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Kerb" icon="presets/vehicle/kerb.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=kerb"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=kerb"
@@ -1766,5 +1766,5 @@
         </item> <!-- Kerb -->
         <separator/> <!-- *** Access *** -->
-        <item name="Entrance (Barrier Opening)" icon="styles/standard/vehicle/entrance.png" type="node" preset_name_label="true">
+        <item name="Entrance (Barrier Opening)" icon="presets/vehicle/entrance.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=entrance"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:barrier=entrance"
@@ -1775,5 +1775,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Entrance (Barrier Opening) -->
-        <item name="Gate" icon="styles/standard/vehicle/gate.png" type="node" preset_name_label="true">
+        <item name="Gate" icon="presets/vehicle/gate.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=gate"
@@ -1847,5 +1847,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Kissing Gate -->
-        <item name="Chain" icon="styles/standard/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Chain" icon="presets/vehicle/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=chain"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=chain" />
@@ -1854,5 +1854,5 @@
             <reference ref="optional_maxwidth" />
         </item> <!-- Chain -->
-        <item name="Stile" icon="styles/standard/vehicle/stile.svg" type="node" preset_name_label="true">
+        <item name="Stile" icon="presets/vehicle/stile.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=stile" />
             <space />
@@ -1864,5 +1864,5 @@
             <reference ref="barrier_2" />
         </item> <!-- Stile -->
-        <item name="Turnstile" icon="styles/standard/vehicle/turnstile.png" type="node" preset_name_label="true">
+        <item name="Turnstile" icon="presets/vehicle/turnstile.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=turnstile"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:barrier=turnstile"
@@ -1871,5 +1871,5 @@
             <reference ref="barrier_2" />
         </item> <!-- Turnstile -->
-        <item name="Sally Port" icon="styles/standard/vehicle/sally_port.png" type="node" preset_name_label="true">
+        <item name="Sally Port" icon="presets/vehicle/sally_port.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=sally_port"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:barrier=sally_port"
@@ -1880,6 +1880,6 @@
         </item> <!-- Sally Port -->
     </group> <!-- Barriers -->
-    <group name="Passageways" icon="styles/standard/transport/passage/tunnel.svg">
-        <item name="Tunnel" icon="styles/standard/transport/passage/tunnel.svg" type="way" preset_name_label="true">
+    <group name="Passageways" icon="presets/transport/passage/tunnel.svg">
+        <item name="Tunnel" icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:tunnel"
@@ -1908,5 +1908,5 @@
             </optional>
         </item> <!-- Tunnel -->
-        <item name="Building Passage" icon="styles/standard/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
+        <item name="Building Passage" icon="presets/transport/passage/tunnel_building_passage.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1927,5 +1927,5 @@
             </optional>
         </item> <!-- Building Passage -->
-        <item name="Arcade" icon="styles/standard/transport/passage/arcade.svg" type="way" preset_name_label="true">
+        <item name="Arcade" icon="presets/transport/passage/arcade.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:covered"
@@ -1946,5 +1946,5 @@
             </optional>
         </item> <!-- Arcade -->
-        <item name="Colonnade" icon="styles/standard/transport/passage/colonnade.svg" type="way" preset_name_label="true">
+        <item name="Colonnade" icon="presets/transport/passage/colonnade.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:covered"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:covered"
@@ -1963,5 +1963,5 @@
             </optional>
         </item> <!-- Colonnade -->
-        <item name="Avalanche Protector" icon="styles/standard/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
+        <item name="Avalanche Protector" icon="presets/transport/passage/tunnel_avalanche_protector.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
@@ -1985,7 +1985,7 @@
     </group> <!-- Passageways -->
   </group> <!-- Highways -->
-  <group name="Water" name_context="main group" icon="styles/standard/nautical/waterway_river.svg">
-    <group name="Water" name_context="sub group" icon="styles/standard/nautical/waterway_river.svg">
-        <item name="Drain" icon="styles/standard/nautical/waterway_drain.svg" type="way" preset_name_label="true">
+  <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
+    <group name="Water" name_context="sub group" icon="presets/nautical/waterway_river.svg">
+        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=drain"
@@ -2002,5 +2002,5 @@
             </optional>
         </item> <!-- Drain -->
-        <item name="Ditch" icon="styles/standard/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
+        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=ditch"
@@ -2016,5 +2016,5 @@
             </optional>
         </item> <!-- Ditch -->
-        <item name="Stream" icon="styles/standard/nautical/waterway_stream.svg" type="way" preset_name_label="true">
+        <item name="Stream" icon="presets/nautical/waterway_stream.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=stream"
@@ -2035,5 +2035,5 @@
             <reference ref="water_access" />
         </item> <!-- Stream -->
-        <item name="River" icon="styles/standard/nautical/waterway_river.svg" type="way" preset_name_label="true">
+        <item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=river"
@@ -2054,5 +2054,5 @@
             <reference ref="water_access" />
         </item> <!-- River -->
-        <item name="Canal" icon="styles/standard/nautical/waterway_canal.svg" type="way" preset_name_label="true">
+        <item name="Canal" icon="presets/nautical/waterway_canal.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=canal"
@@ -2074,5 +2074,5 @@
         </item> <!-- Canal -->
         <separator/>
-        <item name="Spring" icon="styles/standard/misc/landmark/spring.svg" type="node,closedway" preset_name_label="true">
+        <item name="Spring" icon="presets/misc/landmark/spring.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=spring"
@@ -2089,5 +2089,5 @@
             <check key="drinking_water" text="Drinking Water" />
         </item> <!-- Spring -->
-        <item name="Waterfall" icon="styles/standard/nautical/waterfall.svg" type="node,way" preset_name_label="true">
+        <item name="Waterfall" icon="presets/nautical/waterfall.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=waterfall"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=waterfall"
@@ -2100,5 +2100,5 @@
             <text key="height" text="Height (meters)" />
         </item> <!-- Waterfall -->
-        <item name="Weir" icon="styles/standard/nautical/weir.svg" type="node,way" preset_name_label="true">
+        <item name="Weir" icon="presets/nautical/weir.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=weir"
@@ -2113,5 +2113,5 @@
             <text key="name" text="Name" />
         </item> <!-- Weir -->
-        <item name="Dam" icon="styles/standard/nautical/dam.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Dam" icon="presets/nautical/dam.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=dam"
@@ -2126,5 +2126,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Dam -->
-        <item name="Groyne" icon="styles/standard/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
+        <item name="Groyne" icon="presets/nautical/groyne.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=groyne"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=groyne"
@@ -2134,5 +2134,5 @@
             <key key="man_made" value="groyne" />
         </item> <!-- Groyne -->
-        <item name="Breakwater" icon="styles/standard/nautical/breakwater.svg" type="way,closedway,multipolygon" preset_name_label="true">
+        <item name="Breakwater" icon="presets/nautical/breakwater.svg" type="way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=breakwater"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=breakwater"
@@ -2147,5 +2147,5 @@
         </item> <!-- Breakwater -->
         <separator/>
-        <item name="Culvert" icon="styles/standard/transport/passage/tunnel_culvert.svg" type="way" preset_name_label="true">
+        <item name="Culvert" icon="presets/transport/passage/tunnel_culvert.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tunnel=culvert"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tunnel=culvert"
@@ -2198,5 +2198,5 @@
         </item> <!-- Covered Reservoir -->
         <separator/>
-        <item name="Water" name_context="natural" icon="styles/standard/nautical/water.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Water" name_context="natural" icon="presets/nautical/water.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
@@ -2219,5 +2219,5 @@
             <reference ref="water_access" />
         </item> <!-- Water -->
-        <item name="Coastline" icon="styles/standard/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
+        <item name="Coastline" icon="presets/nautical/coast_line.svg" type="way,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=coastline"
@@ -2233,5 +2233,5 @@
             <text key="name" text="Name" />
         </item> <!-- Coastline -->
-        <item name="Riverbank" icon="styles/standard/nautical/waterway_riverbank.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Riverbank" icon="presets/nautical/waterway_riverbank.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:waterway=riverbank"
@@ -2252,5 +2252,5 @@
         </item> <!-- Riverbank -->
         <separator/>
-        <item name="Wetland" icon="styles/standard/misc/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Wetland" icon="presets/misc/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wetland"
@@ -2271,5 +2271,5 @@
             <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Wetland -->
-        <item name="Mud" icon="styles/standard/misc/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Mud" icon="presets/misc/landuse/mud.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=mud"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=mud"
@@ -2282,5 +2282,5 @@
             <text key="name" text="Name" />
         </item> <!-- Mud -->
-        <item name="Beach" icon="styles/standard/nautical/beach.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Beach" icon="presets/nautical/beach.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=beach"
@@ -2302,5 +2302,5 @@
             </optional>
         </item> <!-- Beach -->
-        <item name="Bay" icon="styles/standard/nautical/bay.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bay" icon="presets/nautical/bay.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=bay"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=bay"
@@ -2316,6 +2316,6 @@
         </item> <!-- Bay -->
     </group> <!-- Water -->
-    <group name="Shipping" icon="styles/standard/nautical/ferry.svg">
-        <item name="Ferry Terminal" icon="styles/standard/nautical/ferry.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Shipping" icon="presets/nautical/ferry.svg">
+        <item name="Ferry Terminal" icon="presets/nautical/ferry.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=ferry_terminal"
@@ -2330,5 +2330,5 @@
             <combo key="cargo" text="Cargo" values="passengers,vehicle,bicycle,hgv,passengers;vehicle" values_context="cargo" />
         </item> <!-- Ferry Terminal -->
-        <item name="Ferry Route" icon="styles/standard/nautical/ferry.svg" type="way,closedway,relation" preset_name_label="true">
+        <item name="Ferry Route" icon="presets/nautical/ferry.svg" type="way,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:route=ferry"
@@ -2342,5 +2342,5 @@
         </item> <!-- Ferry Route -->
         <separator/>
-        <item name="Marina" icon="styles/standard/nautical/marina.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Marina" icon="presets/nautical/marina.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=marina"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=marina"
@@ -2356,5 +2356,5 @@
             <combo key="sanitary_dump_station" text="Dump Station" values="yes,public,customers,no" />
         </item> <!-- Marina -->
-        <item name="Marine Fuel" icon="styles/standard/nautical/marine_fuel.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Marine Fuel" icon="presets/nautical/marine_fuel.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=fuel"/>
             <space />
@@ -2383,5 +2383,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Marine Fuel -->
-        <item name="Pier" icon="styles/standard/nautical/pier.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Pier" icon="presets/nautical/pier.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=pier"
@@ -2417,5 +2417,5 @@
         </item> <!-- Turning Point -->
         <separator/>
-        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node,way" preset_name_label="true">
+        <item name="Slipway" icon="presets/nautical/slipway.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
@@ -2455,7 +2455,7 @@
     </group> <!-- Shipping -->
   </group> <!-- Water -->
-  <group name="Transport" icon="styles/standard/transport/railway/rail.svg">
-    <group name="Railway" icon="styles/standard/transport/railway/rail.svg">
-        <item name="Rail" icon="styles/standard/transport/railway/rail.svg" type="way" preset_name_label="true">
+  <group name="Transport" icon="presets/transport/railway/rail.svg">
+    <group name="Railway" icon="presets/transport/railway/rail.svg">
+        <item name="Rail" icon="presets/transport/railway/rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=rail"
@@ -2473,5 +2473,5 @@
             </optional>
         </item> <!-- Rail -->
-        <item name="Narrow Gauge Rail" icon="styles/standard/transport/railway/narrow_gauge_rail.svg" type="way" preset_name_label="true">
+        <item name="Narrow Gauge Rail" icon="presets/transport/railway/narrow_gauge_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:narrow_gauge" />
             <key key="railway" value="narrow_gauge" />
@@ -2481,5 +2481,5 @@
             </optional>
         </item> <!-- Narrow Gauge Rail -->
-        <item name="Monorail" icon="styles/standard/transport/railway/monorail.svg" type="way" preset_name_label="true">
+        <item name="Monorail" icon="presets/transport/railway/monorail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=monorail"
@@ -2492,5 +2492,5 @@
             </optional>
         </item> <!-- Monorail -->
-        <item name="Preserved" icon="styles/standard/transport/railway/preserved.svg" type="way" preset_name_label="true">
+        <item name="Preserved" icon="presets/transport/railway/preserved.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=preserved"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=preserved"
@@ -2503,5 +2503,5 @@
             </optional>
         </item> <!-- Preserved -->
-        <item name="Light Rail" icon="styles/standard/transport/railway/light_rail.svg" type="way" preset_name_label="true">
+        <item name="Light Rail" icon="presets/transport/railway/light_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=light_rail" />
             <key key="railway" value="light_rail" />
@@ -2510,5 +2510,5 @@
             </optional>
         </item> <!-- Light Rail -->
-        <item name="Subway" icon="styles/standard/transport/railway/subway.svg" type="way" preset_name_label="true">
+        <item name="Subway" icon="presets/transport/railway/subway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=subway"
@@ -2522,5 +2522,5 @@
             </optional>
         </item> <!-- Subway -->
-        <item name="Tram" icon="styles/standard/transport/railway/tram.svg" type="way" preset_name_label="true">
+        <item name="Tram" icon="presets/transport/railway/tram.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram"
@@ -2535,5 +2535,5 @@
             </optional>
         </item> <!-- Tram -->
-        <item name="Funicular" icon="styles/standard/transport/railway/funicular.svg" type="way" preset_name_label="true">
+        <item name="Funicular" icon="presets/transport/railway/funicular.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=funicular" />
             <key key="railway" value="funicular" />
@@ -2542,5 +2542,5 @@
             </optional>
         </item> <!-- Funicular -->
-        <item name="Bus Guideway" icon="styles/standard/transport/railway/bus_guideway.svg" type="way" preset_name_label="true">
+        <item name="Bus Guideway" icon="presets/transport/railway/bus_guideway.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_guideway"
@@ -2560,5 +2560,5 @@
         </item> <!-- Bus Guideway -->
         <separator/>
-        <item name="Disused Rail" icon="styles/standard/transport/railway/disused_rail.svg" type="way" preset_name_label="true">
+        <item name="Disused Rail" icon="presets/transport/railway/disused_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
@@ -2569,5 +2569,5 @@
             </optional>
         </item> <!-- Disused Rail -->
-        <item name="Abandoned Rail" icon="styles/standard/transport/railway/abandoned_rail.svg" type="way" preset_name_label="true">
+        <item name="Abandoned Rail" icon="presets/transport/railway/abandoned_rail.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=abandoned"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=abandoned"
@@ -2581,5 +2581,5 @@
         </item> <!-- Abandoned Rail -->
         <separator/>
-        <item name="Level Crossing" icon="styles/standard/transport/railway/level_crossing.svg" type="node" preset_name_label="true">
+        <item name="Level Crossing" icon="presets/transport/railway/level_crossing.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:railway=level_crossing"
@@ -2603,5 +2603,5 @@
             </optional>
         </item> <!-- Level Crossing -->
-        <item name="Crossing" icon="styles/standard/transport/railway/crossing.svg" type="node" preset_name_label="true">
+        <item name="Crossing" icon="presets/transport/railway/crossing.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
                   bg.href="http://wiki.openstreetmap.org/wiki/Bg:Key:crossing"
@@ -2622,5 +2622,5 @@
             </optional>
         </item> <!-- Crossing -->
-        <item name="Turntable" icon="styles/standard/transport/railway/turntable.svg" type="node,closedway" preset_name_label="true">
+        <item name="Turntable" icon="presets/transport/railway/turntable.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=turntable"
@@ -2630,5 +2630,5 @@
             <key key="railway" value="turntable" />
         </item> <!-- Turntable -->
-        <item name="Buffer Stop" icon="styles/standard/transport/railway/buffer_stop.svg" type="node" preset_name_label="true">
+        <item name="Buffer Stop" icon="presets/transport/railway/buffer_stop.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=buffer_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=buffer_stop"
@@ -2636,5 +2636,5 @@
             <key key="railway" value="buffer_stop" />
         </item> <!-- Buffer Stop -->
-        <item name="Railway Switch" icon="styles/standard/transport/railway/switch.svg" type="node" preset_name_label="true">
+        <item name="Railway Switch" icon="presets/transport/railway/switch.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=switch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=switch"
@@ -2644,5 +2644,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Railway Switch -->
-        <item name="Railway Signal" icon="styles/standard/transport/railway/signal.svg" type="node" preset_name_label="true">
+        <item name="Railway Signal" icon="presets/transport/railway/signal.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=signal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=signal" />
@@ -2651,5 +2651,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Railway Signal -->
-        <item name="Railway milestone" icon="styles/standard/transport/railway/milestone.svg" type="node" preset_name_label="true">
+        <item name="Railway milestone" icon="presets/transport/railway/milestone.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=milestone" />
             <key key="railway" value="milestone" />
@@ -2704,5 +2704,5 @@
             </optional>
         </item> <!-- Gondola -->
-        <item name="Mixed Lift" icon="styles/standard/transport/aerialway/mixed_lift.png" type="way" preset_name_label="true">
+        <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
             <space />
@@ -2729,5 +2729,5 @@
             </optional>
         </item> <!-- Drag Lift -->
-        <item name="Magic Carpet" icon="styles/standard/transport/aerialway/magic_carpet.png" type="way" preset_name_label="true">
+        <item name="Magic Carpet" icon="presets/transport/aerialway/magic_carpet.png" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=magic_carpet" />
             <space />
@@ -2757,5 +2757,5 @@
             <text key="name" text="Name" />
         </item> <!-- Station -->
-        <item name="Pylon" icon="styles/standard/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
+        <item name="Pylon" icon="presets/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=pylon" />
             <space />
@@ -2794,5 +2794,5 @@
             <reference ref="supervised_lit_oh" />
         </item> <!-- Parking -->
-        <item name="Parking Space" icon="styles/standard/vehicle/parking/parking_space.svg" type="node,closedway" preset_name_label="true">
+        <item name="Parking Space" icon="presets/vehicle/parking/parking_space.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking_space"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking_space"
@@ -2880,5 +2880,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Fuel -->
-        <item name="Charging Station" icon="styles/standard/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
+        <item name="Charging Station" icon="presets/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=charging_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=charging_station"
@@ -2974,5 +2974,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Repair -->
-        <item name="Parts" icon="styles/standard/vehicle/car_parts.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Parts" icon="presets/vehicle/car_parts.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=car_parts"
@@ -3025,5 +3025,5 @@
     </group> <!-- Car -->
     <group name="Motorcycle" icon="presets/motorbike.png">
-        <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Parking" icon="presets/vehicle/parking/motorbike.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=motorcycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=motorcycle_parking"
@@ -3066,5 +3066,5 @@
     </group> <!-- Motorcycle -->
     <group name="Bicycle" icon="presets/bike.png">
-        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Parking" icon="presets/vehicle/parking/bicycle.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_parking"
@@ -3128,5 +3128,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Rental -->
-        <item name="Public Bicycle Repair Station" icon="styles/standard/vehicle/bicycle_repair_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Public Bicycle Repair Station" icon="presets/vehicle/bicycle_repair_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_repair_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bicycle_repair_station"
@@ -3222,5 +3222,5 @@
         </item> <!-- Stop Area -->
         <separator/>
-        <item name="Stop Position" type="node" icon="styles/standard/transport/railway_small.png" preset_name_label="true">
+        <item name="Stop Position" type="node" icon="presets/transport/railway_small.png" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Stop_position" />
             <space />
@@ -3252,5 +3252,5 @@
             <check key="ferry" text="Ferry" />
         </item> <!-- Stop Position -->
-        <item name="Platform" type="node,way,closedway,multipolygon" icon="styles/standard/transport/platform.svg" preset_name_label="true">
+        <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Public_Transport#Platform" />
             <space />
@@ -3264,5 +3264,5 @@
             <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
         </item> <!-- Platform -->
-        <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="styles/standard/transport/station.svg" preset_name_label="true">
+        <item name="Station" name_context="railway" type="node,closedway,multipolygon" icon="presets/transport/station.svg" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:public_transport=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:public_transport=station"
@@ -3295,5 +3295,5 @@
             </optional>
         </item> <!-- Subway Entrance -->
-        <item name="Ticket Machine" icon="styles/standard/transport/ticket-machine.png" type="node" preset_name_label="true">
+        <item name="Ticket Machine" icon="presets/transport/ticket-machine.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -3336,5 +3336,5 @@
             </roles>
         </item> <!-- Public transport route (Legacy) -->
-        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Station" name_context="railway" icon="presets/transport/railway_station.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station"
@@ -3361,5 +3361,5 @@
             </optional>
         </item> <!-- Railway Halt -->
-        <item name="Tram Stop" icon="styles/standard/transport/tram.png" type="node" preset_name_label="true">
+        <item name="Tram Stop" icon="presets/transport/tram.png" type="node" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop"
@@ -3478,5 +3478,5 @@
             </optional>
         </item> <!-- Taxiway -->
-        <item name="Helipad" icon="styles/standard/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
+        <item name="Helipad" icon="presets/transport/airport/helipad.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=helipad"
@@ -3498,5 +3498,5 @@
             <key key="aeroway" value="apron" />
         </item> <!-- Apron -->
-        <item name="Plane Parking Position" icon="styles/standard/transport/airport/parking_position.png" type="node,way" preset_name_label="true">
+        <item name="Plane Parking Position" icon="presets/transport/airport/parking_position.png" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=parking_position"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:aeroway=parking_position" />
@@ -3513,5 +3513,5 @@
             <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
         </item> <!-- Hangar -->
-        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
+        <item name="Beacon" icon="presets/misc/landmark/beacon.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
@@ -3520,5 +3520,5 @@
             <key key="man_made" value="beacon" />
         </item> <!-- Beacon -->
-        <item name="Windsock" icon="styles/standard/transport/airport/windsock.png" type="node" preset_name_label="true">
+        <item name="Windsock" icon="presets/transport/airport/windsock.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:aeroway=windsock"
@@ -3527,5 +3527,5 @@
         </item> <!-- Windsock -->
         <separator/>
-        <item name="Terminal" icon="styles/standard/transport/airport/terminal.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Terminal" icon="presets/transport/airport/terminal.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=terminal"
@@ -3553,5 +3553,5 @@
   <group name="Facilities" icon="presets/bed.png">
     <group name="Accommodation" icon="presets/bed.png">
-        <item name="Hotel" icon="styles/standard/accommodation/hotel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hotel" icon="presets/accommodation/hotel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hotel"
@@ -3576,5 +3576,5 @@
             <preset_link preset_name="Residential Building" />
         </item> <!-- Hotel -->
-        <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Motel" icon="presets/accommodation/motel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=motel"
@@ -3598,5 +3598,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Motel -->
-        <item name="Guest House/Bed &amp; Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Guest House/Bed &amp; Breakfast" icon="presets/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=guest_house"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=guest_house"
@@ -3619,5 +3619,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Guest House/Bed & Breakfast -->
-        <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Chalet" icon="presets/accommodation/chalet.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=chalet"
@@ -3641,5 +3641,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Chalet -->
-        <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hostel" icon="presets/accommodation/hostel.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=hostel"
@@ -3663,5 +3663,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Hostel -->
-        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Alpine Hut" icon="presets/accommodation/alpine_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=alpine_hut"
@@ -3683,5 +3683,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Alpine Hut -->
-        <item name="Wilderness Hut" icon="styles/standard/accommodation/wilderness_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Wilderness Hut" icon="presets/accommodation/wilderness_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=wilderness_hut"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=wilderness_hut"
@@ -3705,5 +3705,5 @@
         </item> <!-- Wilderness Hut -->
         <separator/>
-        <item name="Caravan Site/RV Park" icon="styles/standard/accommodation/camping/caravan.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Caravan Site/RV Park" icon="presets/accommodation/camping/caravan.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=caravan_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=caravan_site"
@@ -3728,5 +3728,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Caravan Site/RV Park -->
-        <item name="Camping Site" icon="styles/standard/accommodation/camping.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Camping Site" icon="presets/accommodation/camping.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=camp_site"
@@ -3750,6 +3750,6 @@
         </item> <!-- Camping Site -->
     </group> <!-- Accommodation -->
-    <group name="Food+Drinks" icon="styles/standard/food/restaurant.svg">
-        <item name="Restaurant" icon="styles/standard/food/restaurant.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Food+Drinks" icon="presets/food/restaurant.svg">
+        <item name="Restaurant" icon="presets/food/restaurant.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=restaurant"
@@ -3837,5 +3837,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Cafe -->
-        <item name="Ice cream" icon="styles/standard/food/icecream.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ice cream" icon="presets/food/icecream.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:ice_cream" />
             <space />
@@ -3887,5 +3887,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beer Garden -->
-        <item name="Bar" icon="styles/standard/food/bar.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bar" icon="presets/food/bar.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bar"
@@ -3921,5 +3921,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Attraction -->
-        <item name="Viewpoint" icon="styles/standard/sightseeing/viewpoint.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Viewpoint" icon="presets/sightseeing/viewpoint.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=viewpoint"
@@ -4015,5 +4015,5 @@
             </optional>
         </item> <!-- Guidepost -->
-        <item name="Information Terminal" icon="styles/standard/misc/information.png" type="node" preset_name_label="true">
+        <item name="Information Terminal" icon="presets/misc/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -4033,5 +4033,5 @@
             <reference ref="internet" />
         </item> <!-- Information Terminal -->
-        <item name="Audio Guide" icon="styles/standard/misc/information.png" type="node" preset_name_label="true">
+        <item name="Audio Guide" icon="presets/misc/information.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:information"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:information"
@@ -4053,5 +4053,5 @@
             <text key="phone" text="Phone number" />
         </item> <!-- Audio Guide -->
-        <item name="Other Information Point" icon="styles/standard/misc/information.png" type="node,closedway" preset_name_label="true">
+        <item name="Other Information Point" icon="presets/misc/information.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=information"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=information"
@@ -4135,5 +4135,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Amusement/Theme Park -->
-        <item name="Water Park" icon="styles/standard/leisure/water_park.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Water Park" icon="presets/leisure/water_park.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=water_park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=water_park"
@@ -4149,5 +4149,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Water Park -->
-        <item name="Swimming Pool" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
+        <item name="Swimming Pool" icon="presets/sport/pool.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool"
                   ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:leisure=swimming_pool"
@@ -4164,5 +4164,5 @@
             <combo key="access" text="Access" values="yes,customers,private" />
         </item> <!-- Swimming Pool -->
-        <item name="Fitness Station" icon="styles/standard/leisure/fitness_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fitness Station" icon="presets/leisure/fitness_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fitness_station" />
             <space />
@@ -4194,5 +4194,5 @@
         </item> <!-- Horse Riding -->
         <separator/>
-        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Playground" icon="presets/leisure/playground.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=playground"
@@ -4209,5 +4209,5 @@
             <reference ref="name_operator_oh_wheelchair" />
         </item> <!-- Playground -->
-        <item name="Picnic Site" icon="styles/standard/leisure/picnic.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Picnic Site" icon="presets/leisure/picnic.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=picnic_site"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=picnic_site"
@@ -4222,5 +4222,5 @@
             <check key="fireplace" text="Fireplace" />
         </item> <!-- Picnic Site -->
-        <item name="Picnic Table" icon="styles/standard/leisure/picnic.png" type="node" preset_name_label="true">
+        <item name="Picnic Table" icon="presets/leisure/picnic.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=picnic_table"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=picnic_table" />
@@ -4242,5 +4242,5 @@
             <check key="covered" text="Covered" />
         </item> <!-- Public Grill -->
-        <item name="Firepit" icon="styles/standard/leisure/firepit.svg" type="node,closedway" preset_name_label="true">
+        <item name="Firepit" icon="presets/leisure/firepit.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=firepit"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=firepit"
@@ -4253,5 +4253,5 @@
             <text key="name" text="Name" />
         </item> <!-- Firepit -->
-        <item name="Fishing" icon="styles/standard/sport/fishing.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Fishing" icon="presets/sport/fishing.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
@@ -4262,5 +4262,5 @@
             <text key="name" text="Name" />
         </item> <!-- Fishing -->
-        <item name="Bird Hide" icon="styles/standard/leisure/bird_hide.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bird Hide" icon="presets/leisure/bird_hide.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=bird_hide" />
             <space />
@@ -4269,5 +4269,5 @@
         </item> <!-- Bird Hide -->
         <separator/>
-        <item name="Night Club" icon="styles/standard/leisure/discoball.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Night Club" icon="presets/leisure/discoball.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=nightclub"
@@ -4287,5 +4287,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Night Club -->
-        <item name="Casino" icon="styles/standard/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Casino" icon="presets/leisure/casino.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=casino"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=casino"
@@ -4300,5 +4300,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Casino -->
-        <item name="Strip Club" icon="styles/standard/leisure/nightclub.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Strip Club" icon="presets/leisure/nightclub.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=stripclub"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=stripclub"
@@ -4314,5 +4314,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Strip Club -->
-        <item name="Brothel" icon="styles/standard/leisure/stripclub.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Brothel" icon="presets/leisure/stripclub.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=brothel"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=brothel"
@@ -4332,5 +4332,5 @@
     </group> <!-- Leisure -->
     <group name="Culture" icon="presets/theater.png">
-        <item name="Museum" icon="styles/standard/sightseeing/museum.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Museum" icon="presets/sightseeing/museum.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:tourism=museum"
@@ -4362,5 +4362,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Theatre -->
-        <item name="Library" icon="styles/standard/shop/library.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Library" icon="presets/shop/library.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=library"
@@ -4421,6 +4421,6 @@
         </item> <!-- Studio -->
     </group> <!-- Culture -->
-    <group name="Place of Worship" icon="styles/standard/religion.png">
-        <item name="Church" icon="styles/standard/religion/church.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Place of Worship" icon="presets/religion.png">
+        <item name="Church" icon="presets/religion/church.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4448,5 +4448,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Church -->
-        <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Mosque" icon="presets/religion/muslim.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4473,5 +4473,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Mosque -->
-        <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Synagogue" icon="presets/religion/jewish.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4498,5 +4498,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Synagogue -->
-        <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Buddhist Temple" icon="presets/religion/buddhism.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4522,5 +4522,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Buddhist Temple -->
-        <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hindu Temple" icon="presets/religion/hinduism.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4546,5 +4546,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Hindu Temple -->
-        <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Shinto Shrine" icon="presets/religion/shinto.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4569,5 +4569,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Shinto Shrine -->
-        <item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Other Place of Worship" icon="presets/religion.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:amenity=place_of_worship"
@@ -4636,5 +4636,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Embassy -->
-        <item name="Courthouse" icon="styles/standard/service/administration/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Courthouse" icon="presets/service/administration/courthouse.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=courthouse"
@@ -4649,5 +4649,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Courthouse -->
-        <item name="Prison" icon="styles/standard/service/administration/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Prison" icon="presets/service/administration/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=prison"
@@ -4661,5 +4661,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Prison -->
-        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Police" icon="presets/service/police.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=police"
@@ -4676,5 +4676,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Police -->
-        <item name="Ranger Station" icon="styles/standard/service/ranger_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ranger Station" icon="presets/service/ranger_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ranger_station" />
             <space />
@@ -4698,5 +4698,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Fire Station -->
-        <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Post Office" icon="presets/service/post_office.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_office"
@@ -4751,5 +4751,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- School -->
-        <item name="University" icon="styles/standard/education/university.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="University" icon="presets/education/university.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=university"
@@ -4767,5 +4767,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- University -->
-        <item name="College" icon="styles/standard/education/college.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="College" icon="presets/education/college.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=college"
@@ -4779,5 +4779,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- College -->
-         <item name="Driving School" icon="styles/standard/education/driving_school.png" type="node,closedway,multipolygon" preset_name_label="true">
+         <item name="Driving School" icon="presets/education/driving_school.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=driving_school"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=driving_school"
@@ -4791,6 +4791,6 @@
         </item> <!-- Driving School -->
     </group> <!-- Education -->
-    <group name="Health" icon="styles/standard/health/pharmacy.svg">
-        <item name="Hospital" icon="styles/standard/health/hospital.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Health" icon="presets/health/pharmacy.svg">
+        <item name="Hospital" icon="presets/health/hospital.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=hospital"
@@ -4807,5 +4807,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hospital -->
-        <item name="Clinic" icon="styles/standard/health/clinic.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Clinic" icon="presets/health/clinic.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clinic"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clinic"
@@ -4818,5 +4818,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Clinic -->
-        <item name="Doctor's Office" icon="styles/standard/health/doctors.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Doctor's Office" icon="presets/health/doctors.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=doctors"
@@ -4832,5 +4832,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Doctor's Office -->
-        <item name="Dentist" icon="styles/standard/health/dentist.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dentist" icon="presets/health/dentist.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=dentist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=dentist"
@@ -4844,5 +4844,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Dentist -->
-        <item name="Pharmacy" icon="styles/standard/health/pharmacy.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pharmacy" icon="presets/health/pharmacy.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=pharmacy"
@@ -4861,5 +4861,5 @@
         </item> <!-- Pharmacy -->
         <separator/>
-        <item name="Baby Hatch/Safe Haven" icon="styles/standard/health/baby_hatch.svg" type="node,closedway" preset_name_label="true">
+        <item name="Baby Hatch/Safe Haven" icon="presets/health/baby_hatch.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=baby_hatch"
@@ -4879,5 +4879,5 @@
         </item> <!-- Baby Hatch/Safe Haven -->
         <separator/>
-        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.svg" type="node,closedway" preset_name_label="true">
+        <item name="Emergency Access Point" icon="presets/service/emergency_access_point.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point"
@@ -4895,5 +4895,5 @@
         </item> <!-- Emergency Access Point -->
         <separator/>
-        <item name="Veterinary" icon="styles/standard/health/veterinary.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Veterinary" icon="presets/health/veterinary.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=veterinary"
@@ -4912,6 +4912,6 @@
         </item> <!-- Veterinary -->
     </group> <!-- Health -->
-    <group name="Emergency" icon="styles/standard/emergency/ambulance_station.svg">
-        <item name="Ambulance Station" icon="styles/standard/emergency/ambulance_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Emergency" icon="presets/emergency/ambulance_station.svg">
+        <item name="Ambulance Station" icon="presets/emergency/ambulance_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=ambulance_station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=ambulance_station"
@@ -4943,5 +4943,5 @@
         </item> <!-- Automated Defibrillator -->
         <separator />
-        <item name="Fire Extinguisher" icon="styles/standard/emergency/fire_extinguisher.svg" type="node" preset_name_label="true">
+        <item name="Fire Extinguisher" icon="presets/emergency/fire_extinguisher.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_extinguisher"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:emergency=fire_extinguisher"
@@ -4955,5 +4955,5 @@
             <check key="indoor" text="Indoor" />
         </item> <!-- Fire Extinguisher -->
-        <item name="Fire Hose" icon="styles/standard/emergency/fire_hose.svg" type="node" preset_name_label="true">
+        <item name="Fire Hose" icon="presets/emergency/fire_hose.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hose"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hose" />
@@ -4984,5 +4984,5 @@
             <text key="fire_hydrant:count" text="Count" />
         </item> <!-- Fire Hydrant -->
-        <item name="Water Tank" icon="styles/standard/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
+        <item name="Water Tank" icon="presets/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=water_tank"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:emergency=fire_hose"
@@ -4996,5 +4996,5 @@
         </item> <!-- Water Tank -->
         <separator />
-        <item name="Assembly Point" icon="styles/standard/emergency/assembly_point.svg" type="node" preset_name_label="true">
+        <item name="Assembly Point" icon="presets/emergency/assembly_point.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=assembly_point"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=assembly_point" />
@@ -5003,5 +5003,5 @@
             <reference ref="name_ref_operator" />
         </item> <!-- Assembly Point -->
-        <item name="Emergency Phone" icon="styles/standard/vehicle/emergency_phone.png" type="node" preset_name_label="true">
+        <item name="Emergency Phone" icon="presets/vehicle/emergency_phone.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
@@ -5013,5 +5013,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Emergency Phone -->
-        <item name="Siren" icon="styles/standard/emergency/siren.svg" type="node" preset_name_label="true">
+        <item name="Siren" icon="presets/emergency/siren.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=siren"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=siren"
@@ -5026,6 +5026,6 @@
         </item> <!-- Emergency Phone -->
     </group> <!-- Emergency -->
-    <group name="Social Facility" icon="styles/standard/social_facility/outreach.svg">
-        <item name="Nursing Home" icon="styles/standard/social_facility/nursing_home.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Social Facility" icon="presets/social_facility/outreach.svg">
+        <item name="Nursing Home" icon="presets/social_facility/nursing_home.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nursing_home"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=nursing_home"
@@ -5039,5 +5039,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Nursing Home -->
-        <item name="Group Home" icon="styles/standard/social_facility/group_home.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Group Home" icon="presets/social_facility/group_home.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -5055,5 +5055,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Group Home -->
-        <item name="Assisted Living" icon="styles/standard/social_facility/assisted_living.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Assisted Living" icon="presets/social_facility/assisted_living.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -5071,5 +5071,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Assisted Living -->
-        <item name="Outreach" icon="styles/standard/social_facility/outreach.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Outreach" icon="presets/social_facility/outreach.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -5085,5 +5085,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Outreach -->
-        <item name="Shelter" name_context="social_facility" icon="styles/standard/social_facility/shelter.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Shelter" name_context="social_facility" icon="presets/social_facility/shelter.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -5100,5 +5100,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Shelter -->
-        <item name="Food Bank" icon="styles/standard/social_facility/food_bank.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Food Bank" icon="presets/social_facility/food_bank.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:social_facility"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:social_facility"
@@ -5144,5 +5144,5 @@
             </optional>
         </item> <!-- Toilets/Restrooms -->
-        <item name="Shower" icon="styles/standard/service/shower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Shower" icon="presets/service/shower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shower"
@@ -5158,5 +5158,5 @@
             </optional>
         </item> <!-- Shower -->
-        <item name="Post Box" icon="styles/standard/service/post_box.png" type="node" preset_name_label="true">
+        <item name="Post Box" icon="presets/service/post_box.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
@@ -5202,5 +5202,5 @@
             <reference ref="internet" />
         </item> <!-- Internet Access -->
-        <item name="Clock" icon="styles/standard/service/clock.svg" type="node" preset_name_label="true">
+        <item name="Clock" icon="presets/service/clock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=clock"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=clock"
@@ -5219,5 +5219,5 @@
             </optional>
         </item> <!-- Clock -->
-        <item name="Recycling Container" icon="styles/standard/service/recycling/recycling_container.svg" type="node,closedway" preset_name_label="true">
+        <item name="Recycling Container" icon="presets/service/recycling/recycling_container.svg" type="node,closedway" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling"
@@ -5256,5 +5256,5 @@
             </checkgroup>
         </item> <!-- Recycling Container-->
-        <item name="Recycling Centre" icon="styles/standard/service/recycling/recycling_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Recycling Centre" icon="presets/service/recycling/recycling_centre.svg" type="node,closedway,multipolygon" preset_name_label="true">
            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling"
@@ -5293,5 +5293,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Recycling Centre-->
-        <item name="Waste Basket/Trash Can" icon="styles/standard/service/recycling/trash-bin.png" type="node" preset_name_label="true">
+        <item name="Waste Basket/Trash Can" icon="presets/service/recycling/trash-bin.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_basket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=waste_basket"
@@ -5304,5 +5304,5 @@
             <key key="amenity" value="waste_basket" />
         </item> <!-- Waste Basket/Trash Can -->
-        <item name="Waste Disposal/Dumpster" icon="styles/standard/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
+        <item name="Waste Disposal/Dumpster" icon="presets/service/recycling/waste_disposal.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=waste_disposal"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=waste_disposal"
@@ -5314,5 +5314,5 @@
             <key key="amenity" value="waste_disposal" />
         </item> <!-- Waste Disposal/Dumpster -->
-        <item name="Sanitary Dump Station" icon="styles/standard/service/recycling/sanitary_dump_station.svg" type="node,closedway" preset_name_label="true">
+        <item name="Sanitary Dump Station" icon="presets/service/recycling/sanitary_dump_station.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Toilet_Holding_Tank_Disposal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Toilet_Holding_Tank_Disposal"
@@ -5350,5 +5350,5 @@
             <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
         </item> <!-- Bench -->
-        <item name="Shelter" icon="styles/standard/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
+        <item name="Shelter" icon="presets/accommodation/shelter.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shelter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=shelter"
@@ -5364,10 +5364,10 @@
             <check key="fireplace" text="Fireplace" />
             <combo key="shelter_type" text="Type of shelter" values_context="shelter" values_searchable="true">
-                <list_entry value="basic_hut" icon="styles/standard/accommodation/basic_hut_blue.png" />
-                <list_entry value="lean_to" icon="styles/standard/accommodation/shelter_lean_to.svg" />
-                <list_entry value="picnic_shelter" icon="styles/standard/accommodation/shelter_picnic_brown.png" />
-                <list_entry value="public_transport" icon="styles/standard/accommodation/shelter_public_transport_brown.png" />
-                <list_entry value="weather_shelter" icon="styles/standard/accommodation/shelter.png" />
-                <list_entry value="wildlife_hide" icon="styles/standard/accommodation/shelter.png" />
+                <list_entry value="basic_hut" icon="presets/accommodation/basic_hut_blue.png" />
+                <list_entry value="lean_to" icon="presets/accommodation/shelter_lean_to.svg" />
+                <list_entry value="picnic_shelter" icon="presets/accommodation/shelter_picnic_brown.png" />
+                <list_entry value="public_transport" icon="presets/accommodation/shelter_public_transport_brown.png" />
+                <list_entry value="weather_shelter" icon="presets/accommodation/shelter.png" />
+                <list_entry value="wildlife_hide" icon="presets/accommodation/shelter.png" />
             </combo>
         </item> <!-- Shelter -->
@@ -5386,5 +5386,5 @@
         </item> <!-- Hunting Stand -->
         <separator/>
-        <item name="Drinking Water" icon="styles/standard/food/drinking_water.png" type="node" preset_name_label="true">
+        <item name="Drinking Water" icon="presets/food/drinking_water.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water"
@@ -5404,5 +5404,5 @@
             </optional>
         </item> <!-- Drinking Water -->
-        <item name="Water Point" icon="styles/standard/accommodation/camping/water.png" type="node" preset_name_label="true">
+        <item name="Water Point" icon="presets/accommodation/camping/water.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=water_point" />
             <space />
@@ -5414,5 +5414,5 @@
             </optional>
         </item> <!-- Water Point -->
-        <item name="Compressed Air" icon="styles/standard/vehicle/compressed_air.svg" type="node" preset_name_label="true">
+        <item name="Compressed Air" icon="presets/vehicle/compressed_air.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=compressed_air"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=compressed_air"
@@ -5429,5 +5429,5 @@
         </item> <!-- Compressed Air -->
         <separator/>
-        <item name="Advertising Column" icon="styles/standard/leisure/advertising_column.svg" type="node" preset_name_label="true">
+        <item name="Advertising Column" icon="presets/leisure/advertising_column.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:advertising=column"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:advertising=column"
@@ -5439,5 +5439,5 @@
             </optional>
         </item> <!-- Advertising Column -->
-        <item name="Billboard" icon="styles/standard/leisure/billboard.svg" type="node" preset_name_label="true">
+        <item name="Billboard" icon="presets/leisure/billboard.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:advertising=billboard" />
             <space />
@@ -5449,7 +5449,7 @@
     </group> <!-- Facilities -->
   </group>  <!-- Facilities -->
-  <group name="Sports" icon="styles/standard/sport/soccer.png">
+  <group name="Sports" icon="presets/sport/soccer.png">
     <group name="Sport Facilities" icon="presets/stadium.png">
-        <item name="Stadium" icon="styles/standard/sport/stadium.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Stadium" icon="presets/sport/stadium.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=stadium"
@@ -5466,5 +5466,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Stadium -->
-        <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Sports Centre" icon="presets/sport/centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=sports_centre"
@@ -5489,5 +5489,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Fitness Centre -->
-        <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pitch" icon="presets/sport/pitch.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=pitch"
@@ -5507,5 +5507,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pitch -->
-        <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Racetrack" icon="presets/sport/track.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=track"
@@ -5521,6 +5521,6 @@
             <combo key="surface" text="Surface" values="artificial_turf,asphalt,clay,concrete,decoturf,grass,sand,tartan,ground" />
         </item> <!-- Racetrack -->
-        <group name="Golf" icon="styles/standard/sport/golf/golf.svg">
-                <item name="Golf Course" icon="styles/standard/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <group name="Golf" icon="presets/sport/golf/golf.svg">
+                <item name="Golf Course" icon="presets/sport/golf/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
                     <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                           de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5535,5 +5535,5 @@
                 </item> <!-- Golf Course -->
             <separator/>
-            <item name="Tee" name_context="golf" icon="styles/standard/sport/golf/tee.svg" type="node,closedway" preset_name_label="true">
+            <item name="Tee" name_context="golf" icon="presets/sport/golf/tee.svg" type="node,closedway" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5546,5 +5546,5 @@
                 <key key="golf" value="tee" />
             </item> <!-- Tee -->
-            <item name="Hole" name_context="golf" icon="styles/standard/sport/golf/hole.svg" type="way" preset_name_label="true">
+            <item name="Hole" name_context="golf" icon="presets/sport/golf/hole.svg" type="way" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5563,5 +5563,5 @@
                 </optional>
             </item> <!-- Hole -->
-            <item name="Pin" name_context="golf" icon="styles/standard/sport/golf/pin.svg" type="node" preset_name_label="true">
+            <item name="Pin" name_context="golf" icon="presets/sport/golf/pin.svg" type="node" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5576,5 +5576,5 @@
             </item> <!-- Pin -->
             <separator/>
-            <item name="Bunker" name_context="golf" icon="styles/standard/sport/golf/bunker.svg" type="closedway" preset_name_label="true">
+            <item name="Bunker" name_context="golf" icon="presets/sport/golf/bunker.svg" type="closedway" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:golf=bunker" />
                 <space />
@@ -5582,5 +5582,5 @@
                 <combo key="natural" text="Natural" text_context="golf" values="sand" default="sand" />
             </item> <!-- Bunker -->
-             <item name="Frontal Water hazard" name_context="golf" icon="styles/standard/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
+             <item name="Frontal Water hazard" name_context="golf" icon="presets/sport/golf/water_hazard.svg" type="closedway" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5594,5 +5594,5 @@
                 <key key="natural" value="water" match="keyvalue" />
             </item> <!-- Frontal Water hazard -->
-             <item name="Lateral water hazard" name_context="golf" icon="styles/standard/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
+             <item name="Lateral water hazard" name_context="golf" icon="presets/sport/golf/lateral_water_hazard.svg" type="closedway" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5607,5 +5607,5 @@
             </item> <!-- Lateral water hazard -->
             <separator/>
-            <item name="Green" name_context="golf" icon="styles/standard/sport/golf/green.svg" type="closedway,multipolygon" preset_name_label="true">
+            <item name="Green" name_context="golf" icon="presets/sport/golf/green.svg" type="closedway,multipolygon" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5618,5 +5618,5 @@
                 <key key="golf" value="green" />
             </item> <!-- Green -->
-            <item name="Fairway" name_context="golf" icon="styles/standard/sport/golf/fairway.svg" type="closedway,multipolygon" preset_name_label="true">
+            <item name="Fairway" name_context="golf" icon="presets/sport/golf/fairway.svg" type="closedway,multipolygon" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:golf=fairway" />
                 <space />
@@ -5624,5 +5624,5 @@
                 <key key="surface" value="grass" match="keyvalue" />
             </item> <!-- Fairway -->
-            <item name="Rough" name_context="golf" icon="styles/standard/sport/golf/rough.svg" type="closedway,multipolygon" preset_name_label="true">
+            <item name="Rough" name_context="golf" icon="presets/sport/golf/rough.svg" type="closedway,multipolygon" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5636,5 +5636,5 @@
             </item> <!-- Rough -->
             <separator/>
-            <item name="Driving range" name_context="golf" icon="styles/standard/sport/golf/driving_range.svg" type="node,closedway" preset_name_label="true">
+            <item name="Driving range" name_context="golf" icon="presets/sport/golf/driving_range.svg" type="node,closedway" preset_name_label="true">
                 <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=golf_course"
                       de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=golf_course"
@@ -5648,5 +5648,5 @@
             </item> <!-- Driving range -->
         </group> <!-- Golf -->
-        <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Miniature Golf" icon="presets/sport/miniature_golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=miniature_golf"
@@ -5661,5 +5661,5 @@
     </group> <!-- Sport Facilities -->
     <group name="Sport" icon="presets/rowing.png">
-        <item name="Multi" icon="styles/standard/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Multi" icon="presets/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=multi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=multi" />
@@ -5669,5 +5669,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,fitness_centre,stadium,track" values_context="running" />
         </item> <!-- Multi -->
-        <item name="Nine-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Nine-pin Bowling" icon="presets/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=9pin"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=9pin" />
@@ -5677,5 +5677,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Nine-pin Bowling -->
-        <item name="Ten-pin Bowling" icon="styles/standard/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ten-pin Bowling" icon="presets/sport/10pin.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=10pin"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=10pin" />
@@ -5685,5 +5685,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Ten-pin Bowling -->
-        <item name="Archery" icon="styles/standard/sport/archery.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Archery" icon="presets/sport/archery.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=archery"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=archery" />
@@ -5700,5 +5700,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" default="track" />
         </item> <!-- Track and Field Athletics -->
-        <item name="Running" icon="styles/standard/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Running" icon="presets/sport/running.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=running" />
             <space />
@@ -5707,5 +5707,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="running" />
         </item> <!-- Running -->
-        <item name="Climbing" icon="styles/standard/sport/climbing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Climbing" icon="presets/sport/climbing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=climbing"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=climbing"
@@ -5717,5 +5717,5 @@
             <combo key="leisure" text="Type" values="sports_centre" />
         </item> <!-- Climbing -->
-        <item name="Canoeing/Kayaking" icon="styles/standard/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Canoeing/Kayaking" icon="presets/sport/canoe.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
             <space />
@@ -5723,5 +5723,5 @@
             <text key="name" text="Name" />
         </item> <!-- Canoeing/Kayaking -->
-        <item name="Cycling" icon="styles/standard/sport/cycling.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Cycling" icon="presets/sport/cycling.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
             <space />
@@ -5730,5 +5730,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="racing" />
         </item> <!-- Cycling -->
-        <item name="Dog Racing" icon="styles/standard/leisure/dog.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Dog Racing" icon="presets/leisure/dog.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=dog_racing" />
             <space />
@@ -5744,5 +5744,5 @@
             <reference ref="riding_surface" />
         </item> <!-- Equestrian -->
-        <item name="Horse Racing" icon="styles/standard/sport/riding.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Horse Racing" icon="presets/sport/riding.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
             <space />
@@ -5765,5 +5765,5 @@
             <combo key="leisure" text="Type" values="ice_rink,pitch,sports_centre,stadium" default="ice_rink" />
         </item> <!-- Ice Skating -->
-        <item name="Roller Skating" icon="styles/standard/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Roller Skating" icon="presets/sport/roller_skating.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=roller_skating"/>
             <space />
@@ -5772,5 +5772,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Roller Skating -->
-        <item name="Skateboard" icon="styles/standard/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Skateboard" icon="presets/sport/skateboard.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=skateboard"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=skateboard" />
@@ -5780,5 +5780,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
         </item> <!-- Skateboard -->
-        <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Swimming" icon="presets/sport/pool.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=swimming"
@@ -5789,5 +5789,5 @@
             <combo key="leisure" text="Type" values="sports_centre,stadium,swimming_pool,water_park" default="swimming_pool" values_searchable="true" />
         </item> <!-- Swimming -->
-        <item name="Scuba Diving" icon="styles/standard/sport/scuba_diving.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Scuba Diving" icon="presets/sport/scuba_diving.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=scuba_diving"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=scuba_diving"
@@ -5797,5 +5797,5 @@
             <text key="name" text="Name" />
         </item> <!-- Scuba Diving -->
-        <item name="Skiing" icon="styles/standard/sport/skiing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Skiing" icon="presets/sport/skiing.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Piste_Maps"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
@@ -5822,6 +5822,6 @@
         </item> <!-- Shooting -->
     </group> <!-- Sport -->
-    <group name="Sport (Ball)" icon="styles/standard/sport/soccer.png">
-        <item name="Soccer" icon="styles/standard/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Sport (Ball)" icon="presets/sport/soccer.png">
+        <item name="Soccer" icon="presets/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
@@ -5851,5 +5851,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Canadian Football -->
-        <item name="Gaelic Games" icon="styles/standard/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Gaelic Games" icon="presets/sport/soccer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
             <space />
@@ -5877,5 +5877,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Rugby Union -->
-        <item name="Baseball" icon="styles/standard/sport/baseball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Baseball" icon="presets/sport/baseball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
             <space />
@@ -5889,5 +5889,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Basketball -->
-        <item name="Handball" icon="styles/standard/sport/handball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Handball" icon="presets/sport/handball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=handball" />
             <space />
@@ -5896,5 +5896,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Handball -->
-        <item name="Volleyball" icon="styles/standard/sport/volleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Volleyball" icon="presets/sport/volleyball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=volleyball" />
             <space />
@@ -5910,5 +5910,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Beach Volleyball -->
-        <item name="Billiards" icon="styles/standard/sport/billiards.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Billiards" icon="presets/sport/billiards.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=billiards" />
             <space />
@@ -5917,5 +5917,5 @@
             <combo key="leisure" text="Type" values="stadium,pitch,sports_centre" />
         </item> <!-- Billiards -->
-        <item name="Golf" icon="styles/standard/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Golf" icon="presets/sport/golf.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=golf"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=golf"
@@ -5939,5 +5939,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Lawn Bowling -->
-        <item name="Cricket" icon="styles/standard/sport/cricket.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Cricket" icon="presets/sport/cricket.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
             <space />
@@ -5945,5 +5945,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Cricket -->
-        <item name="Croquet" icon="styles/standard/sport/croquet.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Croquet" icon="presets/sport/croquet.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=croquet" />
             <space />
@@ -5972,5 +5972,5 @@
             <reference ref="name_leisure_pitch" />
         </item> <!-- Pelota -->
-        <item name="Racquetball" icon="styles/standard/sport/racquetball.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Racquetball" icon="presets/sport/racquetball.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
@@ -5987,5 +5987,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
         </item> <!-- Table Tennis/Ping-Pong -->
-        <item name="Tennis" icon="styles/standard/sport/tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tennis" icon="presets/sport/tennis.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
             <space />
@@ -5995,5 +5995,5 @@
     </group> <!-- Sport (Ball) -->
     <group name="Motorsport" icon="presets/motorbike.png">
-        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Motorsport" icon="presets/sport/motor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motor" />
@@ -6011,5 +6011,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="racing" />
         </item> <!-- Kart Racing -->
-        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Motocross" icon="presets/sport/motocross.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motocross"
@@ -6028,5 +6028,5 @@
             <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
         </item> <!-- Model Aerodrome -->
-        <item name="RC Car" icon="styles/standard/transport/car.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="RC Car" icon="presets/transport/car.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
@@ -6050,5 +6050,5 @@
   <group name="Man Made" icon="presets/works.png">
     <group name="Man Made" icon="presets/works.png">
-        <item name="Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Building" icon="presets/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
@@ -6074,5 +6074,5 @@
             <preset_link preset_name="Addresses" />
         </item> <!-- Building -->
-        <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Residential Building" icon="presets/misc/landmark/building.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:building"
@@ -6097,5 +6097,5 @@
             <preset_link preset_name="Addresses" />
         </item> <!-- Residential Building -->
-        <item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Building part" icon="presets/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:building:part"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:building:part"
@@ -6113,5 +6113,5 @@
             <text key="min_height" text="Skipped height (meters)" />
         </item> <!-- Building part -->
-        <item name="Entrance" icon="styles/standard/misc/entrance-yes.png" type="node" preset_name_label="true">
+        <item name="Entrance" icon="presets/misc/entrance-yes.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:entrance"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:entrance"
@@ -6124,10 +6124,10 @@
             <space />
             <combo key="entrance" text="Entrance" values_context="entrance" default="yes" match="key">
-                <list_entry value="yes" icon="styles/standard/misc/entrance-yes.png" />
-                <list_entry value="main" icon="styles/standard/misc/entrance-main.png" />
-                <list_entry value="service" icon="styles/standard/misc/entrance-service.png" />
-                <list_entry value="exit" icon="styles/standard/misc/entrance-exit.png" />
-                <list_entry value="emergency" icon="styles/standard/misc/entrance-emergency.png" />
-                <list_entry value="staircase" icon="styles/standard/misc/entrance-yes.png" />
+                <list_entry value="yes" icon="presets/misc/entrance-yes.png" />
+                <list_entry value="main" icon="presets/misc/entrance-main.png" />
+                <list_entry value="service" icon="presets/misc/entrance-service.png" />
+                <list_entry value="exit" icon="presets/misc/entrance-exit.png" />
+                <list_entry value="emergency" icon="presets/misc/entrance-emergency.png" />
+                <list_entry value="staircase" icon="presets/misc/entrance-yes.png" />
             </combo>
             <combo key="access" text="Access" values="yes,delivery,private,no" />
@@ -6138,5 +6138,5 @@
             </optional>
         </item> <!-- Entrance -->
-        <item name="Tower" icon="styles/standard/misc/landmark/tower.png" type="node,closedway" preset_name_label="true">
+        <item name="Tower" icon="presets/misc/landmark/tower.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=tower"
@@ -6165,5 +6165,5 @@
         </item> <!-- Flagpole -->
         <separator/>
-        <item name="Works" icon="styles/standard/misc/landmark/works.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Works" icon="presets/misc/landmark/works.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=works"
@@ -6187,5 +6187,5 @@
             <text key="height" text="Height (meters)" />
         </item> <!-- Chimney -->
-        <item name="Windmill" icon="styles/standard/misc/landmark/windmill.png" type="node,closedway" preset_name_label="true">
+        <item name="Windmill" icon="presets/misc/landmark/windmill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=windmill"
@@ -6235,5 +6235,5 @@
             </optional>
         </item> <!-- Storage Tank -->
-        <item name="Bunker Silo" icon="styles/standard/bunker_silo.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bunker Silo" icon="presets/bunker_silo.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bunker_silo"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bunker_silo"
@@ -6291,5 +6291,5 @@
             <check key="disused" text="Disused" />
         </item> <!-- Adit -->
-        <item name="Embankment" icon="styles/standard/misc/embankment.svg" type="way" preset_name_label="true">
+        <item name="Embankment" icon="presets/misc/embankment.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=embankment"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=embankment"
@@ -6315,5 +6315,5 @@
             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
         </item> <!-- Pipeline -->
-        <item name="Pipeline Marker" icon="styles/standard/misc/pipeline_marker.svg" type="node" preset_name_label="true">
+        <item name="Pipeline Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=marker"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:pipeline=marker"
@@ -6325,5 +6325,5 @@
             <reference ref="support" />
         </item> <!-- Pipeline Marker -->
-        <item name="Pipeline Valve" icon="styles/standard/misc/valve.svg" type="node" preset_name_label="true">
+        <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:pipeline=valve"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:pipeline=valve" />
@@ -6334,5 +6334,5 @@
         </item> <!-- Pipeline Valve -->
         <separator/>
-        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="presets/misc/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=water_tower"
@@ -6375,5 +6375,5 @@
             <text key="name" text="Name" />
         </item> <!-- Wastewater Treatment Plant -->
-        <item name="Watermill" icon="styles/standard/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
+        <item name="Watermill" icon="presets/misc/landmark/watermill.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=watermill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=watermill"
@@ -6389,5 +6389,5 @@
             <text key="name" text="Name" />
         </item> <!-- Watermill -->
-        <item name="Fountain" icon="styles/standard/misc/fountain.png" type="node,closedway" preset_name_label="true">
+        <item name="Fountain" icon="presets/misc/fountain.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fountain"
@@ -6418,5 +6418,5 @@
         </item> <!-- Water Well -->
         <separator/>
-        <item name="Lighthouse" icon="styles/standard/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
+        <item name="Lighthouse" icon="presets/misc/landmark/lighthouse.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=lighthouse"
@@ -6429,5 +6429,5 @@
             <text key="name" text="Name" />
         </item> <!-- Lighthouse -->
-        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node,closedway" preset_name_label="true">
+        <item name="Beacon" icon="presets/misc/landmark/beacon.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
@@ -6437,5 +6437,5 @@
             <text key="name" text="Name" />
         </item> <!-- Beacon -->
-        <item name="Street Lamp" icon="styles/standard/misc/streetlamp.png" type="node" preset_name_label="true">
+        <item name="Street Lamp" icon="presets/misc/streetlamp.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=street_lamp"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=street_lamp"
@@ -6484,5 +6484,5 @@
             </checkgroup>
         </item> <!-- Monitoring Station -->
-        <item name="Survey Point" icon="styles/standard/misc/landmark/survey_point.png" type="node" preset_name_label="true">
+        <item name="Survey Point" icon="presets/misc/landmark/survey_point.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=survey_point"
@@ -6528,6 +6528,6 @@
         </item> <!-- Surveillance Camera -->
     </group> <!-- Man Made -->
-    <group name="Bridges" icon="styles/standard/transport/bridge/bridge.svg">
-        <item name="Bridge" icon="styles/standard/transport/bridge/bridge.svg" type="way,relation,multipolygon" preset_name_label="true">
+    <group name="Bridges" icon="presets/transport/bridge/bridge.svg">
+        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:bridge"
@@ -6547,5 +6547,5 @@
             <reference ref="optional_bridge" />
         </item> <!-- Bridge -->
-        <item name="Movable Bridge" icon="styles/standard/transport/bridge/bridge_movable.svg" type="way,relation,multipolygon" preset_name_label="true">
+        <item name="Movable Bridge" icon="presets/transport/bridge/bridge_movable.svg" type="way,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:movable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge:movable"
@@ -6556,10 +6556,10 @@
             <reference ref="optional_bridge" />
         </item> <!-- Movable Bridge -->
-        <item name="Bridge Support" icon="styles/standard/transport/bridge/bridge_support.svg" type="node,closedway" preset_name_label="true">
+        <item name="Bridge Support" icon="presets/transport/bridge/bridge_support.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" />
             <space />
             <combo key="bridge:support" text="Type" values="pier,abutment,lift_pier,pivot_pier" match="key" />
         </item> <!-- Bridge Support -->
-        <item name="Bridge outline" icon="styles/standard/transport/bridge/bridge_outline.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Bridge outline" icon="presets/transport/bridge/bridge_outline.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=bridge"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=bridge"
@@ -6575,5 +6575,5 @@
     </group> <!-- Bridges -->
     <group name="Military" name_context="preset group" icon="presets/military.png">
-        <item name="Airfield" icon="styles/standard/transport/airport/airfield.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Airfield" icon="presets/transport/airport/airfield.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=airfield"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=airfield"
@@ -6591,5 +6591,5 @@
             <key key="military" value="barracks" />
         </item> <!-- Barracks -->
-        <item name="Bunker" icon="styles/standard/misc/landmark/bunker.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bunker" icon="presets/misc/landmark/bunker.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=bunker"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:military=bunker"
@@ -6606,5 +6606,5 @@
             <check key="ruins" text="Ruins" />
         </item> <!-- Bunker -->
-        <item name="Range" icon="styles/standard/misc/landmark/range.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Range" icon="presets/misc/landmark/range.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:military=range"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:military=range"
@@ -6614,6 +6614,6 @@
         </item> <!-- Range -->
     </group> <!-- Military -->
-    <group name="Power" icon="styles/standard/power/power.svg">
-        <item name="Power Plant" icon="styles/standard/power/plant.svg" type="closedway,relation,multipolygon" preset_name_label="true">
+    <group name="Power" icon="presets/power/power.svg">
+        <item name="Power Plant" icon="presets/power/plant.svg" type="closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=plant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=plant"
@@ -6639,5 +6639,5 @@
             </optional>
         </item> <!-- Power Plant -->
-        <group name="Power Generator" icon="styles/standard/power/generator.svg">
+        <group name="Power Generator" icon="presets/power/generator.svg">
             <item name="Biofuel Power Generator" icon="presets/power_source-biofuel.svg" type="node,closedway,multipolygon" preset_name_label="true">
                 <key key="generator:source" value="biofuel" />
@@ -6798,5 +6798,5 @@
         </group> <!-- Power Generator -->
         <separator/>
-        <item name="Power Substation" icon="styles/standard/power/substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Power Substation" icon="presets/power/substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=substation"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6815,5 +6815,5 @@
             </optional>
         </item> <!-- Power Substation -->
-        <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node" preset_name_label="true">
+        <item name="Power Transformer" icon="presets/power/transformer.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
@@ -6831,5 +6831,5 @@
             </optional>
         </item> <!-- Power Transformer -->
-        <item name="Power Switchgear" icon="styles/standard/power/switchgear.svg" type="closedway" preset_name_label="true">
+        <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6847,5 +6847,5 @@
             </optional>
         </item> <!-- Power Switchgear -->
-        <item name="Power Busbar" icon="styles/standard/power/busbar.svg" type="way" preset_name_label="true">
+        <item name="Power Busbar" icon="presets/power/busbar.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:line=busbar"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6858,5 +6858,5 @@
             <reference ref="power_line_extra" />
         </item> <!-- Power Busbar -->
-        <item name="Power Bay" icon="styles/standard/power/bay.svg" type="way" preset_name_label="true">
+        <item name="Power Bay" icon="presets/power/bay.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:line=bay"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6869,5 +6869,5 @@
             <reference ref="power_line_extra" />
         </item> <!-- Power Bay -->
-        <item name="Power Switch" icon="styles/standard/power/switch.svg" type="node" preset_name_label="true">
+        <item name="Power Switch" icon="presets/power/switch.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
             <space />
@@ -6875,5 +6875,5 @@
         </item> <!-- Power Switch -->
         <separator/>
-        <item name="Power Converter" icon="styles/standard/power/converter.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Power Converter" icon="presets/power/converter.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=converter"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6891,5 +6891,5 @@
             </optional>
         </item> <!-- Power Converter -->
-        <item name="Power Compensator" icon="styles/standard/power/compensator.svg" type="node,closedway" preset_name_label="true">
+        <item name="Power Compensator" icon="presets/power/compensator.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=compensator"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=substation"
@@ -6907,5 +6907,5 @@
         </item> <!-- Power Compensator -->
         <separator/>
-        <item name="Power Street Cabinet" icon="styles/standard/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
+        <item name="Power Street Cabinet" icon="presets/power/cable_distribution_cabinet.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=street_cabinet" />
             <space />
@@ -6916,5 +6916,5 @@
         </item> <!-- Power Street Cabinet -->
         <separator/>
-        <item name="Transformer Tower" icon="styles/standard/power/transformer_tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Transformer Tower" icon="presets/power/transformer_tower.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:building=transformer_tower" />
             <space />
@@ -6924,5 +6924,5 @@
             <preset_link preset_name="Power Substation" />
         </item> <!-- Transformer Tower -->
-        <item name="Power Portal" icon="styles/standard/power/portal.svg" type="node,way" preset_name_label="true">
+        <item name="Power Portal" icon="presets/power/portal.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=portal"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=portal" />
@@ -6936,5 +6936,5 @@
             <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
         </item> <!-- Power Portal -->
-        <item name="Power Tower" icon="styles/standard/power/tower.svg" type="node" preset_name_label="true">
+        <item name="Power Tower" icon="presets/power/tower.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
@@ -6963,5 +6963,5 @@
             </optional>
         </item> <!-- Power Tower -->
-        <item name="Pole" icon="styles/standard/power/pole.svg" type="node" preset_name_label="true">
+        <item name="Pole" icon="presets/power/pole.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
@@ -6981,5 +6981,5 @@
             <reference ref="ref_operator_branch" />
         </item> <!-- Pole -->
-        <item name="Pole with Transformer" icon="styles/standard/power/pole_transformer.svg" type="node" preset_name_label="true">
+        <item name="Pole with Transformer" icon="presets/power/pole_transformer.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=pole"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=pole"
@@ -7006,5 +7006,5 @@
             </optional>
         </item> <!-- Pole with Transformer-->
-        <item name="Insulator" icon="styles/standard/power/insulator.svg" type="node,way" preset_name_label="true">
+        <item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=insulator" />
             <space />
@@ -7012,5 +7012,5 @@
             <reference ref="ref_operator_branch" />
         </item> <!-- Insulator -->
-        <item name="Power Line" icon="styles/standard/power/line.svg" type="way" preset_name_label="true">
+        <item name="Power Line" icon="presets/power/line.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line"
@@ -7032,5 +7032,5 @@
             </optional>
         </item> <!-- Power Line -->
-        <item name="Power Cable" icon="styles/standard/power/cable.svg" type="way" preset_name_label="true">
+        <item name="Power Cable" icon="presets/power/cable.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:power=cable"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=cable"
@@ -7048,6 +7048,6 @@
         </item> <!-- Power Cable -->
     </group> <!-- Power -->
-    <group name="Historic Places" icon="styles/standard/sightseeing/castle.svg">
-        <item name="Castle" icon="styles/standard/sightseeing/castle.svg" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Historic Places" icon="presets/sightseeing/castle.svg">
+        <item name="Castle" icon="presets/sightseeing/castle.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=castle"
@@ -7074,5 +7074,5 @@
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Ruins -->
-        <item name="Archaeological Site" icon="styles/standard/sightseeing/archaeological.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Archaeological Site" icon="presets/sightseeing/archaeological.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site"
@@ -7176,5 +7176,5 @@
             <text key="inscription" text="Inscription" />
         </item> <!-- Wayside Shrine -->
-        <item name="Boundary Stone" icon="styles/standard/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
+        <item name="Boundary Stone" icon="presets/historic/boundary_stone.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=boundary_stone"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=boundary_stone"
@@ -7189,7 +7189,7 @@
     </group> <!-- Historic Places -->
   </group> <!-- Man Made -->
-  <group name="Shops" icon="styles/standard/shop/mall.png">
-    <group name="Food" icon="styles/standard/shop/supermarket.svg">
-        <item name="Supermarket" icon="styles/standard/shop/supermarket.svg" type="node,closedway,multipolygon" preset_name_label="true">
+  <group name="Shops" icon="presets/shop/mall.png">
+    <group name="Food" icon="presets/shop/supermarket.svg">
+        <item name="Supermarket" icon="presets/shop/supermarket.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=supermarket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=supermarket"
@@ -7251,5 +7251,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bakery -->
-        <item name="Butcher" icon="styles/standard/shop/groceries/butcher.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Butcher" icon="presets/shop/groceries/butcher.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=butcher"
@@ -7306,5 +7306,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Candy Store -->
-        <item name="Tea" icon="styles/standard/shop/groceries/tea.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tea" icon="presets/shop/groceries/tea.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tea"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tea"
@@ -7316,5 +7316,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tea -->
-        <item name="Coffee" icon="styles/standard/shop/groceries/coffee.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Coffee" icon="presets/shop/groceries/coffee.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=coffee"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=coffee"
@@ -7326,5 +7326,5 @@
         </item> <!-- Coffee -->
         <separator/>
-        <item name="Public Market" icon="styles/standard/place/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Public Market" icon="presets/place/marketplace.png" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=marketplace"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=marketplace"
@@ -7386,5 +7386,5 @@
         </item> <!-- Fair Trade -->
         <separator/>
-        <item name="Alcohol" icon="styles/standard/shop/alcohol.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Alcohol" icon="presets/shop/alcohol.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=alcohol"
@@ -7400,5 +7400,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Alcohol -->
-        <item name="Beverages" icon="styles/standard/shop/beverages.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Beverages" icon="presets/shop/beverages.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beverages"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beverages"
@@ -7412,5 +7412,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beverages -->
-        <item name="Wine" icon="styles/standard/shop/wine.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Wine" icon="presets/shop/wine.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=wine"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=wine"
@@ -7422,6 +7422,6 @@
         </item> <!-- Wine -->
     </group> <!-- Food -->
-    <group name="Clothes" icon="styles/standard/shop/clothes.png">
-        <item name="Clothes" icon="styles/standard/shop/clothes.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Clothes" icon="presets/shop/clothes.png">
+        <item name="Clothes" icon="presets/shop/clothes.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=clothes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=clothes"
@@ -7452,5 +7452,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Boutique -->
-        <item name="Shoes" icon="styles/standard/shop/shoes.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Shoes" icon="presets/shop/shoes.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=shoes"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=shoes"
@@ -7464,5 +7464,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Shoes -->
-        <item name="Outdoor" icon="styles/standard/shop/outdoor.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Outdoor" icon="presets/shop/outdoor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=outdoor"
@@ -7475,5 +7475,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Outdoor -->
-        <item name="Sports" icon="styles/standard/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Sports" icon="presets/sport/multi.png" type="node,closedway,multipolygon" preset_name_label="true">
              <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=sports"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=sports"
@@ -7508,5 +7508,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Laundry -->
-        <item name="Tailor" icon="styles/standard/shop/tailor.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tailor" icon="presets/shop/tailor.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tailor"
                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=tailor" />
@@ -7527,6 +7527,6 @@
         </item> <!-- Fabric -->
     </group> <!-- Clothes -->
-    <group name="Electronic" icon="styles/standard/shop/electronics.png">
-        <item name="Computer" icon="styles/standard/shop/computer.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Electronic" icon="presets/shop/electronics.png">
+        <item name="Computer" icon="presets/shop/computer.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=computer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=computer"
@@ -7539,5 +7539,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Computer -->
-        <item name="Electronics" icon="styles/standard/shop/electronics.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Electronics" icon="presets/shop/electronics.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=electronics"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=electronics"
@@ -7568,5 +7568,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Vacuum Cleaner -->
-        <item name="Hifi" icon="styles/standard/shop/hifi.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hifi" icon="presets/shop/hifi.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hifi"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hifi"
@@ -7579,5 +7579,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hifi -->
-        <item name="Video" icon="styles/standard/shop/video.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Video" icon="presets/shop/video.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=video"
@@ -7590,5 +7590,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Video -->
-        <item name="Video Games" icon="styles/standard/shop/video_games.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Video Games" icon="presets/shop/video_games.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=video_games" />
             <space />
@@ -7597,5 +7597,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Video Games -->
-        <item name="Music" icon="styles/standard/shop/music.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Music" icon="presets/shop/music.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=music"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=music"
@@ -7607,6 +7607,6 @@
         </item> <!-- Music -->
     </group> <!-- Electronic -->
-    <group name="Cash" icon="styles/standard/money/dollar.svg">
-        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Cash" icon="presets/money/dollar.svg">
+        <item name="Bank" icon="presets/money/bank.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=bank"
@@ -7628,5 +7628,5 @@
             <preset_link preset_name="Building" />
         </item> <!-- Bank -->
-        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Money Exchange" icon="presets/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bureau_de_change"
@@ -7640,5 +7640,5 @@
             <reference ref="link_contact_address" />
         </item> <!-- Money Exchange -->
-        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node" preset_name_label="true">
+        <item name="Automated Teller Machine" icon="presets/money/atm.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=atm"
@@ -7670,6 +7670,6 @@
         </item> <!-- Pawnbroker -->
     </group> <!-- Cash -->
-    <group name="Home decoration" icon="styles/standard/shop/interior_decoration.svg">
-        <item name="Furniture" icon="styles/standard/shop/furniture.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Home decoration" icon="presets/shop/interior_decoration.svg">
+        <item name="Furniture" icon="presets/shop/furniture.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=furniture"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=furniture"
@@ -7695,5 +7695,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Kitchen -->
-        <item name="Houseware" icon="styles/standard/shop/houseware.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Houseware" icon="presets/shop/houseware.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=houseware"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=houseware"
@@ -7716,5 +7716,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Curtain -->
-        <item name="Art" icon="styles/standard/shop/art.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Art" icon="presets/shop/art.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=art"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=art"
@@ -7738,5 +7738,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Frame -->
-        <item name="Bed" icon="styles/standard/shop/bed.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bed" icon="presets/shop/bed.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bed"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bed"
@@ -7750,5 +7750,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bed -->
-        <item name="Interior Decoration" icon="styles/standard/shop/interior_decoration.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Interior Decoration" icon="presets/shop/interior_decoration.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=interior_decoration"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=interior_decoration"
@@ -7760,5 +7760,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Interior Decoration -->
-        <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Antiques" icon="presets/shop/antique.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=antiques"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=antiques"
@@ -7795,5 +7795,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Copy Shop -->
-        <item name="Book Store" icon="styles/standard/shop/book.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Book Store" icon="presets/shop/book.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=books"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=books"
@@ -7808,5 +7808,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->
-        <item name="Newspaper Stand" icon="styles/standard/shop/news.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Newspaper Stand" icon="presets/shop/news.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=newsagent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=newsagent"
@@ -7820,5 +7820,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Newspaper Stand -->
-        <item name="Ticket" icon="styles/standard/shop/ticket.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Ticket" icon="presets/shop/ticket.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=ticket"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=ticket"
@@ -7831,6 +7831,6 @@
         </item> <!-- Ticket -->
     </group> <!-- Printed Material -->
-    <group name="For the body" icon="styles/standard/shop/body.svg">
-        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="For the body" icon="presets/shop/body.svg">
+        <item name="Chemist" icon="presets/shop/chemist.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
@@ -7845,5 +7845,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Chemist -->
-        <item name="Cosmetics" icon="styles/standard/shop/cosmetics.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Cosmetics" icon="presets/shop/cosmetics.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=cosmetics" />
             <space />
@@ -7852,5 +7852,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Cosmetics -->
-        <item name="Perfumery" icon="styles/standard/shop/perfumery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Perfumery" icon="presets/shop/perfumery.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=perfumery" />
             <space />
@@ -7859,5 +7859,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Perfumery -->
-        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Beauty" icon="presets/shop/beauty.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
@@ -7872,5 +7872,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beauty -->
-        <item name="Tobacco" icon="styles/standard/shop/tobacco.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tobacco" icon="presets/shop/tobacco.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tobacco" />
             <space />
@@ -7879,5 +7879,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tobacco -->
-        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Hairdresser/Barber" icon="presets/shop/hairdresser.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
@@ -7897,5 +7897,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hairdresser/Barber -->
-        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tattoo" icon="presets/shop/tattoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=tattoo"
@@ -7908,5 +7908,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Tattoo -->
-        <item name="Optician" icon="styles/standard/shop/optician.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Optician" icon="presets/shop/optician.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=optician"
@@ -7929,5 +7929,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Hearing Aids -->
-        <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Medical Supply" icon="presets/shop/medical_supply.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=medical_supply"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=medical_supply"
@@ -7939,5 +7939,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Medical Supply -->
-        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Jewellery" icon="presets/shop/jewelry.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
@@ -7961,6 +7961,6 @@
         </item> <!-- Erotic -->
     </group> <!-- For the body -->
-    <group name="Other" icon="styles/standard/shop/mall.png">
-        <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <group name="Other" icon="presets/shop/mall.png">
+        <item name="Department Store" icon="presets/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=department_store"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=department_store"
@@ -7975,5 +7975,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Department Store -->
-        <item name="Mall" icon="styles/standard/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Mall" icon="presets/shop/mall.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=mall"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=mall"
@@ -7988,5 +7988,5 @@
         </item> <!-- Mall -->
         <separator/>
-        <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Florist" icon="presets/shop/florist.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=florist"
@@ -8001,5 +8001,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Florist -->
-        <item name="Garden Centre" icon="styles/standard/shop/garden_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Garden Centre" icon="presets/shop/garden_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=garden_centre"
@@ -8071,5 +8071,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Musical Instrument -->
-        <item name="Toys" icon="styles/standard/shop/toys.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Toys" icon="presets/shop/toys.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=toys"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=toys"
@@ -8128,5 +8128,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Lottery -->
-        <item name="Bag" icon="styles/standard/shop/bag.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Bag" icon="presets/shop/bag.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bag"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=bag"
@@ -8137,5 +8137,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bag -->
-        <item name="Pet" icon="styles/standard/shop/pet.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Pet" icon="presets/shop/pet.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pet"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pet"
@@ -8149,5 +8149,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pet -->
-        <item name="Photo" icon="styles/standard/shop/photo.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Photo" icon="presets/shop/photo.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=photo"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=photo"
@@ -8158,5 +8158,5 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Photo -->
-        <item name="Funeral Directors" icon="styles/standard/shop/funeral_directors.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Funeral Directors" icon="presets/shop/funeral_directors.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=funeral_directors"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=funeral_directors"
@@ -8173,5 +8173,5 @@
     </group> <!-- Other -->
         <separator/>
-    <item name="Vending Machine" icon="styles/standard/transport/ticket-machine.png" type="node" preset_name_label="true">
+    <item name="Vending Machine" icon="presets/transport/ticket-machine.png" type="node" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=vending_machine"
@@ -8185,5 +8185,5 @@
         <preset_link preset_name="Payment Methods" />
     </item> <!-- Vending Machine -->
-    <item name="Payment Methods" icon="styles/standard/money/dollar.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+    <item name="Payment Methods" icon="presets/money/dollar.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Key:payment"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Key:payment"
@@ -8244,6 +8244,6 @@
     </item> <!-- Payment Methods -->
   </group> <!-- Shops -->
-  <group name="Offices" icon="styles/standard/office/private_company.svg">
-    <item name="Accountant" icon="styles/standard/office/accountant.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+  <group name="Offices" icon="presets/office/private_company.svg">
+    <item name="Accountant" icon="presets/office/accountant.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=accountant"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=accountant"
@@ -8256,5 +8256,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Accountant -->
-    <item name="Administrative" icon="styles/standard/office/administrative.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Administrative" icon="presets/office/administrative.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=administrative"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=administrative"
@@ -8266,5 +8266,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Administrative -->
-    <item name="Advertising agency" icon="styles/standard/office/advertising_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Advertising agency" icon="presets/office/advertising_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=advertising_agency" />
         <space />
@@ -8273,5 +8273,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Advertising agency -->
-    <item name="Architect" icon="styles/standard/office/architect.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Architect" icon="presets/office/architect.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=architect"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=architect"
@@ -8283,5 +8283,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Architect -->
-    <item name="Association" icon="styles/standard/office/association.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Association" icon="presets/office/association.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=association" />
         <space />
@@ -8290,5 +8290,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Association -->
-    <item name="Private company" icon="styles/standard/office/private_company.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Private company" icon="presets/office/private_company.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=company"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=company"
@@ -8300,5 +8300,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Private company -->
-    <item name="Educational institution" icon="styles/standard/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Educational institution" icon="presets/office/educational_institution.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=educational_institution"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=educational_institution"
@@ -8309,5 +8309,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Educational institution -->
-    <item name="Employment agency" icon="styles/standard/office/employment_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Employment agency" icon="presets/office/employment_agency.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=employment_agency"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=employment_agency"
@@ -8321,5 +8321,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Employment agency -->
-    <item name="Estate agent" icon="styles/standard/office/real_state.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Estate agent" icon="presets/office/real_state.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=estate_agent"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=estate_agent"
@@ -8333,5 +8333,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Estate agent -->
-    <item name="Foundation" icon="styles/standard/office/foundation.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Foundation" icon="presets/office/foundation.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=foundation" />
         <space />
@@ -8340,5 +8340,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Foundation -->
-    <item name="Government" icon="styles/standard/office/government.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Government" icon="presets/office/government.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=government"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=government"
@@ -8352,5 +8352,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Government -->
-    <item name="Insurance" icon="styles/standard/office/insurance.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Insurance" icon="presets/office/insurance.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=insurance"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=insurance"
@@ -8363,5 +8363,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Insurance -->
-    <item name="It specialist" icon="styles/standard/office/it.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="It specialist" icon="presets/office/it.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=it"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=it"
@@ -8373,5 +8373,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- It specialist -->
-    <item name="Lawyer" icon="styles/standard/office/lawyer.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Lawyer" icon="presets/office/lawyer.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=lawyer"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=lawyer"
@@ -8385,5 +8385,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Lawyer -->
-    <item name="Newspaper" icon="styles/standard/office/newspaper.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Newspaper" icon="presets/office/newspaper.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=newspaper"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=newspaper"
@@ -8395,5 +8395,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Newspaper -->
-    <item name="Non-governmental organisation (NGO)" icon="styles/standard/office/ong.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Non-governmental organisation (NGO)" icon="presets/office/ong.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=ngo"
               fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=ngo"
@@ -8406,5 +8406,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Non-governmental organisation (NGO) -->
-    <item name="Notary" icon="styles/standard/office/notary.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Notary" icon="presets/office/notary.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=notary" />
         <space />
@@ -8413,5 +8413,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Notary -->
-    <item name="Political party" icon="styles/standard/office/political_party.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Political party" icon="presets/office/political_party.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=political_party"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=political_party"
@@ -8422,5 +8422,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Political party -->
-    <item name="Religion" icon="styles/standard/office/religion.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Religion" icon="presets/office/religion.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=religion"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=religion"
@@ -8432,5 +8432,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Religion -->
-    <item name="Research" icon="styles/standard/office/research.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Research" icon="presets/office/research.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=research"
               es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=research"
@@ -8443,5 +8443,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Research -->
-    <item name="Tax advisor" icon="styles/standard/office/tax_advisor.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Tax advisor" icon="presets/office/tax_advisor.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=tax_advisor"
               de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=tax_advisor" />
@@ -8451,5 +8451,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Tax advisor -->
-    <item name="Telecommunication" icon="styles/standard/office/telecommunication.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Telecommunication" icon="presets/office/telecommunication.svg" name_context="office" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=telecommunication"
               pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=telecommunication"
@@ -8462,5 +8462,5 @@
     </item> <!-- Telecommunication -->
   </group> <!-- Offices -->
-  <group name="Craft" icon="styles/standard/craft/painter.png">
+  <group name="Craft" icon="presets/craft/painter.png">
     <item name="Carpenter" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=carpenter" />
@@ -8505,5 +8505,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Brewery -->
-    <item name="Plumber" icon="styles/standard/craft/plumber.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Plumber" icon="presets/craft/plumber.png" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=plumber" />
         <space />
@@ -8540,5 +8540,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Hvac -->
-    <item name="Painter" icon="styles/standard/craft/painter.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Painter" icon="presets/craft/painter.png" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=painter" />
         <space />
@@ -8561,5 +8561,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Handicraft -->
-    <item name="Pottery" icon="styles/standard/craft/pottery.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Pottery" icon="presets/craft/pottery.png" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=pottery" />
         <space />
@@ -8610,5 +8610,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Locksmith -->
-    <item name="Window construction" icon="styles/standard/craft/window_construction.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Window construction" icon="presets/craft/window_construction.png" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=window_construction" />
         <space />
@@ -8624,5 +8624,5 @@
         <reference ref="link_contact_address" />
     </item> <!-- Upholsterer -->
-    <item name="Tiler" icon="styles/standard/craft/tiler.png" type="node,closedway,multipolygon" preset_name_label="true">
+    <item name="Tiler" icon="presets/craft/tiler.png" type="node,closedway,multipolygon" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:craft=tiler" />
         <space />
@@ -8702,6 +8702,6 @@
         </item> <!-- Maritime -->
     </group> <!-- Boundaries -->
-    <group name="Places" icon="styles/standard/place/settlement/isolated_dwelling.png">
-        <item name="Continent" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
+    <group name="Places" icon="presets/place/settlement/isolated_dwelling.png">
+        <item name="Continent" icon="presets/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=continent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=continent"
@@ -8712,5 +8712,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Continent -->
-        <item name="Country" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
+        <item name="Country" icon="presets/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=country"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=country"
@@ -8721,5 +8721,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Country -->
-        <item name="State" icon="styles/standard/place/settlement/capital.png" name_context="place" type="node,closedway" preset_name_label="true">
+        <item name="State" icon="presets/place/settlement/capital.png" name_context="place" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=state"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=state"
@@ -8730,5 +8730,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- State -->
-        <item name="Region" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
+        <item name="Region" icon="presets/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=region"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=region" />
@@ -8737,5 +8737,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Region -->
-        <item name="County" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
+        <item name="County" icon="presets/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=county"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=county"
@@ -8748,5 +8748,5 @@
         </item> <!-- County -->
         <separator/>
-        <item name="City" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
+        <item name="City" icon="presets/place/settlement/city.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=city"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=city"
@@ -8761,5 +8761,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- City -->
-        <item name="Town" icon="styles/standard/place/settlement/town.png" type="node,closedway" preset_name_label="true">
+        <item name="Town" icon="presets/place/settlement/town.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
@@ -8775,5 +8775,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Town -->
-        <item name="Village" icon="styles/standard/place/settlement/village.png" type="node,closedway" preset_name_label="true">
+        <item name="Village" icon="presets/place/settlement/village.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=village"
@@ -8791,5 +8791,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Village -->
-        <item name="Hamlet" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
+        <item name="Hamlet" icon="presets/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
                   da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=hamlet"
@@ -8805,5 +8805,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Hamlet -->
-        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/isolated_dwelling.png" type="node,closedway" preset_name_label="true">
+        <item name="Isolated Dwelling" icon="presets/place/settlement/isolated_dwelling.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
@@ -8818,5 +8818,5 @@
         </item> <!-- Isolated Dwelling -->
         <separator/>
-        <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
+        <item name="Suburb" icon="presets/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
@@ -8832,5 +8832,5 @@
             <reference ref="population_postcode_website" />
         </item> <!-- Suburb -->
-        <item name="Neighbourhood" icon="styles/standard/place/settlement/neighbourhood.png" type="node,closedway" preset_name_label="true">
+        <item name="Neighbourhood" icon="presets/place/settlement/neighbourhood.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
@@ -8845,5 +8845,5 @@
             <text key="website" text="Website" />
         </item> <!-- Neighbourhood -->
-        <item name="Farm" icon="styles/standard/place/settlement/farm.png" type="node,closedway" preset_name_label="true">
+        <item name="Farm" icon="presets/place/settlement/farm.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=farm"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=farm"
@@ -8957,5 +8957,5 @@
             <reference ref="name_wikipedia" />
         </item> <!-- Valley -->
-        <item name="Cliff" icon="styles/standard/misc/cliff.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
+        <item name="Cliff" icon="presets/misc/cliff.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=cliff"
@@ -9010,6 +9010,6 @@
         </item> <!-- Islet -->
     </group> <!-- Geography -->
-    <group name="Nature" icon="styles/standard/misc/landmark/trees.png">
-        <item name="Tree" icon="styles/standard/misc/landmark/trees.png" type="node" preset_name_label="true">
+    <group name="Nature" icon="presets/misc/landmark/trees.png">
+        <item name="Tree" icon="presets/misc/landmark/trees.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree"
@@ -9033,5 +9033,5 @@
             <reference ref="leaf" />
         </item> <!-- Tree -->
-        <item name="Tree Row" icon="styles/standard/misc/landmark/tree_row.svg" type="way" preset_name_label="true">
+        <item name="Tree Row" icon="presets/misc/landmark/tree_row.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
@@ -9052,5 +9052,5 @@
             </optional>
         </item> <!-- Tree Row -->
-        <item name="Wood" icon="styles/standard/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Wood" icon="presets/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=wood"
@@ -9067,5 +9067,5 @@
             <reference ref="leaf" />
         </item> <!-- Wood -->
-        <item name="Forest" icon="styles/standard/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Forest" icon="presets/misc/landmark/forest.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=forest"
@@ -9082,5 +9082,5 @@
             <reference ref="leaf" />
         </item> <!-- Forest -->
-        <item name="Cutline" icon="styles/standard/misc/landmark/cutline.svg" type="way" preset_name_label="true">
+        <item name="Cutline" icon="presets/misc/landmark/cutline.svg" type="way" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=cutline"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=cutline"
@@ -9095,5 +9095,5 @@
             <combo key="cutline" text="Type" values="border,firebreak,hunting,loggingmachine,pipeline,piste,section" values_context="cutline" />
         </item> <!-- Cutline -->
-        <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Grassland" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=grassland"
@@ -9113,5 +9113,5 @@
             <combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
         </item> <!-- Grassland -->
-        <item name="Nature Reserve" icon="styles/standard/leisure/nature_reserve.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Nature Reserve" icon="presets/leisure/nature_reserve.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=nature_reserve"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=nature_reserve"
@@ -9188,5 +9188,5 @@
             <text key="name" text="Name" />
         </item> <!-- Heath -->
-        <item name="Sand" icon="styles/standard/misc/sand.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Sand" icon="presets/misc/sand.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=sand"
@@ -9214,5 +9214,5 @@
             <text key="name" text="Name" />
         </item> <!-- Bare Rock -->
-        <item name="Rock" icon="styles/standard/misc/rock.svg" type="node,closedway" preset_name_label="true">
+        <item name="Rock" icon="presets/misc/rock.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=rock"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=rock"
@@ -9227,5 +9227,5 @@
             </optional>
         </item> <!-- Rock -->
-        <item name="Stone" icon="styles/standard/misc/stone.svg" type="node,closedway" preset_name_label="true">
+        <item name="Stone" icon="presets/misc/stone.svg" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=stone"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=stone"
@@ -9245,5 +9245,5 @@
     </group> <!-- Nature -->
     <group name="Land use" icon="presets/landuse.png">
-        <item name="Farmyard" icon="styles/standard/misc/landuse/farmyard.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Farmyard" icon="presets/misc/landuse/farmyard.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=farmyard"
@@ -9257,5 +9257,5 @@
             <text key="name" text="Name" />
         </item> <!-- Farmyard -->
-        <item name="Farmland" icon="styles/standard/misc/landuse/farmland.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Farmland" icon="presets/misc/landuse/farmland.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmland"
                   ca.href="http://wiki.openstreetmap.org/wiki/Ca:Tag:landuse=farmland"
@@ -9271,5 +9271,5 @@
             <combo key="crop" text="Crop" values="corn,grass,rice,wheat,hop" values_context="crop" />
         </item> <!-- Farmland -->
-        <item name="Meadow" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Meadow" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=meadow"
@@ -9284,5 +9284,5 @@
             <text key="name" text="Name" />
         </item> <!-- Meadow -->
-        <item name="Orchard" icon="styles/standard/misc/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Orchard" icon="presets/misc/landuse/orchard.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=orchard"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=orchard"
@@ -9323,5 +9323,5 @@
             <text key="operator" text="Operator" />
         </item> <!-- Greenhouse Horticulture -->
-        <item name="Plant Nursery" icon="styles/standard/misc/landmark/plant.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Plant Nursery" icon="presets/misc/landmark/plant.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=plant_nursery"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=plant_nursery"
@@ -9338,5 +9338,5 @@
             <text key="species" text="Species" />
         </item> <!-- Plant Nursery -->
-        <item name="Allotments" icon="styles/standard/misc/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Allotments" icon="presets/misc/landuse/allotments.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=allotments"
@@ -9353,5 +9353,5 @@
         </item> <!-- Allotments -->
         <separator/>
-        <item name="Garden" icon="styles/standard/leisure/garden.png" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Garden" icon="presets/leisure/garden.png" type="node,closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=garden"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=garden"
@@ -9364,5 +9364,5 @@
             <text key="name" text="Name" />
         </item> <!-- Garden -->
-        <item name="Grass" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Grass" icon="presets/misc/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=grass"
@@ -9379,5 +9379,5 @@
             <text key="name" text="Name" />
         </item> <!-- Grass -->
-        <item name="Village Green" icon="styles/standard/leisure/common.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Village Green" icon="presets/leisure/common.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=village_green"
@@ -9393,5 +9393,5 @@
             <text key="name" text="Name" />
         </item> <!-- Village Green -->
-        <item name="Common" icon="styles/standard/leisure/common.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Common" icon="presets/leisure/common.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
                   pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=common"
@@ -9403,5 +9403,5 @@
             <text key="name" text="Name" />
         </item> <!-- Common -->
-        <item name="Park" icon="styles/standard/leisure/park.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Park" icon="presets/leisure/park.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=park"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=park"
@@ -9416,5 +9416,5 @@
             <text key="name" text="Name" />
         </item> <!-- Park -->
-        <item name="Recreation Ground" icon="styles/standard/leisure/common.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Recreation Ground" icon="presets/leisure/common.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=recreation_ground"
@@ -9429,5 +9429,5 @@
         </item> <!-- Recreation Ground -->
         <separator/>
-        <item name="Residential Area" icon="styles/standard/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Residential Area" icon="presets/misc/landmark/building.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=residential"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=residential"
@@ -9472,5 +9472,5 @@
             <reference ref="religious" />
         </item> <!-- Cemetery -->
-        <item name="Religious" icon="styles/standard/religion.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Religious" icon="presets/religion.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
@@ -9481,5 +9481,5 @@
             <reference ref="religious" />
         </item> <!-- Religious -->
-        <item name="Retail" icon="styles/standard/shop/mall.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Retail" icon="presets/shop/mall.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=retail"
@@ -9494,5 +9494,5 @@
             <text key="name" text="Name" />
         </item> <!-- Retail -->
-        <item name="Commercial" icon="styles/standard/misc/landuse/commercial.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Commercial" icon="presets/misc/landuse/commercial.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=commercial"
@@ -9507,5 +9507,5 @@
             <text key="name" text="Name" />
         </item> <!-- Commercial -->
-        <item name="Industrial" icon="styles/standard/misc/landmark/works.png" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Industrial" icon="presets/misc/landmark/works.png" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=industrial"
@@ -9595,5 +9595,5 @@
             <text key="name" text="Name" />
         </item> <!-- Greenfield -->
-        <item name="Landfill" icon="styles/standard/misc/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
+        <item name="Landfill" icon="presets/misc/landuse/landfill.svg" type="closedway,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=landfill"
@@ -9744,5 +9744,5 @@
             <text key="image" text="Image" />
         </item> <!-- Contact (Schema with 'contact:*' Prefix) -->
-        <item name="Description" icon="styles/standard/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Description" icon="presets/misc/description.svg" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:description"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:description"
@@ -9763,5 +9763,5 @@
             <preset_link preset_name="Fixme" />
         </item> <!-- Description -->
-        <item name="Note" icon="styles/standard/misc/note-annotation.png" name_context="the tag note=*" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Note" icon="presets/misc/note-annotation.png" name_context="the tag note=*" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:note"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:note"
@@ -9783,5 +9783,5 @@
             <preset_link preset_name="Description" />
         </item> <!-- Note -->
-        <item name="Fixme" icon="styles/standard/misc/fixme-annotation.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
+        <item name="Fixme" icon="presets/misc/fixme-annotation.png" type="node,way,closedway,relation,multipolygon" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Key:fixme"
                   cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:fixme"
@@ -9865,5 +9865,5 @@
         </item> <!-- Site -->
         <separator/>
-        <item name="Turn Restriction" icon="styles/standard/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
+        <item name="Turn Restriction" icon="presets/vehicle/restriction/turn_restrictions/no_u_turn.png" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"
@@ -9887,5 +9887,5 @@
             </roles>
         </item> <!-- Turn Restriction -->
-        <item name="Enforcement" icon="styles/standard/vehicle/restriction/speed_camera.svg" type="relation" preset_name_label="true">
+        <item name="Enforcement" icon="presets/vehicle/restriction/speed_camera.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:enforcement"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:enforcement"
@@ -10184,5 +10184,5 @@
         </item> <!-- Destination Sign -->
         <separator/>
-        <item name="Waterway" icon="styles/standard/nautical/waterway_river.svg" type="relation" preset_name_label="true">
+        <item name="Waterway" icon="presets/nautical/waterway_river.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relation:waterway"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:waterway"
@@ -10211,5 +10211,5 @@
             </roles>
         </item> <!-- Waterway -->
-        <item name="Bridge" icon="styles/standard/transport/bridge/bridge.svg" type="relation" preset_name_label="true">
+        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Relations/Proposed/Bridges_and_Tunnels"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Relations/Proposed/Bridges_and_Tunnels"
Index: /trunk/images/presets/accommodation/hostel.svg
===================================================================
--- /trunk/images/presets/accommodation/hostel.svg	(revision 10565)
+++ /trunk/images/presets/accommodation/hostel.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 0.625,0 C 0.25,0 0,0.25 0,0.75 L 0,14 l 1.25,0 0,-2 11.5,0 0,2 1.25,0 C 14.02275,14 14,0.75 14,0.75 14,0.25 13.75,0 13.375,0 13,0 12.75,0.25 12.75,0.75 l 0,4.25 -11.5,0 0,-4.25 C 1.25,0.25 1,0 0.625,0 z M 3.5,1 C 2.671573,1 2,1.671573 2,2.5 2,3.328427 2.671573,4 3.5,4 4.328427,4 5,3.328427 5,2.5 5,1.671573 4.328427,1 3.5,1 z m 2,1 0,2 6.5,0 C 12,3 10.963825,2 10,2 z m -4.25,4 11.5,0 0,5 -11.5,0 c 0.02355,0 0,-5 0,-5 z M 3.5,7 C 2.671573,7 2,7.671573 2,8.5 2,9.328427 2.671573,10 3.5,10 4.328427,10 5,9.328427 5,8.5 5,7.671573 4.328427,7 3.5,7 z m 2,1 0,2 6.5,0.01288 C 12,9 10.963825,8 10,8 z" id="hostel" style="fill:#0092da;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/accommodation/hotel.svg
===================================================================
--- /trunk/images/presets/accommodation/hotel.svg	(revision 10565)
+++ /trunk/images/presets/accommodation/hotel.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 0.625,3 C 0.25,3 0,3.25 0,3.75 l 0,7.25 1.25,0 0,-1.75 c 0,0 10.380697,0.01892 11.5,0 L 12.75,11 14,11 14,8.625 14,4.75 C 14,4.4202582 13.86199,4 13.375,4 12.88801,4 12.75,4.4202582 12.75,4.75 l 0,3.25 -11.5,0 0,-4.25 C 1.25,3.25 1,3 0.625,3 z M 3.5,4 C 2.671573,4 2,4.671573 2,5.5 2,6.328427 2.671573,7 3.5,7 4.328427,7 5,6.328427 5,5.5 5,4.671573 4.328427,4 3.5,4 z m 2,1 0,2 6.5,0 C 12,6 10.963825,5 10,5 z" id="hotel" style="fill:#0092da;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/accommodation/motel.svg
===================================================================
--- /trunk/images/presets/accommodation/motel.svg	(revision 10565)
+++ /trunk/images/presets/accommodation/motel.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 0.625,0 C 0.25,0 0,0.25 0,0.75 l 0,5.75 1.25,0 0,-1.5 c 0,0 10.380697,0.01892 11.5,0 l 0,1.5 1.25,0 c -9.7e-5,0 0,-4.75 0,-4.75 C 14,1.4202582 13.861987,1 13.375,1 12.88801,1 12.713586,1.422275 12.75,1.75 l 0,2 -11.5,0 0,-3 C 1.25,0.25 1,0 0.625,0 z M 3.5,0 C 2.671573,0 2,0.671573 2,1.5 2,2.328427 2.671573,3 3.5,3 4.328427,3 5,2.328427 5,1.5 5,0.671573 4.328427,0 3.5,0 z m 2,1 0,2 6.5,0 C 12,2 10.963825,1 10,1 z M 4,6 3,9 C 2.527334,9 2,9.384295 2,10 l 0,3 1,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 4,0 c 0,0 0,1 1,1 1,0 1,-1 1,-1 l 1,0 0,-3 C 12,9.479394 11.544575,9 11,9 L 10,6 z m 1,1 4,0 0.625,2 -5.25,0 z m -1,3.25 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z m 6,0 c 0.414214,0 0.75,0.335786 0.75,0.75 0,0.414214 -0.335786,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.414214 0.335786,-0.75 0.75,-0.75 z" id="motel" style="fill:#0092da" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/accommodation/shelter_lean_to.svg
===================================================================
--- /trunk/images/presets/accommodation/shelter_lean_to.svg	(revision 10565)
+++ /trunk/images/presets/accommodation/shelter_lean_to.svg	(revision 10565)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="15.50009"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="15.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="7.0302917"
+     inkscape:cy="6.9737811"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-595px"
+       originy="-284.99991px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-595,-751.86218)">
+    <rect
+       style="fill:#502d16;fill-opacity:1;stroke:none"
+       id="rect3768"
+       width="2.0001533"
+       height="7.0000868"
+       x="608"
+       y="760.36218" />
+    <path
+       style="fill:#956531;fill-opacity:1;stroke:none"
+       d="m 608,767.36218 0,-7 -11,-2 0,9 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#502d16;fill-opacity:1;stroke:none"
+       d="m 595,759.36218 16,3 0,-3 -16,-3 z"
+       id="path3770"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 597,756.36218 c 4,-4 4,-4 4,-4"
+       id="path3774"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 600,756.36218 1,-1"
+       id="path3776"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 602,754.36218 2,-2"
+       id="path3778"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 603,757.36218 3,-3"
+       id="path3782"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 596,754.36218 2,-2"
+       id="path3786"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 606,758.36218 1,-1"
+       id="path3788"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 608,756.36218 2,-2"
+       id="path3790"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#0000ff;stroke:#0078ff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 609,758.36218 1,-1"
+       id="path3792"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#0078ff;fill-opacity:1;stroke:#0078ff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 607,753.36218 1,-1"
+       id="path3794"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: /trunk/images/presets/bunker_silo.svg
===================================================================
--- /trunk/images/presets/bunker_silo.svg	(revision 10565)
+++ /trunk/images/presets/bunker_silo.svg	(revision 10565)
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="917.01813"
+   height="982.49854"
+   id="svg3157"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3159">
+    <clipPath
+       id="presentation_clip_path"
+       clipPathUnits="userSpaceOnUse">
+      <rect
+         x="0"
+         y="0"
+         width="21000"
+         height="29700"
+         id="rect7" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="116.36642"
+     inkscape:cy="468.39287"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3162">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-258.63358,-18.256528)">
+    <g
+       style="fill-rule:evenodd;stroke-width:28.22200012;stroke-linejoin:round"
+       clip-path="url(#presentation_clip_path)"
+       class="Slide"
+       id="id1"
+       transform="matrix(0.04819248,0,0,0.03543307,211.12182,-16.67605)">
+      <g
+         id="g54"
+         class="Page">
+        <g
+           id="g56"
+           class="com.sun.star.drawing.PolyPolygonShape">
+          <g
+             id="id3">
+            <path
+               style="fill:#b3b3b3;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path59"
+               d="m 1000,28700 0,-8589 710,0 0,8589 -710,0 z" />
+            <path
+               style="fill:#4d4d4d;stroke:#666666"
+               inkscape:connector-curvature="0"
+               id="path61"
+               d="m 1000,28700 0,-8589 710,0 0,8589 -710,0 z" />
+          </g>
+        </g>
+        <g
+           id="g63"
+           class="com.sun.star.drawing.PolyPolygonShape">
+          <g
+             id="id4">
+            <path
+               style="fill:#1a1a1a;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path66"
+               d="m 10056,1859 0,8589 4972,0 3907,-8589 -8879,0 z" />
+            <path
+               style="fill:none;stroke:#666666"
+               inkscape:connector-curvature="0"
+               id="path68"
+               d="m 10056,1859 0,8589 4972,0 3907,-8589 -8879,0 z" />
+          </g>
+        </g>
+        <g
+           id="g70"
+           class="com.sun.star.drawing.PolyPolygonShape">
+          <g
+             id="id5">
+            <path
+               style="fill:#333333;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path73"
+               d="m 1710,20111 8346,-18252 0,8589 -8346,18252 0,-8589 z" />
+            <path
+               style="fill:none;stroke:#999999"
+               inkscape:connector-curvature="0"
+               id="path75"
+               d="m 1710,20111 8346,-18252 0,8589 -8346,18252 0,-8589 z" />
+          </g>
+        </g>
+        <g
+           id="g77"
+           class="com.sun.star.drawing.ClosedFreeHandShape">
+          <g
+             id="id6">
+            <path
+               style="fill:#cccc00;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path80"
+               d="m 10054,4906 c -218,294 -404,674 -381,1067 26,457 -243,741 -382,1100 -138,354 15,697 -59,1065 -77,380 -43,809 -351,1101 -299,283 -442,743 -677,1102 -209,320 -161,730 -176,1099 -15,367 49,747 -87,1102 -130,339 -135,730 -117,1099 18,359 -23,794 -382,960 -337,156 -654,430 -852,816 -172,335 -257,726 -352,1101 -90,359 -50,746 -147,1102 -102,376 -153,775 -295,1136 -153,388 36,781 61,1170 22,357 -32,711 -61,1065 -33,398 48,879 382,1067 286,162 609,164 911,284 335,133 598,490 646,887 58,479 474,542 764,532 293,-9 588,-70 881,-105 319,-38 648,26 939,176 348,180 696,-118 881,-425 212,-353 591,-303 880,-498 304,-205 487,-582 647,-958 163,-382 605,-395 880,-640 284,-252 368,-706 471,-1099 103,-391 213,-788 206,-1209 -6,-380 70,-758 87,-1136 19,-423 254,-767 440,-1099 228,-406 483,-789 736,-1173 212,-323 330,-730 527,-1065 217,-369 446,-736 618,-1136 170,-395 542,-676 557,-1138 15,-434 230,-781 469,-1065 249,-294 336,-734 499,-1099 151,-338 331,-683 354,-1065 21,-359 44,-709 28,-1065 -16,-368 9,-737 0,-1102 -9,-365 -26,-726 59,-1102 82,-362 51,-951 -293,-1065 -318,-105 -629,-193 -881,-425 -268,-247 -625,-404 -970,-320 -346,85 -589,410 -909,569 -288,144 -545,511 -881,425 -314,-80 -633,-78 -941,-178 -305,-99 -738,-64 -880,320 -146,393 -482,549 -792,498 -336,-54 -670,-182 -940,-427 -263,-238 -600,-245 -911,-283 l -117,-142 -89,176 z" />
+            <path
+               style="fill:none;stroke:#cccc00"
+               inkscape:connector-curvature="0"
+               id="path82"
+               d="m 10054,4906 c -218,294 -404,674 -381,1067 26,457 -243,741 -382,1100 -138,354 15,697 -59,1065 -77,380 -43,809 -351,1101 -299,283 -442,743 -677,1102 -209,320 -161,730 -176,1099 -15,367 49,747 -87,1102 -130,339 -135,730 -117,1099 18,359 -23,794 -382,960 -337,156 -654,430 -852,816 -172,335 -257,726 -352,1101 -90,359 -50,746 -147,1102 -102,376 -153,775 -295,1136 -153,388 36,781 61,1170 22,357 -32,711 -61,1065 -33,398 48,879 382,1067 286,162 609,164 911,284 335,133 598,490 646,887 58,479 474,542 764,532 293,-9 588,-70 881,-105 319,-38 648,26 939,176 348,180 696,-118 881,-425 212,-353 591,-303 880,-498 304,-205 487,-582 647,-958 163,-382 605,-395 880,-640 284,-252 368,-706 471,-1099 103,-391 213,-788 206,-1209 -6,-380 70,-758 87,-1136 19,-423 254,-767 440,-1099 228,-406 483,-789 736,-1173 212,-323 330,-730 527,-1065 217,-369 446,-736 618,-1136 170,-395 542,-676 557,-1138 15,-434 230,-781 469,-1065 249,-294 336,-734 499,-1099 151,-338 331,-683 354,-1065 21,-359 44,-709 28,-1065 -16,-368 9,-737 0,-1102 -9,-365 -26,-726 59,-1102 82,-362 51,-951 -293,-1065 -318,-105 -629,-193 -881,-425 -268,-247 -625,-404 -970,-320 -346,85 -589,410 -909,569 -288,144 -545,511 -881,425 -314,-80 -633,-78 -941,-178 -305,-99 -738,-64 -880,320 -146,393 -482,549 -792,498 -336,-54 -670,-182 -940,-427 -263,-238 -600,-245 -911,-283 l -117,-142 -89,176 z" />
+          </g>
+        </g>
+        <g
+           id="g84"
+           class="com.sun.star.drawing.PolyPolygonShape">
+          <g
+             id="id7">
+            <path
+               style="fill:#4d4d4d;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path87"
+               d="m 10589,28700 0,-8589 710,0 0,8589 -710,0 z" />
+            <path
+               style="fill:none;stroke:#666666"
+               inkscape:connector-curvature="0"
+               id="path89"
+               d="m 10589,28700 0,-8589 710,0 0,8589 -710,0 z" />
+          </g>
+        </g>
+        <g
+           id="g91"
+           class="com.sun.star.drawing.PolyPolygonShape">
+          <g
+             id="id8">
+            <path
+               style="fill:#4d4d4d;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path94"
+               d="m 11299,28700 0,-8589 8701,-19111 -178,9019 -8523,18681 z" />
+            <path
+               style="fill:none;stroke:#999999"
+               inkscape:connector-curvature="0"
+               id="path96"
+               d="m 11299,28700 0,-8589 8701,-19111 -178,9019 -8523,18681 z" />
+          </g>
+        </g>
+        <g
+           id="g98"
+           class="com.sun.star.drawing.PolyPolygonShape">
+          <g
+             id="id9">
+            <path
+               style="fill:#e6e6e6;stroke:none"
+               inkscape:connector-curvature="0"
+               id="path101"
+               d="m 1000,20111 8701,-19111 10299,0 -8701,19111 -710,0 8346,-18252 -8879,0 -8346,18252 -710,0 z" />
+            <path
+               style="fill:#4d4d4d;stroke:#999999"
+               inkscape:connector-curvature="0"
+               id="path103"
+               d="m 1000,20111 8701,-19111 10299,0 -8701,19111 -710,0 8346,-18252 -8879,0 -8346,18252 -710,0 z" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/emergency/ambulance_station.svg
===================================================================
--- /trunk/images/presets/emergency/ambulance_station.svg	(revision 10565)
+++ /trunk/images/presets/emergency/ambulance_station.svg	(revision 10565)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3835"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ambulance_station.svg">
+  <defs
+     id="defs3837" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="7.3398769"
+     inkscape:cy="4.9455986"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3840">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-534.8525,-552.90935)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#cc0000;stroke-opacity:1"
+       id="path3002"
+       sodipodi:cx="-8.5"
+       sodipodi:cy="5.5"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5.5774221"
+       d="m -3,5.5 c 0,3.0803252 -2.4624339,5.577422 -5.5,5.577422 -3.037566,0 -5.5,-2.4970968 -5.5,-5.577422 0,-3.0803252 2.462434,-5.57742214 5.5,-5.57742214 3.0375661,0 5.5,2.49709694 5.5,5.57742214 z"
+       transform="matrix(1.3341078,0,0,1.315587,554.19242,553.67363)" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 544.8525,562.90935 3,0 0,-4 -3,0 0,-3 -4,0 0,3 -3,0 0,4 3,0 0,3 4,0 z"
+       style="fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path1883"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/emergency/assembly_point.svg
===================================================================
--- /trunk/images/presets/emergency/assembly_point.svg	(revision 10565)
+++ /trunk/images/presets/emergency/assembly_point.svg	(revision 10565)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
+     version="1.1"
+     width="400px"
+     height="400px"
+     viewBox="0 0 178 178"
+     id="svg2">
+    <defs />
+    <rect
+         width="178"
+         height="178"
+         x="0"
+         y="0"
+         style="fill:#ffffff" />
+    <rect
+         width="168"
+         height="168"
+         x="5"
+         y="5"
+         style="fill:#008855;fill-rule:evenodd" />
+	<g style="fill:#ffffff;fill-rule:evenodd">
+    <path d="M 44.9,117.94 44.9,88.84 C 44.9,86.32 47.1,84.64 49.4,84.64 H 76.7 C 76.6,88.08 79,90.5 80.9,93.04 H 74 C 69,93.04 66.5,96.15 66.5,101.74 V 117.94 H 56.9 V 96.04 H 52.7 V 117.94 z M 70.7,127.84 70.7,101.44 C 70.7,98.41 72.7,96.94 75.5,96.94 H 102.5 C 105.8,96.94 107.3,99.73 107.3,101.14 V 127.84 H 101.6 V 106.54 H 97.4 V 127.84 H 80.9 V 106.54 H 76.4 V 127.84 z M 133.1,117.94 133.1,90.04 C 133.1,86.99 131.5,84.64 128.6,84.64 H 101.3 C 101.3,87.95 99,90.54 97.1,93.04 H 103.7 C 108.4,93.04 111.5,97.12 111.5,101.74 V 117.94 H 121.1 V 96.04 H 125.3 V 117.94 z" />
+    <path d="M 97.86,58.49 A 8.855,8.855 0 0 1 80.15,58.49 8.855,8.855 0 1 1 97.86,58.49 z" />
+    <path d="M 122.54,71.069 A 8.8551,8.8551 0 0 1 104.83,71.069 8.8551,8.8551 0 1 1 122.54,71.069 z" />
+    <path d="M 72.283,70.693 A 8.8551,8.8551 0 0 1 54.573,70.693 8.8551,8.8551 0 1 1 72.283,70.693 z" />
+    <path d="M 97.702,83.413 A 8.8551,8.8551 0 0 1 79.992,83.413 8.8551,8.8551 0 1 1 97.702,83.413 z" />
+    <path d="M 14.761,8.9 8.9,14.496 35.275,40.999 H 16.714 L 24.53,48.95 H 48.95 V 25.097 L 41.136,17.146 V 35.404 L 14.761,8.9" />
+    <path d="M 163.24,8.902 169.1,14.492 142.72,40.999 H 161.28 L 153.47,48.95 H 129.05 V 25.092 L 136.86,17.142 V 35.402 L 163.24,8.902" />
+    <path d="M 14.761,169.1 8.9,163.5 35.275,137 H 16.714 L 24.53,129.05 H 48.95 V 152.9 L 41.136,160.85 V 142.59 L 14.761,169.1" />
+    <path d="M 163.24,169.1 169.1,163.51 142.72,137 H 161.28 L 153.47,129.05 H 129.05 V 152.91 L 136.86,160.86 V 142.6 L 163.24,169.1" />
+	</g>
+</svg>
Index: /trunk/images/presets/emergency/fire_extinguisher.svg
===================================================================
--- /trunk/images/presets/emergency/fire_extinguisher.svg	(revision 10565)
+++ /trunk/images/presets/emergency/fire_extinguisher.svg	(revision 10565)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#FF3333" d="M4,7.042C4,5.086,5.586,3.5,7.542,3.5l0,0c1.956,0,3.542,1.586,3.542,3.542v5.416
+	c0,1.956-1.586,3.542-3.542,3.542l0,0C5.586,16,4,14.414,4,12.458V7.042z"/>
+<rect x="6" y="1" fill="#666666" width="3" height="3"/>
+<path fill="none" stroke="#666666" stroke-width="2" d="M7.5,2H12c0,0,2,0,2,2v5"/>
+<rect x="5.5" y="8" fill="#666666" width="4.5" height="4"/>
+</svg>
Index: /trunk/images/presets/emergency/fire_hose.svg
===================================================================
--- /trunk/images/presets/emergency/fire_hose.svg	(revision 10565)
+++ /trunk/images/presets/emergency/fire_hose.svg	(revision 10565)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="fire_hose.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs19" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview17"
+   showgrid="true"
+   inkscape:zoom="29.5"
+   inkscape:cx="3.0504169"
+   inkscape:cy="7.108022"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Ebene_1"><inkscape:grid
+     type="xygrid"
+     id="grid3004" /></sodipodi:namedview>
+<rect
+   style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0.59999999999999998"
+   id="rect3006"
+   width="16"
+   height="16"
+   x="0"
+   y="0"
+   ry="0" /><g
+   id="g3">
+	<path
+   d="M1,7.156c0.02,4.616,5.878,8.566,10.124,6.496"
+   id="path5"
+   stroke="#000000"
+   fill="none" />
+	<path
+   d="M1,7.156C1,4.05,3.473,1.532,6.523,1.532c3.049,0,5.523,2.519,5.523,5.625"
+   id="path7"
+   stroke="#000000"
+   fill="none" />
+	<path
+   d="M3.455,7.156L3.455,7.156c0,2.416,1.923,4.375,4.295,4.375s4.296-1.959,4.296-4.375v0"
+   id="path9"
+   stroke="#000000"
+   fill="none" />
+	<path
+   d="M5.909,7.156L5.909,7.156c0,1.036,0.825,1.875,1.841,1.875s1.841-0.839,1.841-1.875v0"
+   id="path11"
+   stroke="#000000"
+   fill="none" />
+	<path
+   d="M3.455,7.156c0-1.726,1.374-3.125,3.068-3.125c1.694,0,3.068,1.399,3.068,3.125"
+   id="path13"
+   stroke="#000000"
+   fill="none" />
+	<polyline
+   points="9.544,12.118 11.527,15.361 15.002,12.12 14.007,10.5  "
+   id="polyline15"
+   fill="#0092DA" />
+</g>
+</svg>
Index: /trunk/images/presets/emergency/siren.svg
===================================================================
--- /trunk/images/presets/emergency/siren.svg	(revision 10565)
+++ /trunk/images/presets/emergency/siren.svg	(revision 10565)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="siren.svg"><metadata
+   id="metadata11"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs9" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview7"
+   showgrid="true"
+   inkscape:zoom="29.5"
+   inkscape:cx="8.8863159"
+   inkscape:cy="5.6147308"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Ebene_1"><inkscape:grid
+     type="xygrid"
+     id="grid2999" /></sodipodi:namedview>
+<path
+   inkscape:connector-curvature="0"
+   d="M 14,6 C 14,2.6865 11.3132,0 8,0 4.6844,0 2,2.6865 2,6"
+   id="path5-7"
+   style="fill:#ffffff" /><rect
+   x="6"
+   y="5"
+   width="4"
+   height="11"
+   id="rect3-1"
+   style="fill:#ffffff" /><rect
+   x="7"
+   y="4.6"
+   width="2"
+   height="11.4"
+   id="rect3" />
+<path
+   d="M13,5c0-2.209-2.239-4-5-4C5.237,1,3,2.791,3,5"
+   id="path5" />
+</svg>
Index: /trunk/images/presets/emergency/water_tank.svg
===================================================================
--- /trunk/images/presets/emergency/water_tank.svg	(revision 10565)
+++ /trunk/images/presets/emergency/water_tank.svg	(revision 10565)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<rect x="1" y="1" fill="#FFFFFF" stroke="#000000" stroke-width="2" width="14" height="14"/>
+<rect x="1" y="6" fill="#0092DA" width="14" height="9"/>
+<rect x="1" y="1" fill="none" stroke="#000000" stroke-width="2" width="14" height="14"/>
+</svg>
Index: /trunk/images/presets/food/restaurant.svg
===================================================================
--- /trunk/images/presets/food/restaurant.svg	(revision 10565)
+++ /trunk/images/presets/food/restaurant.svg	(revision 10565)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="restaurant.16.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1106"
+     inkscape:window-height="767"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <rect width="16" height="16" fill="white" />
+  <path
+     d="M 5,1 C 4,1 2,3 2,6 c 0,3 2.25,4 2.25,4 l -0.5,5 2.5,0 -0.5,-5 C 5.75,10 8,9 8,6 8,3 6,1 5,1 z M 9,1.75 9,8 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 12.25,9 14,9 14,8 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 13,7 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 11,7 c 0,0.5273339 -1,0.5273339 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 z"
+     id="path4"
+     style="fill:#734a08;fill-opacity:1" />
+</svg>
Index: /trunk/images/presets/health/baby_hatch.svg
===================================================================
--- /trunk/images/presets/health/baby_hatch.svg	(revision 10565)
+++ /trunk/images/presets/health/baby_hatch.svg	(revision 10565)
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__baby_hatch3.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="-29.320109"
+     inkscape:cy="15.23225"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254"
+       width="16.000004"
+       height="16.000042"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2.0000017" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4293"
+       cx="11.062386"
+       cy="1045.5758"
+       rx="3.7681696"
+       ry="5.7863278" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.717651,1039.5637 c -4e-6,2.0577 -1.668114,3.7258 -3.725831,3.7258 -2.057717,0 -3.7258269,-1.6681 -3.7258307,-3.7258 z"
+       id="circle4295"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscc" />
+    <circle
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4291"
+       cx="10.99182"
+       cy="1039.5637"
+       r="2.201627" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4311"
+       width="5"
+       height="8"
+       x="0.9999997"
+       y="1040.3621"
+       rx="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/health/clinic.svg
===================================================================
--- /trunk/images/presets/health/clinic.svg	(revision 10565)
+++ /trunk/images/presets/health/clinic.svg	(revision 10565)
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__clinic.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-20.679487"
+     inkscape:cy="8.9290067"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254"
+       width="16.000008"
+       height="16.000046"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2.0000021" />
+    <g
+       id="g4302"
+       transform="matrix(0.85716634,0,0,0.85716634,2.8596806,150.89059)">
+      <path
+         sodipodi:nodetypes="cccccccccccccscc"
+         inkscape:connector-curvature="0"
+         id="path3772-4-3-0"
+         d="m 7.8178461,1041.8617 c -0.8260795,0 -1.4905882,0.7755 -1.4905882,1.7382 l 0,6.9336 c -0.013155,1.0862 1.3917706,1.0862 1.3785772,0 l 0,-5.722 0.710423,0 0,6.5506 4.4223349,0 0,-6.5506 0.78274,0 0,5.722 c -0.0133,1.0862 1.391832,1.0862 1.378576,0 l 0,-6.9342 c 0,-0.9625 -0.665741,-1.7381 -1.491821,-1.7381 l -5.6902419,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate" />
+      <ellipse
+         style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="ellipse4298-7"
+         cx="10.663416"
+         cy="1039.2753"
+         rx="1.9127603"
+         ry="1.9127849" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       d="m 6.0000019,1042.3621 3.000001,0 0,-2 -3.000001,0 0,-3 -2.0000009,0 0,3 -3.000001,0 0,2 3.000001,0 0,3 2.0000009,0 z"
+       style="fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path1883-7"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/health/dentist.svg
===================================================================
--- /trunk/images/presets/health/dentist.svg	(revision 10565)
+++ /trunk/images/presets/health/dentist.svg	(revision 10565)
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__dentist5.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="7.0126666"
+     inkscape:cy="3.0118006"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302-4"
+       width="16.000004"
+       height="16.000004"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       ry="2.0000398" />
+    <g
+       id="g4302"
+       transform="matrix(0.85716634,0,0,0.85716634,3.1425054,151.1699)">
+      <path
+         sodipodi:nodetypes="csccccccccccccccsscc"
+         inkscape:connector-curvature="0"
+         id="path3772-4-3-0"
+         d="m 7.8178461,1041.8617 c -0.8260795,0 -1.4905882,0.7755 -1.4905882,1.7382 l 0,0.9897 c -5.667e-4,0.019 -5.667e-4,0.038 0,0.056 l 0,0.1659 0,5.722 c -0.013155,1.0862 1.3917706,1.0862 1.3785772,0 l 0,-5.722 0.710423,0 0,6.5506 4.4223349,0 0,-6.5506 0.78274,0 0,5.722 c -0.0133,1.0862 1.391832,1.0862 1.378576,0 l 0,-5.8884 0,-1.0458 c 0,-0.9625 -0.665741,-1.7381 -1.491821,-1.7381 l -5.6902419,0 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate" />
+      <ellipse
+         style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="ellipse4298-7"
+         cx="10.663416"
+         cy="1039.2753"
+         rx="1.9127603"
+         ry="1.9127849" />
+    </g>
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.81100017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.9550687,1049.6092 c 0.2522249,0 1.0224663,-7.1573 2.0449317,-7.1573 1.0224651,0 1.8452307,7.1573 2.0449303,7.1573 0.1997009,0 2.0449306,-7.1573 2.0449306,-8.1797 -1.1e-6,-3.0674 -0.798849,-4.1218 -2.0449306,-4.09 -1.2461294,0.032 -1.1183212,1.0863 -2.0449303,1.0226 -0.9266092,-0.063 -0.9266102,-1.0226 -2.0449317,-1.0226 -1.1183212,0 -2.04493037,1.0226 -2.04493037,4.09 0,1.0224 1.83724217,8.1797 2.04493037,8.1797 z"
+       id="path4290"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="szzszzzss" />
+  </g>
+</svg>
Index: /trunk/images/presets/health/doctors.svg
===================================================================
--- /trunk/images/presets/health/doctors.svg	(revision 10565)
+++ /trunk/images/presets/health/doctors.svg	(revision 10565)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__doctors6.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="28.078209"
+     inkscape:cy="-41.468809"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-others="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-grids="false"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302-4"
+       width="16.000004"
+       height="16.000004"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       ry="2.0000398" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 3.0575769,1044.1832 c -1.4348265,0 -2.58901897,1.3471 -2.58901897,3.0193 l 0,5.1595 15.06362407,0 0,-5.1608 c 0,-1.6717 -1.156334,-3.0189 -2.591161,-3.0189 l -9.8834441,0 z"
+       id="path3772-4-3-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccscc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.48800027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 11.391375,1047.2349 c 0,0 1.95345,-5.1396 -3.1353008,-5.0913 -5.0381319,0.2084 -1.6479095,4.6118 -1.6479095,4.6118"
+       id="path4276"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.48800027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9.6431604,1050.1396 c 0,0 -0.9446954,-4.6105 -3.0349957,-3.3842 -2.2615752,1.3268 0.9432796,4.3927 0.9432796,4.3927"
+       id="path4278"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <ellipse
+       ry="3.3223372"
+       rx="3.322294"
+       cy="1039.6909"
+       cx="8.0000792"
+       id="ellipse4298-7"
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/health/hospital.svg
===================================================================
--- /trunk/images/presets/health/hospital.svg	(revision 10565)
+++ /trunk/images/presets/health/hospital.svg	(revision 10565)
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__hospital5.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-4.7044422"
+     inkscape:cy="9.9634056"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254"
+       width="16.000004"
+       height="16.000042"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2.0000017" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 10.000001,1046.3621 5.000001,0 0,-4 -5.000001,0 0,-5 -4.0000004,0 0,5 -5.0000009,0 0,4 5.0000009,0 0,5 4.0000004,0 z"
+       style="fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path1883"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/health/pharmacy.svg
===================================================================
--- /trunk/images/presets/health/pharmacy.svg	(revision 10565)
+++ /trunk/images/presets/health/pharmacy.svg	(revision 10565)
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__pharmacy.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="13.45603"
+     inkscape:cy="8.5318054"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254"
+       width="16.000004"
+       height="16.000042"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2.0000017" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 10.000001,1046.3621 5.000001,0 0,-4 -5.000001,0 0,-5 -4.0000004,0 0,5 -5.0000009,0 0,4 5.0000009,0 0,5 4.0000004,0 z"
+       style="fill:#007704;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path1883"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/health/veterinary.svg
===================================================================
--- /trunk/images/presets/health/veterinary.svg	(revision 10565)
+++ /trunk/images/presets/health/veterinary.svg	(revision 10565)
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__veterinary.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-20.679487"
+     inkscape:cy="8.9290067"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254"
+       width="16.000004"
+       height="16.000042"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2.0000017" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 6.0000006,1042.3621 3.0000005,0 0,-2 -3.0000005,0 0,-3 -2.0000004,0 0,3 -3.0000005,0 0,2 3.0000005,0 0,3 2.0000004,0 z"
+       style="fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path1883-7"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:#000000;stroke:none"
+       d="m 11.478895,1041.0537 -1.7913937,4.949 -5.660158,0 c -1.703812,0 -2.316408,1.9582 -2.316408,3.125 1.102218,-1.9407 2.314454,-1.9571 2.314454,-1.9571 l -0.8687628,4.9124 1.515626,0 0.666015,-2.6015 5.3515635,0 0.544923,2.6015 1.580079,0 -0.867189,-4.9512 0.943361,-1.6738 1.853516,0.7656 0.972656,-2.1875 -3.316407,-1.4121 z"
+       id="path4288-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/leisure/advertising_column.svg
===================================================================
--- /trunk/images/presets/leisure/advertising_column.svg	(revision 10565)
+++ /trunk/images/presets/leisure/advertising_column.svg	(revision 10565)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="01.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-9.401044"
+     inkscape:cy="15.432182"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-359px"
+       originy="-480px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-359,-556.36218)">
+    <rect
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       id="rect2993"
+       width="9"
+       height="2"
+       x="359"
+       y="570.36218" />
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="m 359,559.36218 0,-2 4.5,-1 4.5,1 0,2 z"
+       id="path3765"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="fill:#c87137;fill-opacity:1;stroke:none"
+       id="rect3769"
+       width="2"
+       height="1"
+       x="362"
+       y="559.36218" />
+    <rect
+       style="fill:#ffff00;fill-opacity:1;stroke:none"
+       id="rect3773"
+       width="5"
+       height="5"
+       x="362"
+       y="560.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3775"
+       width="2"
+       height="4"
+       x="360"
+       y="560.36218" />
+    <rect
+       style="fill:#ff0000;fill-opacity:1;stroke:none"
+       id="rect3777"
+       width="3"
+       height="4"
+       x="360"
+       y="564.36218" />
+    <rect
+       style="fill:#0000ff;fill-opacity:1;stroke:none"
+       id="rect3779"
+       width="4"
+       height="3"
+       x="363"
+       y="565.36218" />
+    <rect
+       style="fill:#ffcc00;fill-opacity:1;stroke:none"
+       id="rect3781"
+       width="4"
+       height="3"
+       x="360"
+       y="567.36218" />
+    <rect
+       style="fill:#800080;fill-opacity:1;stroke:none"
+       id="rect3783"
+       width="3"
+       height="2"
+       x="364"
+       y="568.36218" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect3771"
+       width="3"
+       height="3"
+       x="364"
+       y="559.36218" />
+    <rect
+       style="fill:#aa0000;fill-opacity:1;stroke:none"
+       id="rect3767"
+       width="2"
+       height="2"
+       x="360"
+       y="559.36218" />
+  </g>
+</svg>
Index: /trunk/images/presets/leisure/billboard.svg
===================================================================
--- /trunk/images/presets/leisure/billboard.svg	(revision 10565)
+++ /trunk/images/presets/leisure/billboard.svg	(revision 10565)
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- ClipArt by Arvin61r58 (http://openclipart.org/user-detail/Arvin61r58) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   viewBox="0 0 976.15625 729.85008"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%"
+   sodipodi:docname="11.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview69"
+     showgrid="false"
+     inkscape:zoom="0.43628026"
+     inkscape:cx="797.85974"
+     inkscape:cy="398.68092"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <title
+     id="title4370">Billboard Frame</title>
+  <defs
+     id="defs4">
+    <filter
+       id="filter4278"
+       height="1"
+       width="1"
+       color-interpolation-filters="sRGB"
+       y="0"
+       x="0">
+      <feTurbulence
+         id="feTurbulence4280"
+         baseFrequency="0.021000000000000001 0.021000000000000001"
+         seed="0"
+         result="result0"
+         numOctaves="2"
+         type="turbulence" />
+      <feSpecularLighting
+         id="feSpecularLighting4282"
+         specularConstant="1"
+         result="result1"
+         specularExponent="24.29999924"
+         surfaceScale="2">
+        <feDistantLight
+           id="feDistantLight4284"
+           elevation="45"
+           azimuth="225" />
+      </feSpecularLighting>
+      <feDiffuseLighting
+         id="feDiffuseLighting4286"
+         surfaceScale="3"
+         in="result0"
+         result="result2"
+         diffuseConstant="1.21000004">
+        <feDistantLight
+           id="feDistantLight4288"
+           elevation="42"
+           azimuth="225" />
+      </feDiffuseLighting>
+      <feBlend
+         id="feBlend4290"
+         mode="multiply"
+         in2="SourceGraphic"
+         result="result91" />
+      <feComposite
+         id="feComposite4292"
+         in="result1"
+         in2="result91"
+         k3="1"
+         k2="1"
+         k1="0"
+         result="result92"
+         k4="0"
+         operator="arithmetic" />
+      <feComposite
+         id="feComposite4294"
+         operator="in"
+         result="result2"
+         in2="SourceAlpha" />
+    </filter>
+    <linearGradient
+       id="linearGradient4347"
+       y2="556.90997"
+       gradientUnits="userSpaceOnUse"
+       x2="456.60001"
+       gradientTransform="matrix(1.0492,0,0,0.83928,66.33,399.54)"
+       y1="556.90997"
+       x1="357.79999">
+      <stop
+         id="stop3825"
+         style="stop-color:#8a8a8a"
+         offset="0" />
+      <stop
+         id="stop3827"
+         style="stop-color:#676767"
+         offset=".071429" />
+      <stop
+         id="stop3829"
+         style="stop-color:#878787"
+         offset=".14286" />
+      <stop
+         id="stop3831"
+         style="stop-color:#b5b5b5"
+         offset=".21429" />
+      <stop
+         id="stop3833"
+         style="stop-color:#d7d7d7"
+         offset=".28571" />
+      <stop
+         id="stop3835"
+         style="stop-color:#d5d5d5"
+         offset=".35714" />
+      <stop
+         id="stop3837"
+         style="stop-color:#c3c3c3"
+         offset=".42857" />
+      <stop
+         id="stop3839"
+         style="stop-color:#b3b3b3"
+         offset=".5" />
+      <stop
+         id="stop3841"
+         style="stop-color:#a3a3a3"
+         offset=".57143" />
+      <stop
+         id="stop3843"
+         style="stop-color:#929292"
+         offset=".64286" />
+      <stop
+         id="stop3845"
+         style="stop-color:#7a7a7a"
+         offset=".71429" />
+      <stop
+         id="stop3847"
+         style="stop-color:#696969"
+         offset=".78571" />
+      <stop
+         id="stop3849"
+         style="stop-color:#686868"
+         offset=".85714" />
+      <stop
+         id="stop3851"
+         style="stop-color:#656565"
+         offset=".92857" />
+      <stop
+         id="stop3853"
+         style="stop-color:#797979"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4353"
+       y2="715.01001"
+       gradientUnits="userSpaceOnUse"
+       x2="446.25"
+       gradientTransform="translate(3.2022,122.35)"
+       y1="689.37"
+       x1="446.25">
+      <stop
+         id="stop4109"
+         style="stop-color:#717171"
+         offset="0" />
+      <stop
+         id="stop4111"
+         style="stop-color:#e3e3e3"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4347"
+       id="linearGradient3096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492,0,0,0.83928,56.9452,90.310078)"
+       x1="357.79999"
+       y1="556.90997"
+       x2="456.60001"
+       y2="556.90997" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4353"
+       id="linearGradient3098"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(3.2022,122.35)"
+       x1="446.25"
+       y1="689.37"
+       x2="446.25"
+       y2="715.01001" />
+  </defs>
+  <rect
+     id="rect2985"
+     style="fill:url(#linearGradient3096);fill-rule:evenodd"
+     rx="12.852"
+     ry="11.842"
+     height="344.26999"
+     width="95.811996"
+     y="385.58008"
+     x="440.19519" />
+  <g
+     transform="matrix(1,0,0,1.0753,-7.25,-451.87197)"
+     id="g4132">
+    <g
+       transform="matrix(1,0,0,0.83333,21.422,173.53)"
+       id="g4125">
+      <rect
+         x="33.09"
+         y="740.15002"
+         width="16.011"
+         height="25.618"
+         style="fill:#000000;fill-rule:evenodd"
+         id="rect4115" />
+      <rect
+         x="898.76001"
+         y="740.15002"
+         width="16.011"
+         height="25.618"
+         style="fill:#000000;fill-rule:evenodd"
+         id="rect4117" />
+      <rect
+         x="682.34003"
+         y="740.15002"
+         width="16.011"
+         height="25.618"
+         style="fill:#000000;fill-rule:evenodd"
+         id="rect4119" />
+      <rect
+         x="249.50999"
+         y="740.15002"
+         width="16.011"
+         height="25.618"
+         style="fill:#000000;fill-rule:evenodd"
+         id="rect4121" />
+      <rect
+         x="465.92001"
+         y="740.15002"
+         width="16.011"
+         height="25.618"
+         style="fill:#000000;fill-rule:evenodd"
+         id="rect4123" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       d="m 966.48,812.6 9.1053,-0.0628 6.5646,23.891 -13.718,-0.2011 -473.09,0.061 -473.09,0.0242 -13.718,0.20109 6.5646,-23.891 9.1053,0.0628 471.13,-0.0833 z"
+       style="fill:url(#linearGradient3098);stroke:#000000;stroke-width:1.92869997"
+       id="path4083-2" />
+  </g>
+  <g
+     transform="matrix(1,0,0,1.0753,-4.8711,-332.50292)"
+     id="g4071"
+     style="fill:#803300">
+    <rect
+       x="14.971"
+       y="312.10001"
+       width="956"
+       height="366"
+       style="fill:#803300;stroke:#000000;stroke-width:5.78609991"
+       id="rect4043" />
+    <rect
+       x="20.938"
+       y="317.76999"
+       width="944.06"
+       height="354.66"
+       style="fill:#803300;fill-rule:evenodd;stroke:#828282;stroke-width:5.78609991"
+       id="rect4043-1" />
+  </g>
+  <metadata
+     id="metadata67">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>Billboard Frame</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <text
+     xml:space="preserve"
+     style="font-size:335.74322510000002000px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:40.81823348999999700px;word-spacing:0px;fill:#ffcc00;fill-opacity:1;stroke:none;font-family:Calibri"
+     x="37.716553"
+     y="308.91446"
+     id="text3111"
+     sodipodi:linespacing="125%"
+     transform="scale(1.0174037,0.98289404)"><tspan
+       sodipodi:role="line"
+       id="tspan3113"
+       x="37.716553"
+       y="308.91446"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Calibri;fill:#ffcc00">JOSM</tspan></text>
+</svg>
Index: /trunk/images/presets/leisure/bird_hide.svg
===================================================================
--- /trunk/images/presets/leisure/bird_hide.svg	(revision 10565)
+++ /trunk/images/presets/leisure/bird_hide.svg	(revision 10565)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="4.5155554mm"
+   height="4.5155554mm"
+   viewBox="0 0 15.999999 15.999999"
+   id="svg3616"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="02.svg">
+  <defs
+     id="defs3618" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="10.68096"
+     inkscape:cy="1.3277302"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3644"
+       originx="3.0589981"
+       originy="3.0584999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3621">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(522.28571,261.35208)">
+    <g
+       transform="matrix(1.6191054,0,0,1.6189416,-523.20536,-261.35208)"
+       id="g252">
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         d="M 1.75,0.2 C 1.209,0.2 0.768,0.64 0.768,1.18 l 0,7.523 c 0,0.54 0.441,0.979 0.982,0.979 l 7.52,0 c 0.541,0 0.98,-0.439 0.98,-0.979 l 0,-7.523 C 10.25,0.64 9.811,0.201 9.27,0.201 l -7.52,0 z"
+         id="path254" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 9.27,9.883 c 0.652,0 1.18,-0.527 1.18,-1.18 l 0,-7.523 C 10.449,0.527 9.922,0 9.27,0 L 1.75,0 C 1.098,0 0.568,0.527 0.568,1.18 l 0,7.523 c 0,0.652 0.529,1.18 1.182,1.18 l 7.52,0 z"
+         id="path256" />
+      <rect
+         style="fill:#ffffff"
+         x="3.6619999"
+         y="1.545"
+         width="1.2539999"
+         height="0.898"
+         id="rect258" />
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         d="M 6.332,5.42 C 6.213,5.42 6.117,5.324 6.117,5.205 l 0,-2.48 1.896,0 0.799,3.385 -0.003,0.218 0,1.496 c 0,0.115 -0.094,0.209 -0.209,0.209 l -1.844,0 C 6.641,8.033 6.547,7.939 6.547,7.824 l 0,-2.404 -0.199,0"
+         id="path260" />
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         d="M 4.695,5.426 C 4.814,5.426 4.91,5.33 4.91,5.211 l 0,-2.482 -1.892,0 -0.801,3.384 0.004,0.221 0,1.496 c 0,0.115 0.094,0.209 0.209,0.209 l 1.842,0 c 0.117,0 0.211,-0.094 0.211,-0.209 l 0,-2.404 0.197,0"
+         id="path262" />
+      <rect
+         style="fill:#ffffff"
+         x="5.1880002"
+         y="2.7290001"
+         width="0.64999998"
+         height="2.3050001"
+         id="rect264" />
+      <rect
+         style="fill:#ffffff"
+         x="6.1170001"
+         y="1.545"
+         width="1.256"
+         height="0.898"
+         id="rect266" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/leisure/casino.svg
===================================================================
--- /trunk/images/presets/leisure/casino.svg	(revision 10565)
+++ /trunk/images/presets/leisure/casino.svg	(revision 10565)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="73%"
+   height="100%"
+   viewBox="0 0 272.83196 373.82317"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="30.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="2.5252581"
+     inkscape:cx="53.270554"
+     inkscape:cy="272.63461"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     showguides="false" />
+  <title
+     id="title3924">Hotel has a casino</title>
+  <defs
+     id="defs25" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ffffff;fill-rule:evenodd"
+     id="path127"
+     d="M 32.344551,373.81427 C 14.444566,373.84771 0.05259428,359.41983 0.01660512,341.50894 L -4.3678e-5,341.4633 0.02881424,32.389577 C 0.02778757,14.424621 14.455235,0.03133824 32.357482,-1.8391e-5 L 240.46501,0.04956728 C 258.36724,0.01821204 272.80486,14.429535 272.79011,32.347081 l 0.0418,309.121839 c 0.001,17.96494 -14.4269,32.35692 -32.34574,32.34265 l -208.129564,0.0111 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ff0000;fill-rule:evenodd"
+     id="path131"
+     d="m 122.36392,119.93142 28.14385,-0.0363 -14.11474,-49.417165 -14.02911,49.453705 z m 34.77323,23.01259 -41.33333,-0.0905 -6.53008,22.67335 -26.646267,-0.0392 38.006617,-124.115479 31.56297,0.0091 38.02328,124.130789 -26.60858,0.0642 -6.47461,-22.6329 z" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ff0000;fill-rule:evenodd"
+     id="path139"
+     d="m 108.40674,209.70696 c -3.22172,0.0565 -6.77182,0.81704 -10.688583,2.61468 -42.717784,33.19441 14.882693,86.74844 39.161733,132.70968 l 0.73451,0.26565 c 26.71877,-50.28116 77.6009,-105.58036 38.70954,-132.99128 -30.76775,-13.99543 -38.98711,32.63384 -39.27381,34.33274 -0.27863,-1.49166 -6.526,-37.06043 -28.64339,-36.93147 z" />
+</svg>
Index: /trunk/images/presets/leisure/discoball.svg
===================================================================
--- /trunk/images/presets/leisure/discoball.svg	(revision 10565)
+++ /trunk/images/presets/leisure/discoball.svg	(revision 10565)
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15.990621"
+   height="15.991365"
+   id="svg3328"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="13.svg">
+  <defs
+     id="defs3330" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.4122314"
+     inkscape:cy="9.4363036"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3336"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-370.04571px"
+       originy="-504px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3333">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-370.04571,-532.37082)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.20253333;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3015"
+       sodipodi:cx="7.9542899"
+       sodipodi:cy="7.9913654"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="m 15.95429,7.9913654 a 8,8 0 1 1 -16.00000009,0 8,8 0 1 1 16.00000009,0 z"
+       transform="matrix(0.98749177,0,0,0.98749177,370.19091,532.47078)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.49520677;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 373.19531,534.36219 c 9.80919,0 9.80919,0 9.80919,0 l 0,0"
+       id="path3021"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.49083301000000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 370.29159,539.86219 c 15.41869,0 15.41869,0 15.41869,0"
+       id="path3023"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.49827286999999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 371.09799,536.86219 13.90344,0"
+       id="path3025"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.51020723999999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 370.71031,542.86219 14.57747,0"
+       id="path3027"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.47750598000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 372.57736,545.86231 10.94457,0"
+       id="path3029"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 6.625,2.0851154 -0.0625,2.46875"
+       id="path3801"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.39328711999999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 374.01446,537.11219 0.0312,2.7491"
+       id="path3803"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 378.35821,537.04969 0,2.71875"
+       id="path3816"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 382.32696,536.92469 0,2.9375"
+       id="path3818"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13.59375,4.3976154 -1.5625,-2.40625"
+       id="path3820"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 9.6875,4.5538654 9.40625,2.1476154"
+       id="path3822"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 372.67071,536.83094 1.34375,-2.28125"
+       id="path3824"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 5.09375,1.9288654 6.9116117,0.27640669"
+       id="path3826"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 10.8125,2.0226154 9.15625,0.33511543"
+       id="path3828"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 8.0625,2.0226154 0,-1.78124997"
+       id="path3830"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 1.375,7.6163654 2,10.366365"
+       id="path3834"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 5.5625,7.5538654 0.125,2.9999996"
+       id="path3836"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 10.25,7.6163654 0.15625,2.9374996"
+       id="path3838"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 14.5,7.6163654 14.15625,10.335115"
+       id="path3840"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 373.68633,542.98718 0.95313,2.8125"
+       id="path3842"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7.90625,10.647615 0.125,2.90625"
+       id="path3844"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 381.60821,545.83093 0.4375,-2.75"
+       id="path3846"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 375.92071,546.01843 1.40625,2.0625"
+       id="path3848"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:0.40000000000000002;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 9.40625,15.647615 c 0.125,-0.28125 0.71875,-2.0625 0.71875,-2.0625"
+       id="path3850"
+       inkscape:connector-curvature="0"
+       transform="translate(370.04571,532.37082)" />
+  </g>
+</svg>
Index: /trunk/images/presets/leisure/firepit.svg
===================================================================
--- /trunk/images/presets/leisure/firepit.svg	(revision 10565)
+++ /trunk/images/presets/leisure/firepit.svg	(revision 10565)
@@ -0,0 +1,875 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4688"
+   sodipodi:docname="fire01.svg"
+   sodipodi:modified="true"
+   height="459.80612"
+   sodipodi:version="0.32"
+   width="459.01599"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.48.4 r9939"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient14630"
+       inkscape:collect="always">
+      <stop
+         id="stop14631"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop14632"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient17250">
+      <stop
+         id="stop17251"
+         style="stop-color:#dc0000"
+         offset="0" />
+      <stop
+         id="stop17252"
+         style="stop-color:#ffb200"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient26051">
+      <stop
+         id="stop26052"
+         style="stop-color:#ffffff;stop-opacity:.44928"
+         offset="0" />
+      <stop
+         id="stop26053"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14625">
+      <stop
+         id="stop14626"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop14627"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3563"
+       y2="76.293999"
+       gradientUnits="userSpaceOnUse"
+       x2="507.63"
+       gradientTransform="translate(-313.09,42.247)"
+       y1="347.10001"
+       x1="494.23999"
+       inkscape:collect="always">
+      <stop
+         id="stop3559"
+         style="stop-color:black"
+         offset="0" />
+      <stop
+         id="stop3561"
+         style="stop-color:black;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter4458"
+       inkscape:collect="always"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur4460"
+         stdDeviation="8.8447956"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient4463"
+       y2="403.09"
+       xlink:href="#linearGradient14625"
+       gradientUnits="userSpaceOnUse"
+       x2="342.54001"
+       gradientTransform="matrix(0.68311,0,0,1.4639,22.742,-283.6)"
+       y1="246.21001"
+       x1="198.88"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4466"
+       y2="179.97"
+       xlink:href="#linearGradient26051"
+       gradientUnits="userSpaceOnUse"
+       x2="390.32001"
+       gradientTransform="matrix(0.54412,0,0,1.8378,0.3926,-250.42)"
+       y1="179.97"
+       x1="349.42999"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4470"
+       y2="306.76001"
+       xlink:href="#linearGradient17250"
+       gradientUnits="userSpaceOnUse"
+       x2="-1102.7"
+       gradientTransform="matrix(0.79621,0,0,1.7063,1125.5,-315.48)"
+       y1="404.57999"
+       x1="-1131"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4473"
+       y2="294.87"
+       xlink:href="#linearGradient26051"
+       gradientUnits="userSpaceOnUse"
+       x2="572.40997"
+       gradientTransform="matrix(0.60253,0,0,1.6597,0.3926,-252.45)"
+       y1="294.87"
+       x1="533.78003"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4476"
+       y2="485.78"
+       xlink:href="#linearGradient14625"
+       gradientUnits="userSpaceOnUse"
+       x2="317.14001"
+       gradientTransform="matrix(0.7951,0,0,1.2577,24.096,-278.86)"
+       y1="384.39999"
+       x1="501.39999"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4479"
+       y2="362.16"
+       xlink:href="#linearGradient17250"
+       gradientUnits="userSpaceOnUse"
+       x2="-857.96002"
+       gradientTransform="matrix(0.92675,0,0,1.4659,1125.5,-315.48)"
+       y1="438.47"
+       x1="-916.90002"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4489"
+       y2="853.09998"
+       gradientUnits="userSpaceOnUse"
+       x2="153.34"
+       gradientTransform="matrix(1.3317,0,0,0.75092,22.742,-276.15)"
+       y1="931.46002"
+       x1="124.57"
+       inkscape:collect="always">
+      <stop
+         id="stop13378"
+         style="stop-color:#fdffff"
+         offset="0" />
+      <stop
+         id="stop13379"
+         style="stop-color:#fdffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4498"
+       y2="500.79999"
+       gradientUnits="userSpaceOnUse"
+       x2="323.10001"
+       gradientTransform="matrix(0.80596,0,0,1.2407,18.001,-263.96)"
+       y1="256.78"
+       x1="9.6549997"
+       inkscape:collect="always">
+      <stop
+         id="stop29187"
+         style="stop-color:#ffffff"
+         offset="0" />
+      <stop
+         id="stop29188"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4501"
+       y2="232.89999"
+       xlink:href="#linearGradient26051"
+       gradientUnits="userSpaceOnUse"
+       x2="502.45001"
+       gradientTransform="matrix(0.60694,0,0,1.6476,0.3926,-250.42)"
+       y1="232.89999"
+       x1="468.41"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4504"
+       y2="376.89999"
+       xlink:href="#linearGradient14625"
+       gradientUnits="userSpaceOnUse"
+       x2="239.46001"
+       gradientTransform="matrix(0.60192,0,0,1.6614,26.3,-269.45)"
+       y1="244.05"
+       x1="110.45"
+       inkscape:collect="always" />
+    <filter
+       id="filter6454"
+       height="1.3779"
+       width="1.136"
+       y="-0.18895"
+       x="-0.067992002"
+       inkscape:collect="always"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur6456"
+         stdDeviation="7.2835937"
+         inkscape:collect="always" />
+    </filter>
+    <filter
+       id="filter8363"
+       height="1.6823"
+       width="1.2516"
+       y="-0.34112999"
+       x="-0.12582"
+       inkscape:collect="always"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur8365"
+         stdDeviation="5.4634181"
+         inkscape:collect="always" />
+    </filter>
+    <linearGradient
+       id="linearGradient9274"
+       y2="1102.5"
+       xlink:href="#linearGradient14630"
+       gradientUnits="userSpaceOnUse"
+       x2="94.621002"
+       gradientTransform="matrix(1.1002,-1.2538,0.4506,0.39539,-311.02,864.05)"
+       y1="1126.7"
+       x1="82.559998"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient9276"
+       y2="713.54999"
+       xlink:href="#linearGradient14625"
+       gradientUnits="userSpaceOnUse"
+       x2="122.42"
+       gradientTransform="matrix(-0.34546,-1.1031,0.82555,-0.25853,-265.09,1483.1)"
+       y1="743.14001"
+       x1="78.646004"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3563"
+       id="linearGradient3221"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-313.09,42.247)"
+       x1="494.23999"
+       y1="347.10001"
+       x2="507.63"
+       y2="76.293999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.2948,-1.0517,-0.37798,0.46531,867.81,-33.651)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26051"
+       id="linearGradient3225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.51746,-0.4067,0.36243,-0.74685,-331.74,418.2)"
+       x1="-960.97998"
+       y1="563.04999"
+       x2="-928.92999"
+       y2="563.04999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6681,0,0,0.59948,24.837,-275.56)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14625"
+       id="linearGradient3229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.156,0,0,0.86508,22.442,-276.15)"
+       x1="96.398003"
+       y1="789.25"
+       x2="142.50999"
+       y2="733.95001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3231"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5531,0.60876,-0.21878,0.55814,242.02,-319.14)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3233"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1701,-1.1889,0.42727,0.4205,-456.67,35.746)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3235"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69089,-1.5183,0.54565,0.24829,-495.04,283.93)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.70286,-1.5128,0.54367,-0.2526,-290.4,830.24)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25641,-1.6483,-0.59236,-0.092149,851,668.48)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.74876,-1.4906,-0.5357,0.26909,944.83,255.49)"
+       x1="82.559998"
+       y1="1126.7"
+       x2="94.621002"
+       y2="1102.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26051"
+       id="linearGradient3243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5769,-0.25828,0.2613,1.0001,490.26,-420.38)"
+       x1="-961.27002"
+       y1="562.82001"
+       x2="-929.40997"
+       y2="562.82001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26051"
+       id="linearGradient3245"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42511,-0.53051,0.57538,0.68663,219.53,-461.45)"
+       x1="-961.12"
+       y1="562.94"
+       x2="-929.15997"
+       y2="562.94" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26051"
+       id="linearGradient3247"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.019583,-0.86239,1.1799,-0.025248,-445.95,-360.55)"
+       x1="-961.33002"
+       y1="562.77002"
+       x2="-929.51001"
+       y2="562.77002" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26051"
+       id="linearGradient3249"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.5802,-0.42153,0.40645,-0.77422,-466.27,461.47)"
+       x1="-961.04999"
+       y1="562.98999"
+       x2="-929.03998"
+       y2="562.98999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17250"
+       id="linearGradient3251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93941,0,0,1.4462,1125.5,-315.48)"
+       x1="-1006.6"
+       y1="448.67999"
+       x2="-953.88"
+       y2="299.89001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4498"
+       id="linearGradient3253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.80596,0,0,1.2407,18.001,-263.96)"
+       x1="9.6549997"
+       y1="256.78"
+       x2="323.10001"
+       y2="500.79999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17250"
+       id="linearGradient3255"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70158,0,0,1.9364,1125.5,-315.48)"
+       x1="-1308.2"
+       y1="330.20001"
+       x2="-1335"
+       y2="272.82001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14625"
+       id="linearGradient3257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.156,0,0,0.86508,22.742,-276.15)"
+       x1="78.646004"
+       y1="743.14001"
+       x2="122.42"
+       y2="713.54999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient26051"
+       id="linearGradient3259"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.60694,0,0,1.6476,0.3926,-250.42)"
+       x1="468.41"
+       y1="232.89999"
+       x2="502.45001"
+       y2="232.89999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14630"
+       id="linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3185,0,0,0.75843,23.041,-277.35)"
+       x1="230.94"
+       y1="927.57001"
+       x2="163.66"
+       y2="832.44" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     pagecolor="#ffffff"
+     inkscape:zoom="0.9605174"
+     inkscape:window-x="-8"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="485.96284"
+     inkscape:cy="176.01957"
+     inkscape:window-y="-8"
+     inkscape:window-height="988"
+     inkscape:pageopacity="0.0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1" />
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-60.95064,-15.829491)">
+    <g
+       id="g9278"
+       transform="matrix(1.3860633,0,0,1,-23.530807,0)">
+      <path
+         id="path2412"
+         style="fill:url(#linearGradient3221);fill-rule:evenodd;filter:url(#filter4458)"
+         d="m 215.89,37.057 c -1.56,1.709 -3.13,3.417 -4.69,5.125 -9.31,12.175 -23.43,23.408 -22.69,40.282 -0.1,14.029 5.43,27.116 9.57,40.276 0.82,-0.94 1.64,-1.91 2.46,-2.9 0.18,0.48 0.35,0.94 0.54,1.44 7.16,-8.25 10.27,-14.33 11.31,-19.66 1.73,6.46 3,12.73 3.84,18.81 0.1,2.71 0.27,5.51 0.5,8.41 -7.8,32.63 -26.87,44.46 -23.4,79.69 -2.89,-19.64 -4.89,-36.69 -0.85,-51.13 -2.31,-17.9 -4.63,-33.2 -22.53,-45.91 5.49,22.24 11.83,55.76 -6.94,64.13 -2.99,6.15 -12.85,20.9 -15.25,43.28 -1.32,4.25 -2.43,8.59 -3.25,12.97 -0.85,5.24 -1.09,10.5 -0.78,15.72 -0.32,7.79 0.54,15.6 2.81,23.31 0.43,1.18 0.87,2.33 1.32,3.47 -4.19,-2.02 -8.38,-4.47 -12.57,-8.66 8.26,24.4 18.57,43.89 31.94,58.5 l -31.62,17.91 -0.32,-0.19 -5.09,9.85 4.94,3.37 -39.065,10.78 c -1.213,0.06 -2.418,0.28 -3.593,0.69 -8.832,3.07 -12.746,15.26 -8.719,27.22 4.027,11.96 14.481,19.19 23.317,16.12 1.08,-0.37 2.07,-0.9 3,-1.53 l 0.09,0.22 50.12,-36.25 3.6,2.47 8.59,-5 -5.94,9.47 0.32,0.09 -0.82,6.81 -27.03,23.1 c -1.78,0.64 -3.4,1.59 -4.75,2.97 -2.95,3.02 -4.05,7.3 -3.5,11.84 v 0.03 c 0.03,0.19 0.04,0.38 0.07,0.56 0.29,3.56 1.78,7.35 4.37,10.44 0.34,0.41 0.7,0.8 1.06,1.16 0.64,0.78 1.32,1.52 2.07,2.25 8.39,8.21 20.18,9.77 26.34,3.47 1.81,-1.85 2.94,-4.16 3.41,-6.72 l 29.09,-42.88 9.44,0.94 1.47,0.53 0.15,-0.34 1.35,0.12 -0.29,-2.53 4.63,-10.28 0.91,50.13 c -0.58,1.71 -0.85,3.51 -0.82,5.37 0.2,10.24 10.21,18.3 22.35,18 0.8,-0.02 1.59,-0.1 2.37,-0.19 0.61,-0.05 1.2,-0.15 1.78,-0.25 0.22,-0.04 0.44,-0.07 0.66,-0.12 2.04,-0.41 3.94,-1.08 5.62,-1.94 0.03,-0.01 0.07,-0.02 0.1,-0.03 0.47,-0.25 0.93,-0.51 1.37,-0.78 5.96,-3.46 9.85,-9.27 9.72,-15.78 -0.05,-2.74 -0.81,-5.35 -2.12,-7.66 l -14.41,-51.91 8.97,5.85 39.94,53.03 c 1.13,1.77 2.59,3.3 4.37,4.47 5.77,3.77 13.19,2.74 18.81,-1.97 2.39,-1.11 4.57,-3.21 6.1,-6.13 1.72,-3.27 2.29,-6.97 1.81,-10.28 0.12,-3.99 -0.91,-7.8 -2.94,-10.87 l 0.44,-0.31 -1.59,-1.25 c -0.89,-1.04 -1.9,-1.96 -3.07,-2.72 -0.48,-0.32 -0.99,-0.6 -1.5,-0.85 l -27.53,-21.59 7.72,-2.19 v -11.28 l -0.06,0.03 v -0.19 l -1.16,0.38 -15.47,-8.44 c 1.05,-0.06 2.09,-0.15 3.13,-0.25 l 62.44,35.78 c 0.76,0.8 1.61,1.52 2.56,2.13 1.35,0.87 2.82,1.46 4.31,1.81 l 1.41,0.81 0.19,-0.53 c 6.39,0.76 13.32,-2.77 17.34,-9.53 0.43,-0.72 0.79,-1.44 1.12,-2.19 0.12,-0.2 0.24,-0.4 0.35,-0.62 1.91,-3.93 2.21,-8.47 1.12,-12.16 -0.89,-4.1 -3.1,-7.73 -6.59,-9.97 -0.2,-0.12 -0.39,-0.22 -0.59,-0.34 l 0.06,-0.19 -0.81,-0.19 c -1.84,-0.91 -3.81,-1.37 -5.82,-1.43 l -30.93,-7.66 18.84,-20.84 -7.28,-7.97 -0.69,0.81 -2.09,-0.12 c 8.71,-14.52 11.69,-33.14 6.25,-54.41 -6.98,12.84 -11.55,19.99 -23.07,23.84 3.52,-13.99 1.01,-28.63 0.5,-42.87 0.16,-4.79 0.86,-9.48 2.04,-14.03 -0.44,11.08 3.47,21.67 5.93,32.34 0.81,-0.77 1.63,-1.56 2.44,-2.37 0.29,1.01 0.58,2.03 0.91,3.09 12.15,-11.71 13.13,-18.36 12.28,-25.75 0.16,-2.11 0.01,-4.29 -0.53,-6.53 -0.01,-2.86 -1.11,-5.53 -1.75,-8.19 1.17,-4.96 4.67,-12.05 8.18,-23.66 -0.9,1.05 -1.8,2.06 -2.71,3 1.57,-4.51 3,-9.09 4.15,-13.75 -1.71,1.56 -3.41,3.11 -5.12,4.66 -3.24,3.43 -6.98,6.81 -10.5,10.34 4.58,-6.06 9.93,-11.56 15.78,-16.31 0.04,-0.05 0.06,-0.1 0.09,-0.15 0.31,-0.25 0.6,-0.51 0.91,-0.75 -0.16,0.01 -0.31,0.04 -0.47,0.06 1.83,-3.69 -2.79,-4.98 -6.13,-5.06 -10.95,1.55 -22.03,5.39 -31.59,11.37 5.43,-18.59 5.5,-38.65 -8.59,-55.78 -4.49,14.94 -9.55,27.03 -16.66,38.22 -2.39,-6.97 -6.44,-13.55 -10.97,-19.63 3.26,-14.35 5.03,-28.49 -0.09,-43.72 1.44,-20.21 -31.78,-19.6 -32.06,-81.401 -14.63,18.435 -23.43,33.94 -26.38,55.218 -2.49,-3.447 -4.48,-5.826 -3.22,1.875 0.07,1.411 0.16,2.808 0.28,4.218 -0.53,-0.83 -1.07,-1.67 -1.62,-2.5 0.28,-2.195 0.22,-4.287 -0.03,-6.374 0,-2.112 -0.27,-4.282 -0.88,-6.469 0.02,-4.585 -2.72,-8.293 -3.59,-12.437 0.57,-5.83 3.98,-14.364 6.9,-28.75 -0.41,0.582 -0.82,1.163 -1.25,1.719 0.84,-3.559 1.59,-7.155 2.1,-10.782 z m 82.25,61.844 c -0.48,2.249 -0.96,4.499 -1.44,6.749 -1.87,7.98 -1.02,16.78 -4.5,24.22 -8.14,6.22 -11.69,17.79 -8.12,27.59 0.84,6.26 2.54,8.57 5.31,6 0.13,0.42 0.25,0.82 0.4,1.25 16.21,-16.61 18.93,-26.48 17.47,-35.47 -0.07,-2.76 -0.57,-5.54 -1.65,-8.34 -2.5,-7.32 -4.69,-14.78 -7.47,-21.999 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15367"
+         style="fill:#924b00;fill-rule:evenodd;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 350.15,401.03 -77.1,-44.18 13,-10.39 77.1,19.06 -13,35.51 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15362"
+         style="fill:#c15300;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 340.42,373.48 c 5.31,-8.93 15.73,-12.26 23.25,-7.43 7.53,4.83 9.33,15.99 4.02,24.93 -5.32,8.93 -15.73,12.26 -23.26,7.43 -7.52,-4.83 -9.32,-15.99 -4.01,-24.93 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path18511"
+         style="fill:none;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 354.89,383.43 c 0.58,-0.49 0.89,0.63 0.74,1.07 -0.39,1.2 -1.86,1.18 -2.67,0.55 -1.46,-1.12 -1.37,-3.46 -0.3,-4.83 1.57,-2.01 4.43,-1.78 6.1,-0.03 2.23,2.34 1.95,6.31 -0.16,8.59 -2.64,2.87 -7.01,2.42 -9.51,-0.49 -3.03,-3.52 -2.55,-9.17 0.6,-12.34 3.71,-3.75 9.62,-3.07 12.94,1 3.83,4.69 3.14,12.04 -1.05,16.1 -4.77,4.62 -12.23,3.71 -16.36,-1.51 -4.63,-5.87 -3.75,-14.92 1.5,-19.87 5.83,-5.5 14.83,-4.35 19.78,2.04"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24798"
+         style="fill:url(#linearGradient3223);fill-rule:evenodd"
+         d="m 306.39,354.84 c -7.11,6.16 -11.78,4.67 -24.02,7.05 17.03,8.63 38.85,22.99 56.7,31.91 -3.76,-7.6 -3.23,-17.34 0.09,-25.41 -10.66,-0.66 -24.27,-3.26 -32.77,-13.55 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21020"
+         style="fill:url(#linearGradient3225)"
+         d="m 353.47,375.85 c 3.05,-6.29 9.03,-8.64 13.36,-5.24 4.32,3.4 5.36,11.26 2.3,17.55 -3.05,6.29 -9.03,8.63 -13.36,5.24 -4.32,-3.4 -5.35,-11.26 -2.3,-17.55 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15363"
+         style="fill:#924b00;fill-rule:evenodd;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 91.99,366.38 50.25,-13.86 39.85,3.47 -71.91,51.97 -6.93,-15.59 -11.26,-25.99 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15364"
+         style="fill:#924b00;fill-rule:evenodd;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 147.43,420.96 18.2,17.33 32.92,-48.52 -9.53,-9.53 -14.73,-1.73 -41.58,35.52 14.72,6.93 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15365"
+         style="fill:#924b00;fill-rule:evenodd;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 242.73,434.82 13.86,-5.2 -26.85,-97.03 -16.47,11.27 1.74,96.16 27.72,-5.2 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15366"
+         style="fill:#924b00;fill-rule:evenodd;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 300.77,437.42 -10.39,-3.47 -50.25,-66.7 14.73,-8.67 64.11,50.25 -15.6,11.26 -2.6,17.33 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4578"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
+         style="fill:#000000;fill-rule:evenodd;filter:url(#filter6454)"
+         d="m 180.81,316.6 -44.75,25.32 -0.32,-0.19 -5.09,9.84 33.69,23.1 8.62,-5 -5.94,9.47 0.29,0.09 -1.32,11 28.28,1.72 12.91,1.28 1.34,0.47 0.16,-0.31 1.34,0.12 -0.28,-2.56 12.66,-28.19 40.69,26.63 30.34,-8.66 v -11.28 l -0.06,0.03 v -0.19 l -1.16,0.38 -61.15,-33.38 v -12.75 l -16.19,4.03 -0.69,-0.37 -12.59,3.53 -20.78,-14.13 z m 77.21,31.19 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15358"
+         style="fill:#c15300;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 115.78,382.05 c 4.03,11.96 0.13,24.15 -8.7,27.22 -8.835,3.07 -19.271,-4.15 -23.299,-16.11 -4.027,-11.95 -0.128,-24.15 8.704,-27.21 8.835,-3.07 19.265,4.14 23.295,16.1 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15359"
+         style="fill:#c15300;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 160.64,415.1 c 8.4,8.21 10.21,19.99 4.05,26.29 -6.16,6.29 -17.97,4.74 -26.37,-3.47 -8.4,-8.21 -10.21,-19.98 -4.05,-26.28 6.16,-6.3 17.97,-4.75 26.37,3.46 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15360"
+         style="fill:#c15300;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 235.64,416.62 c 12.13,-0.3 22.14,7.77 22.34,18.01 0.2,10.24 -9.49,18.8 -21.62,19.1 -12.13,0.3 -22.14,-7.77 -22.34,-18.01 -0.2,-10.24 9.48,-18.8 21.62,-19.1 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15361"
+         style="fill:#c15300;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 290.65,412.58 c 5.4,-9.26 15.99,-12.71 23.64,-7.71 7.65,5.01 9.48,16.58 4.08,25.84 -5.4,9.26 -15.99,12.72 -23.64,7.71 -7.65,-5 -9.47,-16.58 -4.08,-25.84 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path16000"
+         style="fill:#994200;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+         d="m 135.38,341.58 44.97,-25.45 24.26,16.46 -22.45,30.98 -18.27,10.61 -28.51,-32.6 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path16001"
+         style="fill:#994200;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+         d="m 166.57,378.66 29.38,-46.93 34.65,-8.66 v 19.92 l -22.52,50.25 -41.51,-14.58 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15996"
+         style="fill:#c15300;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+         d="m 135.31,341.26 -5.1,9.83 33.68,23.09 3.76,-14.04 -32.34,-18.88 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15997"
+         style="fill:#c15300;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+         d="m 207.61,381.53 0.44,10.78 -42.5,-2.56 1.34,-11.24 40.72,3.02 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path17886"
+         style="fill:none;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 97.362,386.42 c 0.128,0.93 -0.879,0.42 -1.161,-0.05 -0.766,-1.28 -0.11,-2.72 0.738,-3.07 1.516,-0.61 3.301,1.2 3.911,3.27 0.89,3.04 -0.54,5.7 -2.64,6.07 -2.806,0.49 -5.789,-2.71 -6.656,-6.47 -1.091,-4.74 1.171,-8.75 4.537,-9.09 4.079,-0.41 8.289,4.23 9.399,9.69 1.31,6.44 -1.8,11.8 -6.433,12.1 -5.346,0.34 -10.801,-5.75 -12.15,-12.91 -1.533,-8.13 2.442,-14.86 8.337,-15.11 6.616,-0.28 13.316,7.27 14.896,16.12 1.76,9.83 -3.08,17.92 -10.236,18.12"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path18508"
+         style="fill:none;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 147.24,426.16 c 0.62,0.71 -0.5,0.83 -1,0.59 -1.34,-0.65 -1.58,-2.21 -1.06,-2.97 0.94,-1.34 3.42,-0.81 5.06,0.6 2.41,2.05 2.68,5.06 1.12,6.52 -2.08,1.95 -6.33,0.9 -9.12,-1.77 -3.51,-3.38 -3.8,-7.97 -1.17,-10.09 3.19,-2.58 9.25,-1 13.17,2.96 4.62,4.67 4.95,10.87 1.23,13.65 -4.28,3.21 -12.18,1.1 -17.23,-4.15 -5.73,-5.97 -6.09,-13.77 -1.29,-17.21 5.38,-3.85 15.12,-1.21 21.29,5.34 6.85,7.26 7.23,16.68 1.35,20.77"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path18509"
+         style="fill:none;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 234.69,436.26 c 0.81,0.24 0.07,1.1 -0.4,1.21 -1.28,0.3 -2.26,-0.97 -2.28,-2.01 -0.03,-1.85 2,-3.02 3.88,-2.83 2.76,0.27 4.5,2.84 4.15,5.22 -0.46,3.17 -4,5.05 -7.35,4.46 -4.21,-0.75 -6.79,-4.74 -6.03,-8.44 0.92,-4.49 6.02,-7.09 10.83,-6.08 5.67,1.19 9.09,6.63 7.91,11.65 -1.37,5.8 -8.04,9.14 -14.31,7.71 -7.13,-1.63 -11.4,-8.54 -9.78,-14.88 1.81,-7.11 10.05,-11.19 17.78,-9.32 8.59,2.07 13.71,10.43 11.66,18.09"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path18510"
+         style="fill:none;stroke:#000000;stroke-width:1.90069997;stroke-linejoin:bevel;stroke-opacity:0.34350999"
+         d="m 304.99,421.92 c 0.57,-0.25 0.49,0.78 0.25,1.11 -0.64,0.91 -1.73,0.5 -2.17,-0.26 -0.77,-1.35 -0.03,-3.3 1.16,-4.17 1.75,-1.28 3.83,-0.32 4.59,1.63 1,2.59 -0.34,5.87 -2.57,7.24 -2.81,1.71 -5.96,0.14 -7.01,-3 -1.26,-3.81 0.71,-8.47 3.98,-10.31 3.85,-2.17 8.1,0.02 9.43,4.37 1.53,5.02 -1.08,11.07 -5.39,13.37 -4.9,2.63 -10.24,-0.18 -11.85,-5.73 -1.8,-6.24 1.45,-13.67 6.8,-16.45 5.94,-3.08 12.38,0.35 14.27,7.11"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21024"
+         style="fill:url(#linearGradient3227);fill-rule:evenodd"
+         d="m 208.25,380.47 1.33,12.58 -43.39,-4.36 1.34,-11.24 40.72,3.02 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21022"
+         style="fill:url(#linearGradient3229);fill-rule:evenodd"
+         d="m 168.4,377.6 18.91,-31.66 7.71,0.92 21.25,12.74 -9.05,21.8 -38.82,-3.8 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24782"
+         style="fill:url(#linearGradient3231);fill-rule:evenodd"
+         d="m 165.29,361.27 -1.85,11.59 -32.22,-21.98 5.34,-9.98 28.73,20.37 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24788"
+         style="fill:url(#linearGradient3233);fill-rule:evenodd"
+         d="m 140.04,359.91 c 6.51,4.08 13.02,8.16 19.52,12.25 -14.44,9.91 -27.6,18.86 -43.33,29.74 2.89,-7.98 3.2,-17.23 -0.99,-24.88 10.52,-1.84 17.5,-5.94 24.8,-17.11 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24790"
+         style="fill:url(#linearGradient3235);fill-rule:evenodd"
+         d="m 171.55,390.97 c 9.12,0.64 15.02,0.31 24.46,1.26 -9.52,13.95 -15.27,23.01 -27.27,38.95 -0.03,-8.48 -4.84,-16.96 -11.4,-22.71 9.25,-5.34 11.18,-4.5 14.21,-17.5 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24792"
+         style="fill:url(#linearGradient3237);fill-rule:evenodd"
+         d="m 224.11,365.22 c 7.71,5.63 12.21,7.41 16.71,9.83 4.21,17 7.98,28.6 12.64,47.15 -6.45,-5.5 -15.01,-9.04 -23.64,-7.8 1.97,-10.5 2.19,-38.42 -5.71,-49.18 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24794"
+         style="fill:url(#linearGradient3239);fill-rule:evenodd"
+         d="m 223.63,363.88 c -4.26,5.9 -6.59,10.83 -9.56,15.45 0.66,17.51 0.68,28.58 1.33,47.69 5.32,-8.36 11.92,-12.85 20.56,-14.04 -4.8,-9.55 -16.94,-36.58 -12.33,-49.1 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24796"
+         style="fill:url(#linearGradient3241);fill-rule:evenodd"
+         d="m 262.94,388.47 c -3.73,-2.08 -0.45,1.27 -9.85,-5.07 10.05,13.57 21.5,29.29 34.11,44.76 -2.98,-10.01 4.18,-17.14 10.52,-23.13 -9.45,-4.98 -17.09,-19 -34.78,-16.56 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21016"
+         style="fill:url(#linearGradient3243)"
+         d="m 100.69,382.77 c 2.2,8.41 0.07,17 -4.756,19.16 -4.823,2.16 -10.522,-2.92 -12.721,-11.34 -2.2,-8.42 -0.07,-17 4.752,-19.16 4.823,-2.16 10.522,2.92 12.725,11.34 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21017"
+         style="fill:url(#linearGradient3245)"
+         d="m 148.09,418.45 c 4.84,5.78 5.89,14.07 2.33,18.51 -3.55,4.43 -10.36,3.34 -15.21,-2.44 -4.84,-5.78 -5.89,-14.07 -2.34,-18.51 3.56,-4.43 10.37,-3.34 15.22,2.44 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21018"
+         style="fill:url(#linearGradient3247)"
+         d="m 236.3,427.51 c 9.93,-0.22 18.12,5.46 18.28,12.67 0.17,7.21 -7.76,13.24 -17.69,13.45 -9.93,0.21 -18.12,-5.47 -18.29,-12.68 -0.16,-7.21 7.77,-13.23 17.7,-13.44 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21019"
+         style="fill:url(#linearGradient3249)"
+         d="m 302.09,417.57 c 3.42,-6.52 10.13,-8.95 14.98,-5.43 4.85,3.52 6.01,11.67 2.59,18.19 -3.42,6.52 -10.14,8.95 -14.99,5.43 -4.84,-3.53 -6,-11.67 -2.58,-18.19 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15991"
+         style="fill:url(#linearGradient3251);fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 135.31,265.02 c 19.34,57.18 49.95,87.5 104.82,90.97 60.35,19.34 116.38,-20.22 100.49,-82.3 -7.22,13.28 -11.84,20.5 -24.25,24.25 4.91,-34.36 -26.57,-40.14 -11.27,-77.1 10.69,-22.81 17.04,-50.82 -1.73,-73.64 -7.79,25.99 -17.32,43.32 -36.38,62.38 2.02,-31.77 18.77,-57.47 8.66,-87.5 1.44,-20.21 -31.77,-19.64 -32.05,-81.435 -21.08,26.568 -30.04,47.07 -26.86,87.495 -7.8,32.64 -26.86,44.47 -23.39,79.71 -2.89,-19.64 -4.91,-36.68 -0.87,-51.12 -2.31,-17.9 -4.62,-33.21 -22.52,-45.91 5.49,22.23 11.84,55.73 -6.93,64.1 -5.2,10.69 -31.19,47.36 -2.6,104.83 -8.37,-4.91 -16.75,-6.35 -25.12,-14.73 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path29198"
+         style="fill:url(#linearGradient3253);fill-rule:evenodd"
+         d="m 237.31,53.087 c -14.99,19.685 -21.35,44.824 -19.44,69.333 1.43,11.99 -4.94,23.15 -9.48,33.86 -8.34,15.96 -15.89,33.39 -13.61,51.83 -0.65,10.63 -5.37,-0.08 -4.88,-5.43 -2.26,-15.03 -3.23,-30.63 -0.14,-45.52 -1.56,-14.49 -5.23,-30.2 -17.2,-39.73 3.56,17.2 8.18,36.59 -0.4,53.03 -3.08,5.51 -9.96,7.01 -11.4,13.63 -14.45,25.3 -15.53,56.84 -4.57,83.63 2.28,6.1 5.26,11.92 7.84,17.9 -8.04,-4.6 -16.88,-7.72 -24.65,-12.75 10.77,31.54 31.26,62.58 63.6,74.86 12.71,5.41 26.58,6.42 40.02,8.55 29.45,9.2 66,3.16 85.43,-22.47 11.41,-14.83 14.58,-34.84 10.7,-52.91 -5.15,10.4 -14.06,18.83 -25.57,21.5 2.65,-13.35 -1.38,-26.72 -8.28,-38.14 -7.44,-12.18 -9.2,-27.59 -3.25,-40.76 9.01,-19.76 15.83,-43.68 5.33,-64.25 -3.25,-9.5 -5.54,-3.67 -7.19,3.06 -6.86,21.12 -20.73,39.09 -36.42,54.5 1.09,-21.55 8.61,-41.94 11.8,-63.12 1.83,-10.79 -0.27,-21.62 -2.53,-32.07 -1.54,-11.74 -13.77,-17.77 -18.94,-27.821 -9.2,-13.374 -12.26,-29.996 -12.8,-45.962 -1.32,1.75 -2.64,3.5 -3.97,5.25 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15990"
+         style="fill:url(#linearGradient3255);fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 234.07,347.32 c -45.92,-48.51 -53.72,-82.3 -23.39,-114.35 34.07,-60.64 25.7,-98.76 0.86,-135.15 23.39,80.57 -27.72,132.55 -44.18,155.94 -9.82,-30.32 -1.44,-43.32 12.13,-80.57 -26.57,28.88 -42.74,63.82 -32.92,97.03 17.9,49.96 60.06,60.93 87.5,77.1 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15994"
+         style="fill:#ffd700;fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 289.79,164.02 c -6.16,-17.9 -1.13,-21.73 4.26,-29.55 5.56,-2.17 3.85,-9.72 6.89,-26.54 4.59,18.77 16.93,27.31 -11.15,56.09 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path20387"
+         style="fill:none;stroke:#000000;stroke-width:1.08610001pt;stroke-opacity:0.17938998"
+         d="m 168.17,360.4 13.06,-5.94"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path24159"
+         style="fill:url(#linearGradient3257);fill-rule:evenodd"
+         d="m 137.42,341.68 26.98,-14.9 22.08,17.69 -5.39,9.14 -13.84,5.94 -29.83,-17.87 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path28563"
+         style="fill:url(#linearGradient3259);fill-rule:evenodd"
+         d="m 296.71,104.99 c -1.88,7.98 -1.03,16.77 -4.5,24.22 -8.15,6.22 -11.7,17.77 -8.13,27.58 1.11,8.22 3.68,9.64 8.24,2.13 9.73,-10.01 18.84,-24.36 13.3,-38.71 -2.5,-7.32 -4.69,-14.75 -7.48,-21.973 -0.48,2.253 -0.96,4.503 -1.43,6.753 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path16002"
+         style="fill:#994200;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+         d="m 198.55,341.26 64.11,43.31 30.32,-14.72 -76.24,-41.59 -21.66,6.07 3.47,6.93 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path20388"
+         style="fill:none;stroke:#000000;stroke-width:1.08610001pt;stroke-opacity:0.17938998"
+         d="M 207.37,380.99 217.66,360"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21027"
+         style="fill:url(#linearGradient3261);fill-rule:evenodd"
+         d="m 195.53,339.72 64.11,43.31 30.32,-14.72 -76.24,-41.59 -21.66,6.07 3.47,6.93 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15998"
+         style="fill:#c15300;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+         d="m 195.08,334.33 v 10.39 l 67.58,44.19 30.32,-8.67 v -11.26 l -27.73,8.66 -70.17,-43.31 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path21028"
+         style="fill:url(#linearGradient4489);fill-rule:evenodd"
+         d="m 195.02,334.18 v 10.39 l 67.57,44.18 30.32,-8.66 v -11.26 l -27.72,8.66 -70.17,-43.31 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6461"
+         style="fill:#000000;fill-rule:evenodd;filter:url(#filter8363)"
+         d="m 281.37,323.77 -20.65,22.5 66.56,8.63 0.87,0.9 19.41,-21.47 -7.28,-7.96 -0.69,0.81 -58.22,-3.41 z"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g30446"
+         transform="translate(34.258,-832.81)">
+        <path
+           id="path16003"
+           sodipodi:nodetypes="ccccc"
+           style="fill:#994200;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+           d="m 307.14,1159 -58.99,-3.5 -20.66,22.5 67.89,8.8 11.76,-27.8 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path15999"
+           sodipodi:nodetypes="ccccc"
+           style="fill:#c15300;fill-rule:evenodd;stroke:#000000;stroke-width:1.42550004;stroke-opacity:0.20229002"
+           d="m 288.13,1180.4 6.81,7.2 19.4,-21.5 -7.28,-8 -18.93,22.3 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path20389"
+           style="fill:none;stroke:#000000;stroke-width:1.08610001pt;stroke-opacity:0.17938998"
+           d="m 288.92,1180.4 -46.32,-6.3"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path24784"
+           sodipodi:nodetypes="ccccc"
+           style="fill:url(#linearGradient9274);fill-rule:evenodd"
+           d="m 307.55,1159.2 5.84,7 -18.42,20.7 -6.37,-7.2 18.95,-20.5 z"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path24786"
+           sodipodi:nodetypes="cccccc"
+           style="fill:url(#linearGradient9276);fill-rule:evenodd"
+           d="m 287.85,1179.8 -39.05,-5.8 23.98,-16.2 15.8,0.7 16.39,0.6 -17.12,20.7 z"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         id="path15993"
+         style="fill:#ffd700;fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 329.36,273.69 c 15.88,-15.31 12.71,-21.95 11.26,-32.92 -4.62,-5.2 1.16,-12.13 6.93,-31.19 -14.72,17.04 -32.05,19.35 -18.19,64.11 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15992"
+         style="fill:url(#linearGradient4479);fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 254.86,347.32 c 17.9,-10.1 22.81,-41.87 25.12,-77.1 4.33,-34.08 13,-68.15 70.17,-73.64 -23.39,18.77 -42.45,41.87 -33.78,84.9 -2.31,62.67 -48.81,60.36 -61.51,65.84 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26056"
+         style="fill:url(#linearGradient4476);fill-rule:evenodd"
+         d="m 343.56,191.6 c -24.38,3.46 -49.51,18.11 -56.66,42.99 -11.49,31.1 -5.14,66.49 -20.8,96.36 -5.95,2.58 -4.5,13.67 2.85,11.5 21.51,-3.9 41.94,-18.85 47.39,-40.78 5.25,-15.24 2.27,-31.35 1.71,-47 0.72,-22.69 13.86,-43.16 31.11,-57.16 3.02,-4.35 -2.02,-5.81 -5.6,-5.91 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path28562"
+         style="fill:url(#linearGradient4473);fill-rule:evenodd"
+         d="m 343.86,203.49 c -9.82,10.4 -24.08,20.13 -23.73,36.12 -0.73,11.46 3.35,22.38 5.89,33.38 8.53,-8.14 18.22,-18.74 15.1,-31.58 -0.03,-5.65 -4.29,-10.6 -0.94,-16.11 3.21,-8.73 6.57,-17.41 8.81,-26.47 -1.71,1.55 -3.42,3.1 -5.13,4.66 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15989"
+         style="fill:url(#linearGradient4470);fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 223.67,323.93 c -2.31,-27.72 -5.49,-47.65 29.46,-72.77 59.19,-41.29 30.03,-65.26 -6.93,-108.29 10.97,42.74 -6.65,76.81 -21.66,99.63 -9.82,14.15 -43.9,43.02 -0.87,81.43 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path15995"
+         style="fill:#ffd700;fill-rule:evenodd;stroke:#ffff00;stroke-width:2.15630007;stroke-opacity:0.50382002"
+         d="m 201.09,120.58 c 15.99,-18.41 11.88,-25.987 9.27,-38.663 -5.55,-5.843 0.13,-14.122 4.68,-36.476 -14.56,20.374 -33.35,23.763 -13.95,75.139 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path28564"
+         style="fill:url(#linearGradient4466);fill-rule:evenodd"
+         d="m 211.21,41.518 c -9.31,12.174 -23.43,23.408 -22.69,40.281 -0.1,14.03 5.43,27.121 9.56,40.281 8.44,-9.63 17.42,-21.87 13.66,-35.445 0.03,-5.372 -3.73,-9.542 -3.84,-14.616 2.06,-11.975 6.31,-23.543 7.99,-35.626 -1.56,1.708 -3.12,3.417 -4.68,5.125 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26055"
+         style="fill:url(#linearGradient4463);fill-rule:evenodd"
+         d="m 245.3,135.71 c 6.41,29.13 -0.19,59.83 -14.93,85.42 -9.15,17.6 -27.2,31.08 -28.92,52.01 -2.76,18.25 10.39,33.46 22.57,45.24 4.96,6.24 0.71,-8.51 1.38,-11.96 -1.98,-17.95 1.1,-38.09 15.58,-50.4 16.13,-15.69 39.13,-26.56 46.85,-49.11 5.23,-19.91 -8.7,-37.76 -20.84,-51.9 -7.32,-8.88 -15.04,-17.41 -22.72,-25.99 0.35,2.23 0.69,4.46 1.03,6.69 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26054"
+         style="fill:url(#linearGradient4504);fill-rule:evenodd"
+         d="m 216.21,109.86 c 0.63,13.78 4.55,27.42 2.75,41.33 -1.58,32.46 -15.84,63 -35.54,88.41 -3.65,5.19 -7.54,10.21 -11.31,15.32 -5.03,-16.77 -2.76,-34.86 4.02,-50.77 3.57,-8.51 6.08,-17.34 7.39,-26.48 -18.82,17.17 -32.11,40.57 -36.78,65.63 -3.79,23.17 4.36,46.99 19.73,64.4 19.32,22.8 47.11,35.61 74.05,47.06 -15.26,-21.46 -36.51,-40.83 -41.02,-67.96 -3.1,-15.75 3.1,-31.55 13.45,-43.33 11.84,-16.27 19.21,-35.61 23.59,-55.15 5.69,-25.43 1.13,-52.94 -12.77,-74.99 -3.43,-2.51 -9.56,-15.687 -7.56,-3.47 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <metadata
+     id="metadata125">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2006-10-24T11:35:21</dc:date>
+        <dc:description>This fire is of the commemorative parties of São João, June Holiday's.
+\n
+\nFogueira comemorativa das festas de São João. Festejos de Junho.
+\n
+\nProduced with Inkscape 0.44+Devel and the shadow is blur tool.</dc:description>
+        <dc:source>https://openclipart.org/detail/876/fire-june-holidays-by-valessiobrito</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>valessiobrito</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>camp</rdf:li>
+            <rdf:li>campfire</rdf:li>
+            <rdf:li>commemorative</rdf:li>
+            <rdf:li>evening</rdf:li>
+            <rdf:li>fire</rdf:li>
+            <rdf:li>flame</rdf:li>
+            <rdf:li>heat</rdf:li>
+            <rdf:li>holiday</rdf:li>
+            <rdf:li>light source</rdf:li>
+            <rdf:li>party</rdf:li>
+            <rdf:li>warm</rdf:li>
+            <rdf:li>wood</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/leisure/fitness_station.svg
===================================================================
--- /trunk/images/presets/leisure/fitness_station.svg	(revision 10565)
+++ /trunk/images/presets/leisure/fitness_station.svg	(revision 10565)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="495.00113"
+   height="402.08099"
+   viewBox="0 0 495.00113 402.08099"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="02.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs19">
+	
+
+		
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview17"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="1.1508772"
+   inkscape:cx="328.1643"
+   inkscape:cy="139.8993"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg2" />
+
+<path
+   d="m 282.975,61.863 c 8.312,0 15.545,-3 21.703,-9.002 6.155,-6.002 9.234,-13.31 9.234,-21.922 0,-8.622 -3.079,-15.934 -9.234,-21.936 C 298.52,3.002 291.286,0 282.975,0 c -8.614,0 -15.921,3.002 -21.922,9.003 -6.002,6.002 -9.004,13.313 -9.002,21.936 -0.002,8.612 3,15.92 9.002,21.922 6.001,6.002 13.307,9.002 21.922,9.002 z"
+   id="path11"
+   style="fill:#501616"
+   inkscape:connector-curvature="0" /><path
+   d="m 26.296,246.986 83.56,0 c 3.389,0 6.465,-0.306 9.228,-0.916 7.081,-1.23 12.007,-3.386 14.778,-6.467 l 41.082,-45.703 48.014,46.168 -19.386,86.32 c -0.62,1.851 -0.93,3.391 -0.93,4.621 0,5.541 2,10.312 6.001,14.313 4.001,4.001 8.772,6.002 14.315,6.002 10.462,0 16.928,-5.387 19.399,-16.16 l 23.542,-104.789 c 2.771,-11.083 1.541,-19.24 -3.691,-24.472 l -42.011,-42.013 45.703,-53.085 29.544,29.543 c 3.08,3.071 6.621,4.607 10.623,4.607 5.231,0 10.307,-2.306 15.229,-6.917 L 369.31,90.024 c 2.46,-3.081 3.689,-6.467 3.691,-10.158 -0.002,-4.611 -1.616,-8.457 -4.848,-11.538 -3.23,-3.08 -7.002,-4.621 -11.312,-4.621 -4.312,0 -7.698,1.23 -10.158,3.691 L 306.981,107.113 258.967,59.1 c -3.691,-3.701 -8.307,-5.552 -13.849,-5.552 l -75.246,0 c -4.622,0 -8.623,1.851 -12.004,5.552 l -51.704,59.552 c -3.691,3.071 -5.538,6.917 -5.537,11.538 -10e-4,4.311 1.537,8.005 4.614,11.081 3.075,3.075 6.769,4.613 11.081,4.613 4.611,0 8.613,-1.846 12.003,-5.537 l 48.014,-55.86 27.697,0.465 -105.72,122.796 -71.555,-0.466 c -5.851,0 -10.777,1.849 -14.779,5.545 -4,3.695 -6.001,8.465 -6.001,14.307 0,5.541 2.001,10.234 6.001,14.081 4.001,3.847 8.773,5.771 14.314,5.771 z"
+   id="path13"
+   style="fill:#501616"
+   inkscape:connector-curvature="0" /><path
+   d="m 490.931,87.61 c 4.158,-2.724 5.321,-8.302 2.599,-12.46 -2.723,-4.157 -8.3,-5.323 -12.46,-2.599 l -113,74 c -3.451,2.26 -4.924,6.576 -3.574,10.475 l 73.093,211.055 -420.589,0 c -9.389,0 -17,7.611 -17,17 0,9.389 7.611,17 17,17 l 457,0 c 9.389,0 17,-7.611 17,-17 0,-9.389 -7.611,-17 -17,-17 l -17.362,0 -72.837,-210.315 107.13,-70.156 z"
+   id="path15"
+   style="fill:#ff0000"
+   inkscape:connector-curvature="0" />
+</svg>
Index: /trunk/images/presets/misc/cliff.svg
===================================================================
--- /trunk/images/presets/misc/cliff.svg	(revision 10565)
+++ /trunk/images/presets/misc/cliff.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="cliff.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-2.0696195"
+     inkscape:cy="8.6023938"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#2090cf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4294"
+       width="7.9999986"
+       height="2.999877"
+       x="8.000001"
+       y="1049.3621" />
+    <path
+       style="fill:#ac5b00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -4.7683724e-7,1037.3621 c 0,0 9.37139197683724,0.072 9.00000157683724,1 -1.9999987,5 0,14 0,14 l -9.00000157683724,0 z"
+       id="path4292"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccc" />
+    <rect
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4317"
+       width="9"
+       height="1.9999602"
+       x="-4.7683727e-007"
+       y="1036.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/description.svg
===================================================================
--- /trunk/images/presets/misc/description.svg	(revision 10565)
+++ /trunk/images/presets/misc/description.svg	(revision 10565)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-5.2146542"
+     inkscape:cy="10.452631"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-310px"
+       originy="-459px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-310,-577.36218)">
+    <rect
+       style="fill:#ffeeaa;fill-opacity:1;stroke:none"
+       id="rect2987"
+       width="11"
+       height="16"
+       x="310"
+       y="577.36218" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 311,580.36218 1,-1 2,1 1,-1 1,1 2,-1 1,1 1,-1 0,0"
+       id="path2989"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 311,583.36218 1,-1 2,1 1,-1 1,1 2,-1 1,1 1,-1 0,0"
+       id="path2989-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 311,586.36218 1,-1 2,1 1,-1 1,1 2,-1 1,1 1,-1 0,0"
+       id="path2989-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 311,589.36218 1,-1 2,1 1,-1 1,1 2,-1 1,1 1,-1 0,0"
+       id="path2989-4"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 311,592.36218 1,-1 2,1 1,-1 1,1 2,-1 1,1 1,-1 0,0"
+       id="path2989-0"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/embankment.svg
===================================================================
--- /trunk/images/presets/misc/embankment.svg	(revision 10565)
+++ /trunk/images/presets/misc/embankment.svg	(revision 10565)
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="embankment.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="7.6157614"
+     inkscape:cy="9.9143347"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-others="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4217"
+       d="m 16.000002,1039.8621 -16.00000247683724,0"
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4211"
+       d="m 8.000001,1036.3621 0,16"
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:6.00000095;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 13.000002,1036.8621 -10.0000019,0"
+       id="path4213"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.000001,1045.8621 -16.00000147683724,0"
+       id="path4219"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4221"
+       d="m 13.000002,1042.8621 -10.0000016,0"
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:1.00000018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4223"
+       d="m 16.000002,1051.8621 -16.00000213446518,0"
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:1.00000018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#d2691e;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 13.000002,1048.8621 -10.0000019,0"
+       id="path4225"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.00000095;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.000001,1036.3621 0,16"
+       id="path4212"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/ford.svg
===================================================================
--- /trunk/images/presets/misc/ford.svg	(revision 10565)
+++ /trunk/images/presets/misc/ford.svg	(revision 10565)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ford12.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-3.9697886"
+     inkscape:cy="2.3971322"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1"
+       id="rect4148"
+       width="16.000004"
+       height="16.000004"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       ry="2.3864501" />
+    <path
+       style="fill:#000000"
+       d="m 8.1107127,1037.3621 -1.0610248,3.8423 -5.048498,0.5092 -0.00119,2.8581 c 0,0 1.9439315,-0.017 6.0511112,-0.017 0.1430592,1.601 1.4544383,2.7956 2.9684849,2.7956 1.597498,0 2.980406,-1.3547 2.980406,-3.0788 0,-1.3793 -0.870279,-2.5123 -2.038598,-2.9187 l 0,-3.9779 -3.8506843,0 z"
+       id="path4153"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccsscccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#0070ff;stroke-width:1.73526525;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.62451997,1051.114 1.84387033,-1.9325 1.8438702,1.9325 1.8438701,-1.9325 1.8438703,1.9325 1.8438707,-1.9325 1.8438704,1.9325 1.843869,-1.9325 1.843871,1.9325"
+       id="path4181"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 8.718716,1038.1256 2.420089,0 0,3.0666 -3.23076,0.024 0.810671,-3.0787 z"
+       id="path4151" />
+    <path
+       style="fill:#ffffff"
+       d="m 11.007668,1043.0395 c 0.762984,0 1.216005,0.5788 1.216005,1.2315 0,0.6527 -0.453021,1.2315 -1.216005,1.2315 -0.762985,0 -1.2160071,-0.5788 -1.2160071,-1.2315 0,-0.6527 0.4530221,-1.2315 1.2160071,-1.2315 z"
+       id="path4149" />
+    <circle
+       r="1.7789224"
+       cy="1045.5714"
+       cx="4.4972916"
+       id="circle4145"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4143"
+       cx="4.4972916"
+       cy="1045.5714"
+       r="0.91713595" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/grit_bin.svg
===================================================================
--- /trunk/images/presets/misc/grit_bin.svg	(revision 10565)
+++ /trunk/images/presets/misc/grit_bin.svg	(revision 10565)
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="13"
+   viewBox="0 0 16 13"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__grit_bin.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="7.3093944"
+     inkscape:cy="7.7130252"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+    <sodipodi:guide
+       position="10.000001,1.0000001"
+       orientation="0,1"
+       id="guide4208" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1039.3621)">
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.30469,1040.5228 a 0.50005003,0.50005003 0 0 0 -0.3496108,0.8594 l 3.0429698,3.043 -2.998048,0 c -0.5540224,0 -0.9999999,0.446 -0.9999999,1 l 0,5 c 0,0.554 0.4459775,1 0.9999999,1 l 4.000001,0 c 0.554022,0 1,-0.446 1,-1 l 0,-5 c 0,-0.2821 -0.118019,-0.5334 -0.304688,-0.7149 a 0.50005003,0.50005003 0 0 0 -0.0332,-0.035 l -4,-4 a 0.50005003,0.50005003 0 0 0 -0.357421,-0.1524 z"
+       id="rect4208"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4206"
+       d="m 1.2412669,1051.3621 c 0,0 1.7520542,-3.3347 3.5041086,-3.3347 1.7520544,0 3.5041087,3.3347 3.5041087,3.3347 z"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4227"
+       width="6"
+       height="7"
+       x="9"
+       y="1044.3621"
+       ry="1"
+       rx="1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#008000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.309365,1044.9644 -4,-4"
+       id="path4229"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:#999999;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.2412669,1051.3621 c 0,0 1.7520541,-3.3346 3.5041084,-3.3346 1.7520543,0 3.5041086,3.3346 3.5041086,3.3346 z"
+       id="path4233"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landmark/cutline.svg
===================================================================
--- /trunk/images/presets/misc/landmark/cutline.svg	(revision 10565)
+++ /trunk/images/presets/misc/landmark/cutline.svg	(revision 10565)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-310,-586.36218)"
+     id="layer1">
+    <rect
+       width="16"
+       height="16"
+       x="310"
+       y="586.36218"
+       id="rect2987"
+       style="fill:#447821;fill-opacity:1;stroke:none" />
+    <rect
+       width="2"
+       height="16"
+       x="317"
+       y="586.36218"
+       id="rect2989"
+       style="fill:#99ff55;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landmark/forest.svg
===================================================================
--- /trunk/images/presets/misc/landmark/forest.svg	(revision 10565)
+++ /trunk/images/presets/misc/landmark/forest.svg	(revision 10565)
@@ -0,0 +1,700 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:docname="jean-victor-balin-plain-tree.svg"
+   inkscape:export-filename="/datas/Projs/Cliparts Stocker/plain_tree.png"
+   viewBox="0 0 1118.8397 1227.8107"
+   sodipodi:version="0.32"
+   inkscape:export-xdpi="72.000000"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-ydpi="72.000000"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5877"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-1"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5877-8"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020"
+       xlink:href="#linearGradient5877-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5883-1-7"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7-1"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4-1"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0-5"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9-2"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4-7"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-6"
+       xlink:href="#linearGradient5877-8-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-1"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-4"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-2"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-3"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-2"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-2"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-1"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-6"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-8"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5877-5"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-7"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3098"
+       xlink:href="#linearGradient5877-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5883-1-7-3"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7-1-1"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4-1-2"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0-5-3"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9-2-3"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4-7-4"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-6-1"
+       xlink:href="#linearGradient5877-8-1-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-1-1"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-4-3"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-2-8"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-3-7"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-2-4"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-2-2"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-1-7"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-6-7"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-8-9"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3098-3"
+       xlink:href="#linearGradient5877-5-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-5-1"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-7-9"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-6-8"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-1-6"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7-5"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4-0"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0-2"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9-8"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-0"
+       xlink:href="#linearGradient5877-8-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-2"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-48"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3213"
+       xlink:href="#linearGradient5877-8-2"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-4"
+     pagecolor="#ffffff"
+     inkscape:window-height="1003"
+     inkscape:zoom="0.41427105"
+     inkscape:window-x="-4"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="svg1"
+     inkscape:cx="105.70544"
+     inkscape:cy="678.68539"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2995"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-0.66599997px"
+       originy="255.623px" />
+  </sodipodi:namedview>
+  <g
+     id="g5885"
+     transform="translate(-82.251123,-23.332313)">
+    <path
+       id="path1545"
+       style="fill:url(#linearGradient5883);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path909"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4679"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5877);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2008-05-26T12:05:38</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jean_victor_balin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>forest</rdf:li>
+            <rdf:li>garden</rdf:li>
+            <rdf:li>plant</rdf:li>
+            <rdf:li>tree</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g5885-4"
+     transform="translate(193.73388,-23.332313)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5"
+       style="fill:url(#linearGradient5883-1);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3020);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-1"
+     transform="translate(477.93588,-23.332313)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-8"
+       style="fill:url(#linearGradient5883-3);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-9"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-1);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-2"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3098);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-4-7"
+     transform="translate(753.92088,-23.332313)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5-9"
+       style="fill:url(#linearGradient5883-1-7);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5-5"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0-5);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3020-6);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-4-5"
+     transform="translate(58.781997,232.29069)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5-0"
+       style="fill:url(#linearGradient5883-1-6);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5-9"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0-2);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1-0"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3213);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-1-0"
+     transform="translate(342.984,232.29069)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-8-6"
+       style="fill:url(#linearGradient5883-3-7);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-9-1"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-1-7);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-2-3"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3098-3);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-4-7-8"
+     transform="translate(618.969,232.29069)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5-9-9"
+       style="fill:url(#linearGradient5883-1-7-3);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5-5-3"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0-5-3);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1-4-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3020-6-1);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landmark/mountain_pass.svg
===================================================================
--- /trunk/images/presets/misc/landmark/mountain_pass.svg	(revision 10565)
+++ /trunk/images/presets/misc/landmark/mountain_pass.svg	(revision 10565)
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mountain_pass2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.4693267"
+     inkscape:cy="10.742348"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4309"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3,1040.3621 c -1.037884,0 -1.9776167,0.6718 -3,2 l 0,10 16,0 0,-8 c 0,0 -1.573787,-0.7207 -2.617609,-0.7207 -1.368957,0 -2.77797,1.2382 -3.9374998,2.7285 -1.631842,-2.5745 -4.3718088,-6.0078 -6.4448931,-6.0078 z"
+       id="path4288"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccccscs" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4225"
+       d="m 9,1036.866 0,3.4962 -1.503907,0 c -0.447994,2e-4 -0.669761,0.5441 -0.349609,0.8575 l 2,2.0039 c 0.195265,0.1952 0.511766,0.1952 0.7070307,0 l 2,-2.0039 c 0.374791,-0.3616 0.03953,-0.8621 -0.351562,-0.8594 l -1.501954,0 0,-3.4943 c 0,-0.6757 -1,-0.6679 -1,0 z"
+       style="color:#000000;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       sodipodi:nodetypes="ccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.5,1045.7019 c 1.6e-6,2 -6.5312501,2.7344 -6.5312501,3.7344 0,1 11.0312525,1.9258 13.0312525,1.9258"
+       id="path4207"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landmark/spring.svg
===================================================================
--- /trunk/images/presets/misc/landmark/spring.svg	(revision 10565)
+++ /trunk/images/presets/misc/landmark/spring.svg	(revision 10565)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_spring.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="0.4190404"
+     inkscape:cy="4.2891919"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-page="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="XMLID_164_-0"
+       class="st0"
+       d="m 16,1048.8152 c 0,0 -14,0.2721 -14,-1.4531 0,-2.0207 12.1696238,0.3841 12.0781268,-2.5625 -0.05623,-1.811 -5.8615235,-1.0431 -6.6140873,-2.4265 -0.4067771,-0.7478 -1.4158735,-0.309 -1.1307543,0.4893 0.6093778,1.5884 4.1135776,1.3598 6.1447586,1.9615 C 8.5588211,1045.1734 0,1044.3621 0,1047.3621 c 0,5 16,5 16,5 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece;fill-opacity:1"
+       sodipodi:nodetypes="csssccscc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#208ece;stroke-width:1.28;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.28800018, 1.288;stroke-dashoffset:1.288;stroke-opacity:1"
+       d="m 6.846187,1042.3319 c 0.2209709,-4.0659 4.341426,-7.8043 6.153815,-2.9698"
+       id="path4136"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4162"
+       d="m 6.7568882,1042.3319 c -0.2209709,-4.0659 -4.341426,-7.8043 -6.15381503,-2.9698"
+       style="fill:none;fill-rule:evenodd;stroke:#208ece;stroke-width:1.288;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.288, 1.288;stroke-dashoffset:1.288;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landmark/tree_row.svg
===================================================================
--- /trunk/images/presets/misc/landmark/tree_row.svg	(revision 10565)
+++ /trunk/images/presets/misc/landmark/tree_row.svg	(revision 10565)
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   sodipodi:docname="02.svg"
+   inkscape:export-filename="/datas/Projs/Cliparts Stocker/plain_tree.png"
+   viewBox="0 0 970.83973 972.18771"
+   sodipodi:version="0.32"
+   inkscape:export-xdpi="72.000000"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-ydpi="72.000000"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5877"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-1-7"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-7-1"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-4-1"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-0-5"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-9-2"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-4-7"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-6"
+       xlink:href="#linearGradient5877-8-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-1"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-4"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-2"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5883-3"
+       y2="478.01001"
+       gradientUnits="userSpaceOnUse"
+       y1="476.92999"
+       gradientTransform="scale(0.61633,1.6225)"
+       x2="384.09"
+       x1="345.53"
+       inkscape:collect="always">
+      <stop
+         id="stop3434-2"
+         style="stop-color:#6c2f07"
+         offset="0" />
+      <stop
+         id="stop3435-2"
+         style="stop-color:#7e4932"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5880-1"
+       y2="457.35999"
+       gradientUnits="userSpaceOnUse"
+       y1="32.316002"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="383.14001"
+       x1="383.14001"
+       inkscape:collect="always">
+      <stop
+         id="stop2187-6"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop2188-8"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5877-5"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-7"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3098"
+       xlink:href="#linearGradient5877-5"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="183.60001"
+       x2="207.92999"
+       y1="349.29999"
+       x1="466.13"
+       gradientTransform="scale(0.61308,1.6311)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3020-0"
+       xlink:href="#linearGradient5877-8-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient5877-8-2"
+       y2="183.60001"
+       gradientUnits="userSpaceOnUse"
+       y1="349.29999"
+       gradientTransform="scale(0.61308,1.6311)"
+       x2="207.92999"
+       x1="466.13"
+       inkscape:collect="always">
+      <stop
+         id="stop5303-8-48"
+         style="stop-color:#002f00"
+         offset="0" />
+      <stop
+         id="stop5304-2-6"
+         style="stop-color:#009300"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-4"
+     pagecolor="#ffffff"
+     inkscape:window-height="1003"
+     inkscape:zoom="0.41427105"
+     inkscape:window-x="-4"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="svg1"
+     inkscape:cx="-42.294561"
+     inkscape:cy="423.0624"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2995"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-148.666px"
+       originy="1.0382462e-005px" />
+  </sodipodi:namedview>
+  <g
+     id="g5885"
+     transform="translate(-82.251123,-23.332315)">
+    <path
+       id="path1545"
+       style="fill:url(#linearGradient5883);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path909"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4679"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5877);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2008-05-26T12:05:38</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/17043/plain_tree-by-jean_victor_balin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jean_victor_balin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>forest</rdf:li>
+            <rdf:li>garden</rdf:li>
+            <rdf:li>plant</rdf:li>
+            <rdf:li>tree</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="g5885-1"
+     transform="translate(267.93589,-23.332315)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-8"
+       style="fill:url(#linearGradient5883-3);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-9"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-1);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-2"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3098);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+  <g
+     id="g5885-4-7"
+     transform="translate(605.92089,-23.332315)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1545-5-9"
+       style="fill:url(#linearGradient5883-1-7);fill-rule:evenodd"
+       d="m 193.88,772.09 -9.78,223.43 h 84.88 L 254.1,772.09 h -60.22 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path909-5-5"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient5880-0-5);fill-opacity:0.75;fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.11,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4679-1-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:url(#linearGradient3020-6);fill-rule:evenodd"
+       d="m 223.51,23.337 c -8.1,0.571 -72.67,106.71 -87.16,176.56 -21.53,125.42 -31.83,285.19 -50.937,410.97 -5.671,29.1 -3.298,64.86 3.812,82.34 7.231,23.7 27.775,48.49 52.345,62.81 29.99,19.43 52.51,18.91 81.75,19.29 0.15,0.09 0.35,0.11 0.53,0 30.62,-0.04 53.49,-1.24 81.75,-19.29 24.57,-14.32 45.11,-39.11 52.34,-62.81 7.11,-17.48 9.49,-53.24 3.82,-82.34 -19.12,-125.78 -29.41,-285.55 -50.94,-410.97 -14.49,-69.85 -79.06,-175.99 -87.16,-176.56 -0.02,-0.005 -0.11,-0.006 -0.15,-0.003 z" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landmark/water_tower.svg
===================================================================
--- /trunk/images/presets/misc/landmark/water_tower.svg	(revision 10565)
+++ /trunk/images/presets/misc/landmark/water_tower.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 2,0 2,3.5 C 2,4.9469172 2.7905512,5.9802716 3.90625,6.625 L 3,14 4.5,14 4.6875,12.53125 7,11 9.3125,12.5625 9.5,14 11,14 10.09375,6.65625 C 11.21821,6.0132746 12,4.9628112 12,3.5 l 0,-3.5 -1.5,0 0,1.5 -0.5,0 C 8.8728814,2 8,2 7,1.5 6,1 5.0381356,1 4,1.5 l -0.5,0 0,-1.5 z m 3.34375,7.1875 c 1.069224,0.2671613 2.2426846,0.2935662 3.3125,0.03125 L 8.84375,8.78125 7,10 5.15625,8.78125 z m -0.3125,2.5 L 6.25,10.5 4.8125,11.46875 z m 3.9375,0 L 9.1875,11.46875 7.75,10.5 z" id="water-tower" style="fill:#555555;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/misc/landuse/allotments.svg
===================================================================
--- /trunk/images/presets/misc/landuse/allotments.svg	(revision 10565)
+++ /trunk/images/presets/misc/landuse/allotments.svg	(revision 10565)
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="205.20241"
+   height="171.37407"
+   id="svg3197"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3199" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-110.9473"
+     inkscape:cy="-71.449229"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="463"
+     inkscape:window-height="453"
+     inkscape:window-x="25"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3202">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-485.9473,-289.53888)">
+    <g
+       id="g3800"
+       inkscape:export-ydpi="82.942017"
+       inkscape:export-xdpi="82.942017"
+       inkscape:export-filename="C:\Documents and Settings\laurent\Mes documents\dessin 2d\objet\arrosoir1.png"
+       transform="matrix(0.67159997,0,0,0.67159997,346.11522,-184.28742)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path2436"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#a70432;stroke:#000000;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:bevel"
+         d="m 483.94,785.96 0.72,162.14 c -20.18,13.47 -96.13,17.81 -133.93,0.35 L 348.59,785.6 c 5.37,10.35 97.9,18.53 135.35,0.36 z" />
+      <path
+         id="path2440"
+         sodipodi:rx="70.714287"
+         sodipodi:ry="12.321428"
+         style="fill:#d4043f;stroke:#000000;stroke-width:1.79149997;stroke-linecap:round;stroke-linejoin:bevel"
+         sodipodi:type="arc"
+         d="m 486.07143,450.39789 c 0,6.80494 -31.65986,12.32143 -70.71428,12.32143 -39.05442,0 -70.71429,-5.51649 -70.71429,-12.32143 0,-6.80494 31.65987,-12.32143 70.71429,-12.32143 39.05442,0 70.71428,5.51649 70.71428,12.32143 z"
+         transform="matrix(0.975,0,0,0.70851,11.309,468.07)"
+         sodipodi:cy="450.39789"
+         sodipodi:cx="415.35715" />
+      <path
+         id="path2438"
+         sodipodi:rx="70.714287"
+         sodipodi:ry="12.321428"
+         style="fill:#d4043f;stroke:#000000;stroke-width:2.03699994;stroke-linecap:round;stroke-linejoin:bevel"
+         sodipodi:type="arc"
+         d="m 486.07143,450.39789 c 0,6.80494 -31.65986,12.32143 -70.71428,12.32143 -39.05442,0 -70.71429,-5.51649 -70.71429,-12.32143 0,-6.80494 31.65987,-12.32143 70.71429,-12.32143 39.05442,0 70.71428,5.51649 70.71428,12.32143 z"
+         transform="matrix(0.92822,0,0,0.57567,29.347,527.47)"
+         sodipodi:cy="450.39789"
+         sodipodi:cx="415.35715" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3805"
+         sodipodi:nodetypes="csc"
+         style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+         d="m 433.87,779.65 c -29.76,-0.92 -39.5,7.63 -22.4,11.63 4.2,0.98 10,1.68 17.52,1.91" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2444"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#a70432;stroke:#000000;stroke-width:1.4892;stroke-linecap:round;stroke-linejoin:bevel"
+         transform="matrix(0.75047,-0.6609,0.67842,0.73467,0,0)"
+         d="M -328.67,746.35 -328.84,879 c -0.51,4.1 -5.53,13.07 -19.71,22.05 l -0.78,-154.7 c 3.36,-3.16 18.78,-5.78 20.66,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2463"
+         sodipodi:nodetypes="css"
+         style="fill:#a70432;stroke:#000000;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:bevel"
+         d="m 266.69,725.94 c 3.71,2.35 3.03,30.54 -13.01,46.42 -16.04,15.88 -40.49,14.19 -44.21,11.84" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2448"
+         sodipodi:nodetypes="ccccccsccc"
+         style="fill:#a70432;fill-rule:evenodd;stroke:#000000;stroke-width:1.48899996px"
+         d="m 369.74,785.97 c -0.46,-39.87 6.78,-69.3 53.59,-70.69 51.08,3.02 88.09,20.83 79.77,62.94 -6.62,20.5 -12.23,33.52 -18.86,54.02 -2.82,9.76 -2.88,18.39 -0.38,28.15 10.96,-33.08 12.87,-27.47 29.13,-92.65 -1.02,-5.64 -1.45,-18.46 -4.17,-23.31 -24.16,-43.14 -108.54,-52.07 -138.84,-14.66 -7.18,8.18 -13.06,40.29 -11.18,56.38 5.38,1.96 8.6,0.14 10.94,-0.18 z" />
+      <path
+         id="path2446"
+         sodipodi:rx="2.6784978"
+         sodipodi:ry="42.735233"
+         style="fill:#d4043f;stroke:#000000;stroke-width:1.48280001;stroke-linecap:round;stroke-linejoin:bevel"
+         sodipodi:type="arc"
+         d="m 219.82135,430.57648 c 0,23.60201 -1.1992,42.73523 -2.6785,42.73523 -1.47929,0 -2.6785,-19.13322 -2.6785,-42.73523 0,-23.60202 1.19921,-42.73524 2.6785,-42.73524 1.47106,0 2.66683,18.9287 2.67842,42.39865"
+         sodipodi:open="true"
+         transform="matrix(0.92073,0.56745,-0.67232,0.68088,327.43,338.67)"
+         sodipodi:cy="430.57648"
+         sodipodi:cx="217.14285"
+         sodipodi:end="6.2753092"
+         sodipodi:start="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3460"
+         style="fill:#7e0325"
+         d="m 424.15,780.12 c -5.66,0.05 -11.39,0.77 -16.73,2.7 -1.57,0.7 -3.63,1.51 -4.06,3.38 0.17,1.8 2.14,2.67 3.58,3.34 6.75,2.59 14.12,2.95 21.26,3.36 0.57,-0.1 0.72,0.6 1.33,0.45 11.67,-0.26 23.35,-0.92 34.95,-2.25 4.81,-0.69 9.76,-1.24 14.29,-3.03 0.75,-0.25 1.95,-1.17 1.08,-1.96 -2.05,-1.49 -4.71,-1.78 -7.12,-2.4 -11.7,-2.27 -23.65,-2.74 -35.53,-3.32 -4.35,-0.17 -8.7,-0.3 -13.05,-0.27 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3462"
+         sodipodi:nodetypes="ccccc"
+         style="fill:#a70432;fill-rule:evenodd;stroke:#000000;stroke-width:1.48899996px"
+         d="m 375.56,817.99 -67.88,-0.9 3.39,3.93 64.14,0.36 0.35,-3.39 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3466"
+         style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+         d="m 260.37,766.24 91.92,109.09" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3468"
+         style="fill:#7e0325;stroke:#000000;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:bevel"
+         d="m 280.46,789.21 c 0.39,1.32 1.82,2.25 2.57,3.44 22.7,27.12 45.48,54.18 68.36,81.16 1,0.23 0.39,-1.37 0.47,-1.9 -0.32,-3.02 -0.72,-6.27 -2.88,-8.57 -8.6,-10.23 -17.91,-19.86 -26.91,-29.76 -13.7,-14.83 -27.32,-29.73 -41.14,-44.44 -0.19,-0.17 -0.32,-0.07 -0.47,0.07 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3470"
+         sodipodi:nodetypes="cccc"
+         style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+         d="m 464.42,721.79 c 17.79,1.74 29.38,11.21 39.14,22.98 13.47,29.17 -9.45,66.53 -20.71,101.27" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3472"
+         style="fill:#7e0325;stroke:#000000;stroke-width:1.48899996;stroke-linecap:round;stroke-linejoin:bevel"
+         d="m 469.17,722.85 c -0.52,0.93 1.37,1.06 1.87,1.47 11.97,4.7 23.5,12.31 29.27,24.12 2.99,5.88 4.22,12.46 4.01,19.04 0.11,4.81 -0.52,9.6 -2.17,14.12 -5.69,17.62 -12.74,34.79 -18.09,52.52 -0.94,3.42 -1.67,6.99 -1.53,10.52 1.12,-0.19 1,-2.26 1.63,-3.14 5.53,-15.47 12.14,-30.56 17.43,-46.13 4.01,-12.83 7.46,-26.5 5.01,-39.99 -1.01,-4.63 -2,-9.7 -5.54,-13.12 -7.07,-7.83 -15.52,-14.91 -25.78,-17.98 -1.99,-0.53 -4.05,-1.39 -6.11,-1.43 z" />
+      <g
+         id="g3630"
+         transform="translate(0,1.0102)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3602"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+           d="m 352.08,826.07 c 44.18,9.93 86.89,9.16 128.21,-1.71" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3610"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+           d="m 352.08,827.92 c 44.18,9.93 86.89,9.16 128.21,-1.71" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3614"
+           style="fill:#65021e"
+           d="m 478.64,825.02 c -2.8,0.49 -5.47,1.32 -8.25,1.86 -22.51,5.03 -46.45,7.19 -70.11,5.95 -15.39,-0.75 -30.61,-2.89 -45.34,-5.98 -0.71,-0.05 -1.91,-0.59 -2.37,0 -0.06,0.52 -0.07,1.24 0.96,1.22 18.7,4.08 38.27,6.49 57.93,6.68 21.94,0.09 43.89,-2.51 64.51,-7.63 1.14,-0.33 2.44,-0.49 3.47,-0.93 0.03,-0.41 0.2,-1.27 -0.8,-1.17 z" />
+      </g>
+      <g
+         id="g3625"
+         transform="translate(0,1.0102)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3604"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+           d="m 352.43,833.43 c 43.44,9.68 85.61,7.25 127.15,-1.22" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3612"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+           d="m 352.43,835.28 c 43.44,9.68 85.61,7.26 127.15,-1.22" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3616"
+           style="fill:#65021e"
+           d="m 478.61,832.62 c -4,0.62 -7.91,1.53 -11.91,2.16 -16.75,2.84 -33.92,4.69 -51.2,4.98 -10,0.09 -20.02,-0.11 -29.93,-1.05 -10.45,-0.91 -20.73,-2.53 -30.81,-4.61 -0.62,-0.16 -1.87,-0.28 -1.8,0.41 -0.44,0.96 1.2,0.92 2.09,1.17 17.25,3.68 35.33,5.59 53.41,5.68 23.57,0.17 47.01,-2.64 69.57,-7.14 0.99,-0.06 1.77,-0.4 1.41,-1.15 0.01,-0.3 -0.42,-0.49 -0.83,-0.45 z" />
+      </g>
+      <g
+         id="g3620">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3606"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+           d="m 353.86,840.69 c 41.54,8.2 83.59,7.56 126.07,-0.49" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3608"
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+           d="m 353.86,842.54 c 41.54,8.2 83.59,7.56 126.07,-0.49" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3618"
+           style="fill:#65021e"
+           d="m 478.84,840.6 c -6.18,1.01 -12.33,2.13 -18.58,2.92 -29.27,3.99 -59.71,4.3 -89,0.21 -5.88,-0.79 -11.67,-1.84 -17.47,-2.88 -0.78,0.12 -0.37,0.92 -0.45,1.33 0.05,0.58 1.09,0.26 1.61,0.46 7.41,1.28 14.85,2.58 22.41,3.42 12.02,1.38 24.19,2.25 36.39,2.09 8.23,-0.02 16.49,-0.12 24.67,-0.81 13.76,-1 27.38,-2.8 40.72,-5.3 0.35,-0.33 0.46,-0.99 0.1,-1.36 -0.11,-0.06 -0.26,-0.09 -0.4,-0.08 z" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3635"
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+         d="m 350.36,944.51 c 53.52,14.72 99.61,17.3 134.64,-1.79" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3637"
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#000000;stroke-width:1.48899996px"
+         d="m 350.36,941.22 c 53.52,14.72 99.61,17.31 134.64,-1.79" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3639"
+         style="fill:#65021e"
+         d="m 483.81,940.35 c -18.89,9.69 -40.46,13.29 -61.61,12.78 -24.04,-0.42 -47.69,-5.26 -70.86,-11.36 -0.83,0.78 -0.64,2.81 0.79,2.94 20.73,5.54 41.9,9.97 63.37,11.02 13.18,0.11 26.51,0.4 39.44,-2.54 10.04,-2.08 19.99,-5.31 28.93,-10.31 0.66,-0.5 0.82,-2.32 -0.06,-2.53 z" />
+      <g
+         id="g3641"
+         transform="matrix(1.1044,-1.0131,0.16075,0.17522,-85.823,913.63)">
+        <path
+           id="path3663"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,467.38,5.2326)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3665"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,473.98,6.1255)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3667"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,481.31,6.3041)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3677"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,474.34,15.768)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3679"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,467.91,14.161)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3681"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,463.09,11.304)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3683"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,457.73,9.3398)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3685"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,453.09,7.3755)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3691"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,461.13,20.054)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3693"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,456.66,16.304)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3695"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,448.27,13.983)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3697"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,442.38,11.84)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3701"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,449.34,18.536)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3705"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,439.16,18)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3707"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,439.34,22.911)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3709"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,441.66,26.483)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3713"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,454.07,24.608)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+        <path
+           id="path3715"
+           sodipodi:rx="1.5178572"
+           sodipodi:ry="2.3214285"
+           style="fill:#65021e"
+           sodipodi:type="arc"
+           d="m 235.89286,410.04074 c 0,1.28209 -0.67957,2.32143 -1.51786,2.32143 -0.83829,0 -1.51786,-1.03934 -1.51786,-2.32143 0,-1.28209 0.67957,-2.32143 1.51786,-2.32143 0.83829,0 1.51786,1.03934 1.51786,2.32143 z"
+           transform="matrix(0.52388,0.85179,-0.85179,0.52388,433.19,21.733)"
+           sodipodi:cy="410.04074"
+           sodipodi:cx="234.375" />
+      </g>
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landuse/landfill.svg
===================================================================
--- /trunk/images/presets/misc/landuse/landfill.svg	(revision 10565)
+++ /trunk/images/presets/misc/landuse/landfill.svg	(revision 10565)
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="landfill5.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="12.174252"
+     inkscape:cy="4.6565139"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:#d2691e;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.58657473,1051.8611 15.00000227,0 c 0,0 -2.207106,-3.5 -3.207106,-4.5 -1,-1 -3.3605066,-3.3512 -5.3794702,-2.9885 -3.2347189,0.5811 -3.2962021,4.5644 -6.41342607,7.4885 z"
+       id="path4138"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsac" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#d2691e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 7.3710938 7.4707031 C 7.2188245 7.4744924 7.0655994 7.4900031 6.9121094 7.5175781 C 5.0996053 7.8431781 4.1394134 9.16926 3.3144531 10.630859 C 2.489493 12.092459 1.7213234 13.749166 0.24414062 15.134766 L 0 15.363281 L 0 16 L 0.5859375 16 L 16 16 L 16 15.216797 C 15.991027 15.202592 15.447876 14.34323 14.771484 13.34375 C 14.089531 12.33615 13.308606 11.220731 12.732422 10.644531 C 12.231873 10.143931 11.372579 9.2837312 10.355469 8.5820312 C 9.4654972 7.9680439 8.4369781 7.4441783 7.3710938 7.4707031 z M 7.7148438 8.4941406 C 8.3701099 8.5800859 9.0986965 8.9313502 9.7871094 9.40625 C 10.704993 10.03945 11.525939 10.854016 12.025391 11.353516 C 12.449206 11.777316 13.27176 12.911897 13.943359 13.904297 C 14.338735 14.488497 14.438968 14.6534 14.662109 15 L 1.6210938 15 C 2.7496732 13.677 3.5333153 12.276594 4.1855469 11.121094 C 4.9793133 9.7146938 5.665677 8.7574531 7.0878906 8.5019531 C 7.2856511 8.4664281 7.4964216 8.4654922 7.7148438 8.4941406 z "
+       transform="translate(-4.7683724e-7,1036.3621)"
+       id="path4326" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217"
+       width="1.4062501"
+       height="1.4062501"
+       x="-533.07709"
+       y="904.95404"
+       transform="matrix(0.85618767,-0.51666495,0.516665,0.85618764,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-5"
+       width="1.4062504"
+       height="1.4062502"
+       x="44.132889"
+       y="1037.7678"
+       transform="matrix(0.9990994,0.04243094,-0.04243095,0.9990994,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-6"
+       width="1.4062504"
+       height="1.4062502"
+       x="111.6073"
+       y="1042.0021"
+       transform="matrix(0.99503719,0.09950371,-0.09950372,0.99503719,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-1"
+       width="1.4062502"
+       height="1.4062504"
+       x="-911.00604"
+       y="523.46515"
+       transform="matrix(0.49613898,-0.86824312,0.86824314,0.49613894,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-2"
+       width="1.4062504"
+       height="1.4062502"
+       x="755.56451"
+       y="721.45312"
+       transform="matrix(0.69678574,0.71727933,-0.71727937,0.6967857,0,0)" />
+    <rect
+       style="opacity:1;fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-11"
+       width="1.4062504"
+       height="1.4062502"
+       x="699.23071"
+       y="764.93848"
+       transform="matrix(0.73994012,0.67267274,-0.67267278,0.73994008,0,0)" />
+    <rect
+       style="opacity:1;fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-5-6"
+       width="1.4062505"
+       height="1.4062505"
+       x="-1028.5599"
+       y="-196.33882"
+       transform="matrix(-0.18884702,-0.98200652,0.98200652,-0.188847,0,0)" />
+    <rect
+       style="opacity:1;fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-6-7"
+       width="1.4062506"
+       height="1.4062504"
+       x="-485.01459"
+       y="922.5155"
+       transform="matrix(0.88311578,-0.46915511,0.46915515,0.88311576,0,0)" />
+    <rect
+       style="opacity:1;fill:#d2691e;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-1-0"
+       width="1.4062506"
+       height="1.4062504"
+       x="-560.87421"
+       y="877.91223"
+       transform="matrix(0.84227149,-0.53905356,0.5390536,0.84227146,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-5-7"
+       width="1.4062504"
+       height="1.4062502"
+       x="709.27008"
+       y="759.42615"
+       transform="matrix(0.73409949,0.67904193,-0.67904197,0.73409945,0,0)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.89302326;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4217-5-7-6"
+       width="1.4062504"
+       height="1.4062502"
+       x="296.84924"
+       y="999.92236"
+       transform="matrix(0.95938413,0.28210298,-0.28210301,0.95938412,0,0)" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landuse/meadow.svg
===================================================================
--- /trunk/images/presets/misc/landuse/meadow.svg	(revision 10565)
+++ /trunk/images/presets/misc/landuse/meadow.svg	(revision 10565)
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg10449"
+   sodipodi:docname="02.svg"
+   viewBox="0 0 253.87779 244.00716"
+   sodipodi:version="0.32"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.48.4 r9939"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs10451">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4051">
+      <stop
+         style="stop-color:#e5e7e5;stop-opacity:1;"
+         offset="0"
+         id="stop4053" />
+      <stop
+         style="stop-color:#e5e7e5;stop-opacity:0;"
+         offset="1"
+         id="stop4055" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10445"
+       y2="799.21997"
+       gradientUnits="userSpaceOnUse"
+       x2="485.07999"
+       gradientTransform="matrix(0.35688993,0,0,1,-21.34532,-352.88)"
+       y1="872.76001"
+       x1="487.89999"
+       inkscape:collect="always">
+      <stop
+         id="stop10441"
+         style="stop-color:#ffffff;stop-opacity:.22857"
+         offset="0" />
+      <stop
+         id="stop10443"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4051"
+       id="linearGradient4059"
+       x1="35.255001"
+       y1="400.91"
+       x2="253.08803"
+       y2="400.91"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     pagecolor="#ffffff"
+     inkscape:window-height="988"
+     inkscape:zoom="2.8284271"
+     inkscape:window-x="-8"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="208.98721"
+     inkscape:cy="127.32706"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3281"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-3.7829572e-006px"
+       originy="-8.9279299e-006px" />
+  </sodipodi:namedview>
+  <g
+     id="layer1"
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     transform="translate(-23.026004,-299.46)">
+    <path
+       id="rect10447"
+       sodipodi:nodetypes="ccccccccccscccc"
+       style="fill:#484b2a"
+       d="m 26.561411,503.25 30.569814,-6.36 23.943402,6.36 13.717721,-0.05 2.994691,20.49 -1.287472,-32.54 20.740603,6.45 25.18854,-6.22 c 5.62959,2.15 15.5484,7.69 21.954,7.65 l 35.16379,1.4 c 6.13399,32.7 2.43384,5.87 20.62773,-4.17 10.1904,-5.61 41.96797,6.66 50.47585,6.99 v 40 H 26.56 l 0.0014,-40 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path9586"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccscccccccccccccccccccccccccccccccccccccccccccccccccccc"
+       style="fill:#4f6e32"
+       d="m 263.48,461.67 c -1.05,-0.23 -2.08,-0.41 -3.09,-0.57 -0.59,-0.12 -1.2,-0.24 -1.78,-0.34 33.44177,-58.34267 -19.71404,-22.75461 8.4,-39.28 l 0.35,-1.91 -0.72,2.13 c -3.32,2.07 -6.61,4.45 -9.88,7.09 l 0.72,-3.62 0.63,-1.85 -0.41,0.69 0.78,-3.91 -2.22,6.32 -3.31,5.56 c -6.19,-0.65 -12.98,-2.88 -19.09,-2.97 l 0.84,-4.5 0.56,-1.72 -0.37,0.66 0.72,-3.88 -2.1,6.25 -1.9,3.28 c -3.73,0.31 -7.1,1.62 -9.85,4.88 6.58,-10.98 13.72,-20.84 21.25,-28.41 1.15,-1.1 2.28,-2.15 3.44,-3.15 1.37,0.15 2.77,0.35 4.19,0.62 -1.24,-0.4 -2.46,-0.76 -3.66,-1.06 2.8,-2.39 5.65,-4.48 8.53,-6.22 -0.24,0.06 -0.48,0.15 -0.72,0.22 0.5,-0.31 0.98,-0.63 1.47,-0.91 -1.36,0.47 -2.69,1.05 -4.03,1.69 -3.1,1.08 -6.14,2.56 -9.12,4.41 -0.1,-0.02 -0.19,-0.05 -0.28,-0.07 -9.73,-2.38 -18.17,-1.59 -25.5,1.53 -26.69,-4.69 -43.91,16.38 -54.94,43.16 l 0.4,-5.25 0.66,-3.28 c 6.5,-11.08 13.56,-21.17 21.03,-29 4.51,-4.53 9.13,-8.36 13.88,-11.22 -0.23,0.06 -0.46,0.13 -0.69,0.19 0.48,-0.3 0.98,-0.57 1.47,-0.85 -1.36,0.47 -2.72,1.02 -4.06,1.66 -6.97,2.42 -13.61,6.92 -19.91,12.88 -15.42,2.84 -31.19,14.89 -45.72,30.37 l 2.38,-11.69 c 0.59,-0.62 1.19,-1.24 1.81,-1.84 1.69,-0.41 3.41,-0.76 5.19,-1 -1.5,0.03 -2.97,0.15 -4.41,0.28 5.51,-5.15 11.94,-9.23 19.5,-11.75 -3.45,0.71 -6.68,1.7 -9.72,2.91 -2.21,-1.16 -4.37,-2.13 -6.5,-2.91 -3.43,-1.55 -6.76,-2.63 -10,-3.28 9.93,-8.26 22.28,-12.11 37.66,-8.5 -2.62,-0.97 -5.14,-1.69 -7.6,-2.22 -16.63,-4.84 -29.85,-0.06 -40.31,10.06 -5.03,0.39 -9.79,1.85 -14.31,4.13 -3.594,0.79 -6.956,1.86 -10.096,3.19 -7.753,2.58 -14.264,6.59 -19.75,11.59 0.248,-1.67 0.359,-2.49 0.594,-4.06 l 0.812,-4.28 0.563,-1.72 -0.375,0.65 0.718,-3.87 -0.593,1.81 c 1.621,-10.91 4.812,-32.44 4.812,-32.44 l 0.781,-27.37 0.282,-1.85 -0.25,0.69 0.125,-3.94 -0.969,6.47 -8.531,24.85 c 0,0 -4.167,29.59 -7.782,55.31 l -3.343,5.78 c 0,0 -0.598,1.85 -0.625,1.94 -2.955,5.46 -5.316,11.3 -7.219,17.28 -25.074,19.94 -28.75,69.94 -28.75,69.94 l 2.812,0.34 c -0.002,0.02 -0.031,0.19 -0.031,0.19 l 4.188,0.5 c 0,0 1.678,-37.26 18.812,-60.1 -0.738,3.26 -1.355,6.52 -1.875,9.72 -7.236,22.74 -14.564,45.92 -14.781,47 l 4.344,1.91 0.031,-0.06 4.187,1.53 c 0.003,-0.01 0.028,-0.12 0.032,-0.13 l 2.406,0.78 c -0.007,0.04 -0.063,0.29 -0.063,0.29 l 5.219,1.65 c 0,0 0.222,-1.2 0.563,-2.9 l 0.75,0.09 c -0.021,0.18 -0.155,1.17 -0.157,1.22 l 2.875,0.87 0,0.1 0.657,0.09 0.5,0.16 0,-0.07 2.937,0.44 c 0.195,-0.82 4.374,-28.5 8.938,-59.06 2.708,-6.84 5.734,-13.74 9.156,-20.34 2.39,-0.42 4.91,-0.65 7.562,-0.63 -0.231,0.69 -0.666,1.94 -0.937,2.75 -13.001,21.61 -18.612,48.01 -20.844,62.34 -1.58,4.79 -2.796,8.48 -2.875,8.85 l 1.625,0.75 c -0.044,0.46 -0.094,0.9 -0.094,0.9 l 3.063,0.88 c 0,0 0.043,-0.35 0.062,-0.5 l 0.407,0.16 c -0.01,0.1 -0.032,0.43 -0.032,0.43 l 3.063,0.88 c 0,0 0.029,-0.14 0.031,-0.16 l 0.406,0.16 c 0.599,-1.3 12.308,-35.8 20.875,-61.03 -2.902,12.07 -4.918,23.75 -6.281,33.53 -8.08,13.94 -12.875,23.65 -12.875,23.65 l 3.875,1.44 c -0.018,0.04 -0.25,0.5 -0.25,0.5 l 5.125,1.91 c 0,0 0.901,-1.69 1.5,-2.85 -0.026,0.42 -0.062,1.07 -0.062,1.07 l 3.625,0.59 c -0.002,0.03 -0.032,0.28 -0.032,0.28 l 5.407,0.91 c 0,0 0.294,-9.02 1.812,-22.35 1.947,-3.38 4.019,-6.89 6.344,-10.75 -0.324,4.65 -0.489,8.98 -0.531,12.91 -3.075,9.25 -5.351,16.14 -5.469,16.69 l 3.437,1.56 0.063,0.03 0.844,0.38 0.031,-0.07 1.75,0.69 c 0.004,0.05 0.031,0.28 0.031,0.28 l 1.031,0.13 1.344,0.5 c 0.009,-0.02 0.111,-0.31 0.125,-0.35 l 0.688,0.07 c 0,0 -0.052,-0.72 -0.094,-1.75 0.106,-0.3 0.203,-0.51 0.344,-0.91 0.106,1.53 0.187,2.63 0.187,2.63 l 3.155,0.31 c 0,0 -0.14,-5.1 0.13,-13 2.28,-6.65 5.28,-15.51 8.34,-24.5 -0.76,5.25 -1.26,10.26 -1.59,14.84 -4.72,11.23 -6.19,18.72 -6.19,18.72 l 3.47,1.28 c -0.05,0.24 -0.19,0.75 -0.19,0.75 l 2.41,0.88 c 0.05,1.6 0.09,2.72 0.09,2.72 l 3.16,0.46 0,-0.28 0.47,0.1 0,0.18 2.96,0.41 c 0,0.03 -0.12,0.44 -0.12,0.44 l 5.41,0.9 c 0,0 0.59,-1.95 1.28,-4.21 l 3.31,0.93 c -0.02,0.04 -0.22,0.5 -0.22,0.5 l 5.28,1.47 c 0,0 0.31,-0.69 0.35,-0.78 l 4.75,0.78 c 0,0 -0.01,-0.77 0.03,-2.09 l 2.53,0.81 0.19,0.03 0.75,0.25 0,-0.06 4.37,1.06 c 0.03,-0.09 0.27,-1.22 0.38,-1.69 l 3.06,0.5 c 0,0.04 -0.03,0.29 -0.03,0.29 l 5.4,0.9 c 0,0 1.04,-30.34 8.78,-62.19 0.5,-0.87 1,-1.75 1.5,-2.62 3.69,6.19 7.25,13.02 10.66,17.25 -12.44,24.13 -20,44.53 -20,44.53 l 2.97,0.81 c -0.05,0.15 -0.28,0.75 -0.28,0.75 l 5.28,1.47 c 0,0 3.31,-8.98 9.09,-22.09 -0.73,8.61 -1.02,15.08 -1.12,18.31 -0.1,0.35 -0.5,1.66 -0.5,1.66 l 0.44,0.06 c -0.01,0.15 0,0.62 0,0.62 l 3.53,0.44 -0.03,0.1 0.12,0.03 0,0.18 4.81,0.6 0.47,0.09 0,-0.03 0.16,0.03 0,-0.53 c 0.03,-0.11 0.35,-1.09 0.47,-1.5 l 2.31,0.38 c -0.04,0.14 -0.19,0.75 -0.19,0.75 l 5.41,0.9 c 0,0 0.12,-0.56 0.15,-0.69 l 1.88,0.69 c 0,0 0.59,-1.13 0.75,-1.44 l 1.84,0.54 0,-0.07 3.19,0.72 0.69,0.25 0,-0.12 0.5,0.12 c 0.03,-0.12 0.29,-1.42 0.44,-2.12 l 1.46,0.65 0.04,-0.06 4.18,1.53 c 0.02,-0.04 0.21,-0.6 0.25,-0.72 l 0.41,0.07 0,0.15 4.22,0.5 c 0,0 0.03,-1.05 0.15,-2.59 l 2.16,0.59 c -0.02,0.04 -0.22,0.53 -0.22,0.53 l 5.28,1.47 c 0,0 0.76,-1.78 1.28,-3.03 l 3.32,1.5 0.03,-0.06 4.19,1.59 c 0.03,-0.06 0.3,-0.95 0.4,-1.22 l 3.25,1.22 c 0,0 0.19,-0.4 0.22,-0.47 l 2.75,0.47 c 0,0 0.33,-1.1 0.41,-1.34 l 3.65,1.34 c 0.35,-0.78 5.57,-16.91 11.28,-34.56 7.09,-12.14 15.86,-25.9 25.75,-38.75 -20.91,33.3 -34.56,70.28 -34.56,70.28 l 2.97,0.81 c -0.05,0.15 -0.28,0.75 -0.28,0.75 l 5.28,1.47 c 25.8466,-52.9005 27.14766,-73.40579 17.09,-2.44 l 3.6,1.16 0.22,0.06 0.72,0.22 0,-0.06 4.34,1.06 c 0.02,-0.07 0.22,-0.95 0.28,-1.22 l 0.22,0.03 c 0,0.04 -0.03,0.29 -0.03,0.29 -4.78273,-45.22833 -9.72287,-66.14724 -6.41,-76.5 z M 240.76,402.1 c 0.28,0 0.56,0.03 0.85,0.03 -10.52,7.01 -20.19,18.38 -28.82,31.69 l 0.69,-12.53 0.38,-1.91 -0.32,0.75 0.22,-4 -1.28,6.57 -8.53,20.4 c -3.5,4.26 -6.89,8.8 -10.12,13.5 -0.5,-0.07 -0.99,-0.16 -1.47,-0.22 -0.99,-0.17 -1.96,-0.29 -2.91,-0.4 6.91,-22.72 18.05,-43.18 35.97,-50.75 1.58,0.22 3.16,0.49 4.81,0.87 -1.32,-0.49 -2.6,-0.9 -3.87,-1.28 4.38,-1.72 9.18,-2.67 14.4,-2.72 z m -28.59,3.22 c -3.46,2.15 -6.64,4.85 -9.56,8 -10.77,7.15 -21.14,18.1 -30.63,30.6 8.87,-19.7 21.68,-35.47 40.19,-38.6 z m -40.06,8.66 c -1.74,1.8 -3.45,3.69 -5.13,5.69 l 0.44,-2.16 -1,2.84 c -0.34,0.42 -0.69,0.83 -1.03,1.25 -0.41,0.12 -0.82,0.22 -1.22,0.35 l 0.03,-0.22 0.41,-1.94 -0.32,0.75 0.13,-1.84 c 0.51,-0.37 1.02,-0.72 1.53,-1.07 2.05,-1.34 4.11,-2.55 6.16,-3.65 z m -44.16,1.28 c 5.08,-0.03 10.45,0.91 16.09,3 -0.35,0.14 -0.71,0.29 -1.06,0.44 -3.54,1.19 -6.83,2.66 -9.87,4.4 l 0.15,-0.72 0.6,-1.65 -0.38,0.62 0.78,-3.84 -2.18,6.19 -0.04,0.06 c -2.33,1.41 -4.53,2.96 -6.59,4.66 -5.12,0.9 -9.85,2.49 -14.22,4.59 3.65,-6.67 7.85,-12.65 12.69,-17.53 1.33,-0.15 2.66,-0.21 4.03,-0.22 z m -25.41,0.53 c -12.881,6.74 -23.684,20.33 -32.465,36.06 0.579,-3.89 0.632,-4.17 1.188,-7.9 7.283,-12.7 17.364,-23.1 31.277,-28.16 z m 61.5,3.16 -0.71,3.25 c -0.95,0.31 -1.87,0.64 -2.79,1 -1.14,0.34 -2.25,0.69 -3.34,1.09 2.28,-1.92 4.56,-3.7 6.84,-5.34 z m -53.59,0.5 c -4.76,6.44 -8.81,14.03 -12.281,22.22 -0.156,0.13 -0.314,0.27 -0.469,0.4 l 3.38,-16.62 c 2.98,-2.37 6.1,-4.4 9.37,-6 z m 53.78,3.59 c -0.05,0.07 -0.1,0.15 -0.15,0.22 l 0,-0.13 c 0.05,-0.02 0.1,-0.06 0.15,-0.09 z m -1.37,0.72 -1.19,2.66 c -9.76,13.22 -18.36,29.25 -25.56,45.03 -5.76,6.52 -10.58,13.03 -14.57,19.25 5.87,-25.89 17.68,-54.84 41.32,-66.94 z m 105.78,2.94 c -1.09,1.5 -2.14,3.05 -3.19,4.62 -0.11,0.12 -0.24,0.23 -0.34,0.35 l 0.43,-2.29 c 1.03,-0.91 2.07,-1.82 3.1,-2.68 z M 97.7,428.35 86.763,446.6 82.888,458.1 c -2.309,-0.39 -4.522,-0.57 -6.657,-0.62 6.038,-11.26 13.157,-21.52 21.469,-29.13 z m 140.97,4.22 c 3.95,-0.07 8.16,0.85 12.28,1.19 -2.36,2.14 -4.72,4.37 -7.03,6.72 -3.71,-0.13 -7.68,-1.32 -11.69,-2.6 l 0.78,-4.28 c 1.79,-0.71 3.69,-0.99 5.66,-1.03 z m -118.06,0.35 c -12.34,12.8 -18.88,30.87 -22.254,48.34 -1.88,2.81 -3.725,5.59 -5.468,8.31 2.75,-14.76 6.841,-30.94 12.942,-45.34 4.44,-4.49 9.37,-8.32 14.78,-11.31 z m 139.81,1.25 -6.53,11.31 c -0.23,0.31 -0.46,0.63 -0.69,0.94 l 1.22,-6.1 c 1.98,-2.12 3.99,-4.19 6,-6.15 z m -71.72,0.9 c -2.98,6.49 -5.51,13.48 -7.66,20.69 -2.89,0.22 -5.6,0.77 -8.15,1.56 5.02,-7.79 10.31,-15.33 15.81,-22.25 z m 43.06,5.13 c 3.6,0.87 7.22,1.81 10.75,1.75 -5.36,5.56 -10.56,11.63 -15.53,17.9 0.47,-1.45 2.69,-8.34 2.69,-8.34 z m -12.47,11.47 c -0.17,0.55 -2.18,6.77 -2.84,8.84 -0.91,0.28 -1.79,1.06 -2.66,2.44 -0.43,0.7 -0.85,1.39 -1.28,2.09 2.14,-4.53 4.4,-8.99 6.78,-13.37 z m -28.71,5.28 c 0.96,-0.02 1.93,0.02 2.93,0.06 -2.56,3.74 -5.03,7.57 -7.4,11.44 0.9,-3.84 1.91,-7.67 3.03,-11.44 0.47,-0.02 0.95,-0.05 1.44,-0.06 z m 49.21,0.53 c -0.28,0.83 -1.18,3.52 -1.59,4.75 -1.05,0.39 -2.06,0.83 -3.06,1.31 1.53,-2.04 3.08,-4.06 4.65,-6.06 z m -59.5,0.94 c -0.83,2.94 -1.63,5.9 -2.34,8.87 -2.17,-2.19 -4.31,-4.05 -6.37,-5.25 2.66,-1.53 5.57,-2.76 8.71,-3.62 z m 77.88,3.21 c 1.63,0.02 3.32,0.12 5.06,0.32 -3.17,3.99 -6.19,8.11 -9.12,12.25 1.55,-4.82 3.16,-9.84 4,-12.44 0.02,-0.04 0.04,-0.08 0.06,-0.13 z m -88.91,1.88 c 2.53,2.46 5.12,5.39 7.66,8.34 -1.1,4.98 -2.03,9.93 -2.84,14.75 -3.04,-5.76 -6.22,-11.58 -9.54,-15.75 1.39,-2.35 2.81,-4.69 4.25,-7.03 0.16,-0.1 0.32,-0.21 0.47,-0.31 z m 67,4.5 c -1.08,3.23 -1.76,5.21 -3.15,9.37 -0.84,-1.71 -1.65,-3.33 -2.5,-4.84 1.75,-1.66 3.64,-3.19 5.65,-4.53 z m -7.9,6.81 c 0.98,1.97 1.95,3.96 2.9,5.88 -11.64,20.66 -20.24,39.81 -24.25,49.18 0.77,-5.94 2.19,-14.14 4.72,-22.84 0.69,-2.13 1.26,-3.96 1.97,-6.16 3.29,-9.37 7.97,-18.8 14.66,-26.06 z m -38.38,2.72 c -0.37,0.86 -0.73,1.71 -1.09,2.56 -0.08,-0.09 -0.15,-0.19 -0.22,-0.28 0.43,-0.76 0.88,-1.52 1.31,-2.28 z m -2.97,5.28 c 0.18,0.16 0.36,0.29 0.53,0.44 -2.57,6.17 -4.91,12.18 -7,17.78 0.3,-2.55 0.63,-5.16 1,-7.84 1.75,-3.41 3.55,-6.86 5.47,-10.38 z m -67.18,29.38 c -1.18,3.36 -2.16,6.31 -3.1,9.15 0.08,-0.81 0.16,-1.58 0.25,-2.43 0.83,-2.1 1.76,-4.35 2.85,-6.72 z m -7.41,20.62 c 0.01,0.87 0.01,1.57 0.03,2.25 -0.13,0.44 -0.26,0.84 -0.34,1.13 0,-0.68 0.01,-1.32 0.03,-2.28 0.08,-0.35 0.18,-0.68 0.28,-1.1 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path9121"
+       style="fill:#1a6718;fill-opacity:1;stroke:url(#linearGradient4059)"
+       d="m 121.44,299.96 -1.06,6.97 -9.31,27.15 c 0,0 -5.68,40.13 -11.346,80.5 -0.095,-0.01 -0.187,-0.02 -0.281,-0.03 -60.495,-10.59 -63.688,86.5 -63.688,86.5 l 3.094,0.25 c -10e-4,0.02 0,0.19 0,0.19 l 4.563,0.37 c 0,0 0.033,-1.08 0.093,-2.65 l 0.719,0.19 c -0.037,0.27 -0.125,0.84 -0.125,0.84 l 5.75,1.62 c 0,0 0.138,-1.34 0.531,-3.78 l 2.563,0.94 c -0.071,0.15 -0.375,0.78 -0.375,0.78 l 5.625,2.06 c 0,0 15.662,-34.13 38.719,-67.25 -2.814,20.1 -5.423,38.97 -7.063,50.88 -1.239,7.35 -1.712,12.18 -1.844,13.62 -0.013,0.12 -0.123,0.97 -0.125,1 l 3.125,0.97 0,0.1 0.657,0.09 0.593,0.19 0,-0.1 2.438,0.38 0.406,0.12 0,-0.06 0.375,0.06 c 0.077,-0.32 0.807,-4.98 1.781,-11.4 2.279,-10.71 6.515,-27.64 13.685,-45 0.06,0.06 0.11,0.12 0.16,0.19 -2.07,10.25 -3.59,17.86 -5.44,27.09 -4.2,12.59 -7.58,22.77 -8.092,24.53 -0.039,0.08 -0.219,0.41 -0.219,0.41 l 0.063,0.03 c -0.009,0.03 -0.09,0.29 -0.094,0.31 l 3.752,1.72 0.22,0.09 0.78,0.35 0.03,-0.07 4.53,1.75 c 0,0 0.03,-0.08 0.03,-0.09 l 0.25,0.09 c 0,0 0.09,-0.15 0.1,-0.15 l 0.46,0.15 c 0.02,-0.03 0.16,-0.51 0.19,-0.59 l 2.5,0.59 c 0.02,-0.05 0.18,-0.77 0.22,-0.93 l 2.53,0.93 c 0,0 2.03,-12.4 10.81,-30.28 5.24,-8.89 11.49,-19.04 18.47,-29.53 1.86,-2.41 3.82,-4.86 5.91,-7.31 -17.23,25.83 -18.56,66.31 -18.56,66.31 l 3.09,0.25 0,0.19 4.56,0.37 c 0,0 0.21,-52.47 26.03,-75.78 2.55,3.37 5.09,7.57 7.54,11.82 -17.4,31.21 -28.29,60.65 -28.29,60.65 l 3.22,0.91 c -0.05,0.14 -0.28,0.78 -0.28,0.78 l 5.75,1.62 c 0,0 0.25,-0.64 0.31,-0.81 l 2.16,0.81 c 0,0 10.93,-21.58 27.5,-47.81 1.11,1.21 2.21,2.15 3.28,2.69 -0.05,-0.09 -0.1,-0.19 -0.15,-0.28 0.92,0.94 1.83,1.7 2.75,2.15 -1.33,-2.28 -2.69,-4.81 -4.07,-7.43 6.23,-9.74 13.22,-20.02 20.66,-30 -6.24,17.89 -8.39,37.26 -8.94,52.47 -6.38,14.19 -8.31,23.9 -8.31,23.9 l 3.78,1.41 c -0.06,0.27 -0.19,0.84 -0.19,0.84 l 5.63,2.06 c 0,0 0.09,-0.48 0.12,-0.65 l 3.03,0.34 c 0,0 -0.26,-4.04 -0.25,-10.69 0.04,-0.12 0.09,-0.25 0.13,-0.37 0.19,6.85 0.59,11.03 0.59,11.03 l 3.47,0.34 c 0,0 -0.39,-9.57 0.56,-23.59 5.03,-11.57 13.17,-26.34 26.1,-41.84 -3.14,9.34 -4.37,13.04 -7.75,23.15 -10.68,21.91 -16.97,38.97 -16.97,38.97 l 3.22,0.91 c -0.06,0.14 -0.31,0.78 -0.31,0.78 l 5.75,1.62 c 0,0 0.14,-0.36 0.15,-0.4 l 1.41,0.4 c 0,0 0.4,-0.93 0.47,-1.09 l 2.84,1.09 c 0.34,-0.74 5.15,-14.74 10.66,-30.87 3.42,-7.08 7.37,-14.95 11.78,-23.22 -11.41,28.51 -17.85,51.78 -17.85,51.78 l 4.47,0.75 c -0.01,0.04 -0.18,0.6 -0.18,0.6 l 5.87,0.96 c 42.68525,-48.66561 -34.8429,-4.13706 8.25,-106.78 11.48996,-0.42052 -8.42422,-2.2453 -11.91,-3.34 1.67,-2.21 3.44,-4.32 5.32,-6.31 0.05,-0.05 0.1,-0.08 0.15,-0.13 0.05,-0.05 0.08,-0.11 0.13,-0.15 2.94,-2.78 5.94,-5.34 8.9,-7.72 16.42499,-11.83515 10.88499,-20.44672 -23.78,11.56 -6.95,-1.66 -13.59,-1.71 -18.9,4.37 -5.45,6.24 -10.65,13.15 -15.53,20.38 -10.37,-0.27 -18.8,2.92 -25.69,8.19 -0.18,-0.08 -0.36,-0.16 -0.53,-0.22 -0.61,-0.53 -1.21,-0.97 -1.82,-1.35 14.36,-19.17 30.47,-37.18 46.47,-48.09 5.17,-3.38 10.35,-6.07 15.44,-7.94 -0.26,0.02 -0.52,0.05 -0.78,0.07 0.57,-0.22 1.15,-0.47 1.72,-0.66 -1.58,0.22 -3.16,0.57 -4.75,1 -18.61,2.74 -37.75,18.03 -55.06,37.34 -5.63,0.56 -11.77,-2.09 -17.94,-4.62 8.98,-7.9 19.52,-13.52 31.87,-15.22 -4.32,0.08 -8.42,0.58 -12.31,1.44 -7.22,1 -13.75,3.21 -19.66,6.31 l 2.5,-12.47 0.66,-1.84 -0.41,0.68 0.85,-4.21 -2.41,6.81 -0.12,0.22 0.4,-2.22 0.63,-1.88 -0.41,0.72 0.78,-4.25 -2.31,6.88 -9.12,15.78 c -0.75,-0.2 -1.49,-0.37 -2.22,-0.5 l 1.53,-20 0.4,-1.91 -0.31,0.72 0.31,-4.25 -1.53,6.97 -8.18,18.56 c -2.37,0.61 -4.68,1.86 -6.85,3.97 -2.21,2.16 -4.37,4.42 -6.53,6.75 5.02,-33.73 10.25,-69.16 10.25,-69.16 l 0.91,-29.9 0.28,-1.97 -0.25,0.75 z m 94.6,92.78 c -6.83,6.77 -13.41,14.36 -19.69,22.25 -0.51,-0.09 -1,-0.15 -1.5,-0.22 3.82,-5.71 7.83,-11.23 12,-16.41 2.83,-3.52 5.93,-5.11 9.19,-5.62 z m 11.59,1.19 c 12.71218,3.62461 20.81765,-3.76157 12.63,9.93 0,0 -3.73,11.13 -5.16,15.38 -1.26,0.27 -2.54,1 -3.81,2.25 -10.53,10.25 -18.67,20.78 -24.97,30.62 3.34,-19.67 9.58,-41.5 21.31,-58.18 z m -87.12,5.72 c 6.26,1.85 12.67,4.83 18.96,3.59 -13.28,14.99 -25.45,32.24 -35.43,47.87 0.16,-0.5 0.18,-0.49 0.34,-1 7.34,-21.58 14.69,-43.25 14.69,-43.25 z m 19.87,2.56 c -0.2,0.22 -0.39,0.46 -0.59,0.69 -1.08,0.04 -2.14,-0.02 -3.22,-0.16 1.29,-0.01 2.57,-0.19 3.81,-0.53 z m -41.37,4.28 c -0.1,0.48 -0.87,4.26 -1.07,5.22 -4.57,6.14 -8.47,12.87 -11.78,19.81 l -0.06,-0.09 c 0.62,-4.15 1.09,-7.4 1.72,-11.6 3.62,-4.61 7.34,-9.1 11.19,-13.34 z m -21.47,8.69 c 0.697,-0.02 1.409,-0.02 2.125,0 -0.113,0.8 -0.138,1 -0.25,1.81 -1.159,1.45 -2.306,2.9 -3.438,4.37 -0.527,-0.27 -1.038,-0.48 -1.562,-0.65 -0.939,-0.67 -1.854,-1.21 -2.782,-1.6 -0.68,-0.38 -1.357,-0.72 -2.031,-0.9 -0.95,-0.71 -1.878,-1.23 -2.812,-1.6 3.324,-0.87 6.896,-1.37 10.75,-1.43 z m 97.003,0.03 c 0.51,0.02 1.03,0.08 1.56,0.12 -3.25,4.09 -6.42,8.25 -9.47,12.44 2.54,-4.23 5.17,-8.45 7.91,-12.56 z m -10.41,0.62 c -3.88,5.85 -7.55,11.87 -11,17.88 -2.73,-4.08 -5.58,-7.31 -8.5,-8.81 5.38,-4.48 11.8,-7.74 19.5,-9.07 z m -106.19,4.25 c -16.876,19.7 -26.34,39.55 -31.531,54.35 3.76,-19.53 12.276,-44.04 31.531,-54.35 z m 14.062,0.22 c 0.881,0.86 1.74,1.81 2.625,2.85 -23.245,30.72 -40.245,65.12 -43.875,72.68 2.259,-12.07 9.929,-40.78 34.844,-71.75 2.076,-2.58 4.228,-3.73 6.406,-3.78 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+    <g
+       transform="translate(-83.044,-153.33)"
+       id="g6606">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 106.07,694.77 c 0,0 9.8,-179.05 93.44,-147.99 -81.83,-19.19 -87.38,149 -87.38,149 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6608" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 110.11,695.78 c 0,0 9.8,-179.05 93.44,-147.99 -81.83,-19.19 -87.38,149 -87.38,149 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6610" />
+    </g>
+    <g
+       transform="translate(-134.227,-144.85)"
+       id="g6618">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 260.92,687.14 c 0,0 7.6,-103.23 72.43,-85.32 -63.42,-11.07 -67.73,85.9 -67.73,85.9 l -4.7,-0.58 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6620" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 264.05,687.72 c 0,0 7.6,-103.23 72.43,-85.32 -63.42,-11.07 -67.73,85.9 -67.73,85.9 l -4.7,-0.58 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6622" />
+    </g>
+    <g
+       transform="translate(-109.077,-149.09)"
+       id="g6624">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 323.85,690.17 c 0,0 -5.14128,-117.08994 52.42872,-131.36994 C 325.36872,589.46006 329.92,691.18 329.92,691.18 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6626" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 328.25,691.54 c 0,0 -5.4055,-114.35928 47.4745,-132.43928 C 326.0745,587.29072 334.31,692.55 334.31,692.55 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6628" />
+    </g>
+    <g
+       transform="translate(-275.185,-146.09)"
+       id="g6630">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 411.25,688.54 c 0,0 17.57,-70.18 48.13,-114 10.74,-15.39 29.09,-0.3 42.83,-5 -12.51,7.1 -29.74,-7.24 -39.53,8.05 -29.01,45.37 -45.37,111.96 -45.37,111.96 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cscscc"
+         id="path6632" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 408.07,687.12 c 0,0 17.56,-70.18 48.13,-113.99 10.73,-15.39 31.91,0.4 45.66,-4.3 -12.52,7.11 -32.93,-8.3 -42.71,7 -29.02,45.36 -45.02,112.3 -45.02,112.3 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cscscc"
+         id="path6634" />
+    </g>
+    <g
+       inkscape:tile-y0="362.49224"
+       transform="matrix(0.19804,-0.043822,0.038307,0.26455,-62.495,288.57)"
+       inkscape:tile-x0="313.37179"
+       id="g6642">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 308.15,1010.1 C 309.58,1001.6 490,389.51 490,389.51 l 62.86,-111.43 -224.71,739.22 -20,-7.2 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="ccccc"
+         id="path6644" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 343.06,1020.3 c 3.38,-8 190.26,-621.64 190.26,-621.64 l 20.44,-134.12 -231.42,751.06 20.72,4.7 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="ccccc"
+         id="path6646" />
+    </g>
+    <g
+       inkscape:tile-y0="509.7813"
+       inkscape:tile-cy="634.91727"
+       inkscape:tile-cx="84.960712"
+       inkscape:tile-h="250.27194"
+       transform="matrix(0.24818,-0.016252,0.017562,0.26818,-33.108,344.2)"
+       inkscape:tile-w="19.843426"
+       inkscape:tile-x0="75.038999"
+       id="g6654">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 383.34,756.09 C 384.77,747.52 490,389.51 490,389.51 l 62.86,-111.43 -149.52,485.15 -20,-7.14 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="ccccc"
+         id="path6656" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 422.61,768.62 c 3.37,-8.01 110.71,-369.96 110.71,-369.96 l 20.44,-134.12 -154.54,497.23 23.39,6.85 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="ccccc"
+         id="path6658" />
+    </g>
+    <g
+       transform="matrix(0.98973,0.14294,-0.14294,0.98973,151.765,-162.78)"
+       id="g6660">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 106.07,694.77 c 0,0 9.8,-179.05 93.44,-147.99 -81.83,-19.19 -87.38,149 -87.38,149 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6662" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 110.11,695.78 c 0,0 9.8,-179.05 93.44,-147.99 -81.83,-19.19 -87.38,149 -87.38,149 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6664" />
+    </g>
+    <g
+       transform="matrix(0.98973,0.14294,-0.14294,0.98973,-36.361,-175.76)"
+       id="g6666">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 196.47,697.29 c 0,0 -7.07,-120.71 66.67,-132.83 -63.13,18.18 -63.13,133.34 -63.13,133.34 l -3.54,-0.51 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6668" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 192.43,696.79 c 0,0 -7.57,-118.69 66.17,-130.82 -65.16,15.16 -62.63,131.32 -62.63,131.32 l -3.54,-0.5 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6670" />
+    </g>
+    <g
+       transform="matrix(0.99917,-0.040816,0.040816,0.99917,-34.803,-148.01)"
+       id="g6678">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 106.07,694.77 c 0,0 9.8,-179.05 93.44,-147.99 -81.83,-19.19 -87.38,149 -87.38,149 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6680" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 110.11,695.78 c 0,0 9.8,-179.05 93.44,-147.99 -81.83,-19.19 -87.38,149 -87.38,149 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6682" />
+    </g>
+    <g
+       transform="matrix(0.99917,-0.040816,0.040816,0.99917,-89.02,-145.6)"
+       id="g6684">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 196.47,697.29 c 0,0 -7.07,-120.71 66.67,-132.83 -63.13,18.18 -63.13,133.34 -63.13,133.34 l -3.54,-0.51 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6686" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 192.43,696.79 c 0,0 -7.57,-118.69 66.17,-130.82 -65.16,15.16 -62.63,131.32 -62.63,131.32 l -3.54,-0.5 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6688" />
+    </g>
+    <g
+       transform="matrix(0.73956012,0.10822,-0.08050778,0.99413,-48.65829,-187.2)"
+       id="g6702">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 411.25,688.54 c 0,0 17.57,-70.18 48.13,-114 10.74,-15.39 29.09,-0.3 42.83,-5 -12.51,7.1 -29.74,-7.24 -39.53,8.05 -29.01,45.37 -45.37,111.96 -45.37,111.96 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cscscc"
+         id="path6704" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 408.07,687.12 c 0,0 17.56,-70.18 48.13,-113.99 10.73,-15.39 31.91,0.4 45.66,-4.3 -12.52,7.11 -32.93,-8.3 -42.71,7 -29.02,45.36 -45.02,112.3 -45.02,112.3 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cscscc"
+         id="path6706" />
+    </g>
+    <g
+       transform="matrix(0.99413,0.10822,-0.10822,0.99413,-292.735,-201.43)"
+       id="g6708">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 488.19,692.48 c 0,0 0.07,-41.68 30.63,-85.5 10.74,-15.39 31.15,25.38 42.89,28.68 -12.51,-14.4 -29.8,-40.92 -39.59,-25.63 -29.01,45.37 -27.87,83.46 -27.87,83.46 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cscscc"
+         id="path6710" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 492.25,694.04 c 0,0 0.07,-41.68 30.63,-85.5 10.74,-15.39 30.09,25.2 41.83,28.5 -12.51,-14.4 -28.74,-40.74 -38.53,-25.45 -29.01,45.37 -27.87,83.46 -27.87,83.46 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cscscc"
+         id="path6712" />
+    </g>
+    <g
+       transform="matrix(0.98209,0.1884,-0.1884,0.98209,-120.06,-199.67)"
+       id="g6714">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 323.85,690.17 c 0,0 39.76,-143.96 97.33,-158.24 -50.91,30.66 -91.26,159.25 -91.26,159.25 l -6.07,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cccc"
+         id="path6716" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 328.25,691.54 c 0,0 40.91,-142.29 93.79,-160.37 -49.65,28.19 -87.73,161.38 -87.73,161.38 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cccc"
+         id="path6718" />
+    </g>
+    <g
+       transform="matrix(0.3930782,0.1884,-0.07540646,0.98209,114.77093,-212.36)"
+       id="g6720">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 411.25,688.54 c 0,0 17.57,-70.18 48.13,-114 10.74,-15.39 29.09,-0.3 42.83,-5 -12.51,7.1 -29.74,-7.24 -39.53,8.05 -29.01,45.37 -45.37,111.96 -45.37,111.96 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cscscc"
+         id="path6722" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 408.07,687.12 c 0,0 17.56,-70.18 48.13,-113.99 10.73,-15.39 31.91,0.4 45.66,-4.3 -12.52,7.11 -32.93,-8.3 -42.71,7 -29.02,45.36 -45.02,112.3 -45.02,112.3 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cscscc"
+         id="path6724" />
+    </g>
+    <g
+       transform="matrix(0.98209,0.1884,-0.1884,0.98209,-190.869,-233.02)"
+       id="g6726">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 488.19,692.48 c 0,0 0.07,-41.68 30.63,-85.5 10.74,-15.39 31.15,25.38 42.89,28.68 -12.51,-14.4 -29.8,-40.92 -39.59,-25.63 -29.01,45.37 -27.87,83.46 -27.87,83.46 l -6.06,-1.01 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="cscscc"
+         id="path6728" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 492.25,694.04 c 0,0 0.07,-41.68 30.63,-85.5 10.74,-15.39 30.09,25.2 41.83,28.5 -12.51,-14.4 -28.74,-40.74 -38.53,-25.45 -29.01,45.37 -27.87,83.46 -27.87,83.46 l -6.06,-1.01 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="cscscc"
+         id="path6730" />
+    </g>
+    <g
+       inkscape:tile-y0="509.7813"
+       inkscape:tile-cy="634.91727"
+       inkscape:tile-cx="84.960712"
+       inkscape:tile-h="250.27194"
+       transform="matrix(0.24828,0.014648,-0.015828,0.26829,107.975,331.05)"
+       inkscape:tile-w="19.843426"
+       inkscape:tile-x0="75.038999"
+       id="g6744">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 383.34,756.09 C 384.77,747.52 490,389.51 490,389.51 l 62.86,-111.43 -149.52,485.15 -20,-7.14 z"
+         style="fill:#4e9a06"
+         sodipodi:nodetypes="ccccc"
+         id="path6746" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 422.61,768.62 c 3.37,-8.01 110.71,-369.96 110.71,-369.96 l 20.44,-134.12 -154.54,497.23 23.39,6.85 z"
+         style="fill:#73d216"
+         sodipodi:nodetypes="ccccc"
+         id="path6748" />
+    </g>
+    <g
+       transform="matrix(0.88770175,0,0,1,304.48274,-153.33)"
+       id="g6750" />
+    <g
+       transform="matrix(0.88696496,-0.040816,0.03623243,0.99917,254.04353,-148.01)"
+       id="g6822" />
+    <rect
+       id="rect10437"
+       style="fill:url(#linearGradient10445)"
+       height="131.52"
+       width="246.95"
+       y="410.57999"
+       x="23.358" />
+  </g>
+  <metadata
+     id="metadata161">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2009-01-20T22:49:54</dc:date>
+        <dc:description />
+        <dc:source>https://openclipart.org/detail/21212/grass-texture-by-rg1024-21212</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>rg1024</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>color</rdf:li>
+            <rdf:li>grass</rdf:li>
+            <rdf:li>green</rdf:li>
+            <rdf:li>nature</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/misc/landuse/mud.svg
===================================================================
--- /trunk/images/presets/misc/landuse/mud.svg	(revision 10565)
+++ /trunk/images/presets/misc/landuse/mud.svg	(revision 10565)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mud.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="256"
+     inkscape:cx="15.195365"
+     inkscape:cy="0.39139597"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       id="XMLID_33_"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       class="st0"
+       width="16.000002"
+       height="16.000042"
+       style="fill:#c87137" />
+    <rect
+       id="XMLID_32_"
+       x="8.000001"
+       y="1040.3622"
+       class="st1"
+       width="4.000001"
+       height="0.99997616"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_31_"
+       x="13.000002"
+       y="1037.3621"
+       class="st1"
+       width="3.0000005"
+       height="1.0201575"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_30_"
+       x="11.000002"
+       y="1049.3621"
+       class="st1"
+       width="4.0000005"
+       height="1.0000415"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_29_"
+       x="0.0046444535"
+       y="1044.3621"
+       class="st1"
+       width="2.9953556"
+       height="0.99997544"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_28_"
+       x="5.0000005"
+       y="1047.3621"
+       class="st1"
+       width="4.0000005"
+       height="1.0000411"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_27_"
+       x="0.93384117"
+       y="1050.3621"
+       class="st1"
+       width="4.0661592"
+       height="1.0000416"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_26_"
+       x="1.9999999"
+       y="1038.3621"
+       class="st1"
+       width="4.000001"
+       height="1.0000395"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_25_"
+       x="4.0000005"
+       y="1042.3621"
+       class="st1"
+       width="4.0000005"
+       height="1.0000402"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_24_"
+       x="10.000001"
+       y="1045.3621"
+       class="st1"
+       width="4.0000014"
+       height="1.0000405"
+       style="fill:#ffffff" />
+    <g
+       id="g25"
+       transform="matrix(0.07235156,0,0,0.07235156,-25.927739,1028.6929)">
+      <path
+         class="st3"
+         d="M 362.7,285.1"
+         id="path27"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#1f3d8a;stroke-miterlimit:10" />
+    </g>
+    <g
+       id="g29"
+       transform="matrix(0.07235156,0,0,0.07235156,-25.927739,1028.6929)">
+      <path
+         class="st3"
+         d="M 354.7,296.1"
+         id="path31"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#1f3d8a;stroke-miterlimit:10" />
+    </g>
+    <g
+       id="g33"
+       transform="matrix(0.07235156,0,0,0.07235156,-25.927739,1028.6929)">
+      <path
+         class="st4"
+         d="M 354.7,296.1"
+         id="path35"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#9c672c;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:2, 1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/misc/landuse/orchard.svg
===================================================================
--- /trunk/images/presets/misc/landuse/orchard.svg	(revision 10565)
+++ /trunk/images/presets/misc/landuse/orchard.svg	(revision 10565)
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<!-- Created by jmrivera (jmanuel1995@yahoo.es) 16-07-04 -->
+
+<!-- tree_whit_fruits - arbol_con_frutas -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg602"
+   space="preserve"
+   viewBox="0 0 670.93 802.78"
+   sodipodi:version="0.32"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="18.svg"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs24" />
+  <sodipodi:namedview
+     id="base"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     snaptoguides="true"
+     inkscape:zoom="0.8780247"
+     inkscape:window-height="988"
+     showgrid="false"
+     inkscape:current-layer="svg602"
+     inkscape:cx="227.24694"
+     inkscape:cy="436.22506"
+     inkscape:window-width="1680"
+     inkscape:window-maximized="1" />
+  <path
+     sodipodi:cx="155.39099"
+     sodipodi:cy="403.24664"
+     transform="matrix(1.7173094,0,0,1.6101263,-102.20154,-415.5397)"
+     d="m 251.27054,403.24664 a 95.879547,89.267166 0 1 1 -191.759096,0 95.879547,89.267166 0 1 1 191.759096,0 z"
+     sodipodi:type="arc"
+     style="fill:#000000;fill-rule:evenodd"
+     sodipodi:ry="89.267166"
+     sodipodi:rx="95.879547"
+     id="path623" />
+  <path
+     sodipodi:cx="277.72006"
+     sodipodi:cy="323.89801"
+     transform="matrix(1.5797738,0,0,1.507896,-105.15067,-350.46672)"
+     d="m 368.08929,323.89801 a 90.369225,91.471298 0 1 1 -180.73845,0 90.369225,91.471298 0 1 1 180.73845,0 z"
+     sodipodi:type="arc"
+     style="fill:#000000;fill-rule:evenodd"
+     sodipodi:ry="91.471298"
+     sodipodi:rx="90.369225"
+     id="path624" />
+  <path
+     sodipodi:cx="535.60297"
+     sodipodi:cy="438.51266"
+     transform="matrix(1.5867553,0,0,1.5142196,-332.80356,-452.04485)"
+     d="m 632.58458,438.51266 a 96.981613,95.879547 0 1 1 -193.96323,0 96.981613,95.879547 0 1 1 193.96323,0 z"
+     sodipodi:type="arc"
+     style="fill:#000000;fill-rule:evenodd"
+     sodipodi:ry="95.879547"
+     sodipodi:rx="96.981613"
+     id="path625" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 240.05644,438.46485 c 26.66933,0.96171 53.33866,1.93658 80.00799,2.89828 5.13839,48.40128 7.19095,64.85561 24.63073,84.20821 30.77446,-17.41603 49.23354,-34.84523 55.39122,-60.96927 0,0 120.02595,-17.4292 76.93613,0 -27.68862,66.77901 -77.51739,83.45946 -86.74693,138.63217 -11.28211,64.8556 4.21164,124.95322 11.40259,186.89737 -57.45775,-0.9617 -124.22881,0.97488 -181.68656,0 31.80771,-109.37055 47.66033,-126.37132 60.99499,-206.70637 -2.05256,-61.94415 -26.5762,-91.72425 -40.93016,-144.96039 z"
+     style="fill:#b85e00;fill-rule:evenodd;stroke:#000000;stroke-width:24.75204468"
+     sodipodi:nodetypes="cccccccccc"
+     id="path628" />
+  <path
+     sodipodi:cx="189.55496"
+     sodipodi:cy="480.39108"
+     transform="matrix(1.6516833,0,0,1.475488,-34.570636,-348.74883)"
+     d="m 279.92419,480.39108 a 90.369225,82.654755 0 1 1 -180.738452,0 90.369225,82.654755 0 1 1 180.738452,0 z"
+     sodipodi:type="arc"
+     style="fill:#000000;fill-rule:evenodd"
+     sodipodi:ry="82.654755"
+     sodipodi:rx="90.369225"
+     id="path626" />
+  <path
+     sodipodi:cx="392.33472"
+     sodipodi:cy="463.86011"
+     transform="matrix(1.5458437,0,0,1.469428,-158.71986,-314.27775)"
+     d="m 484.90808,463.86011 a 92.573364,85.960983 0 1 1 -185.14673,0 92.573364,85.960983 0 1 1 185.14673,0 z"
+     sodipodi:type="arc"
+     style="fill:#000000;fill-rule:evenodd"
+     sodipodi:ry="85.960983"
+     sodipodi:rx="92.573364"
+     id="path627" />
+  <path
+     sodipodi:cx="392.33472"
+     sodipodi:cy="463.86011"
+     transform="matrix(1.3963,0,0,1.3174,-110.79758,-259.73739)"
+     d="m 484.90808,463.86011 a 92.573364,85.960983 0 1 1 -185.14673,0 92.573364,85.960983 0 1 1 185.14673,0 z"
+     sodipodi:type="arc"
+     style="fill:#80df00;fill-rule:evenodd"
+     sodipodi:ry="85.960983"
+     sodipodi:rx="92.573364"
+     id="path610" />
+  <path
+     sodipodi:cx="189.55496"
+     sodipodi:cy="480.39108"
+     transform="matrix(1.3963,0,0,1.3174,12.307344,-285.87118)"
+     d="m 279.92419,480.39108 a 90.369225,82.654755 0 1 1 -180.738452,0 90.369225,82.654755 0 1 1 180.738452,0 z"
+     sodipodi:type="arc"
+     style="fill:#80df00;fill-rule:evenodd"
+     sodipodi:ry="82.654755"
+     sodipodi:rx="90.369225"
+     id="path611" />
+  <path
+     sodipodi:cx="155.39099"
+     sodipodi:cy="403.24664"
+     transform="matrix(1.3963,0,0,1.3174,-52.323194,-297.48616)"
+     d="m 251.27054,403.24664 a 95.879547,89.267166 0 1 1 -191.759096,0 95.879547,89.267166 0 1 1 191.759096,0 z"
+     sodipodi:type="arc"
+     style="fill:#80df00;fill-rule:evenodd"
+     sodipodi:ry="89.267166"
+     sodipodi:rx="95.879547"
+     id="path612" />
+  <path
+     sodipodi:cx="535.60297"
+     sodipodi:cy="438.51266"
+     transform="matrix(1.3963,0,0,1.3174,-240.05713,-364.27176)"
+     d="m 632.58458,438.51266 a 96.981613,95.879547 0 1 1 -193.96323,0 96.981613,95.879547 0 1 1 193.96323,0 z"
+     sodipodi:type="arc"
+     style="fill:#80df00;fill-rule:evenodd"
+     sodipodi:ry="95.879547"
+     sodipodi:rx="96.981613"
+     id="path613" />
+  <path
+     sodipodi:cx="277.72006"
+     sodipodi:cy="323.89801"
+     transform="matrix(1.3963,0,0,1.3174,-55.400639,-277.16007)"
+     d="m 368.08929,323.89801 a 90.369225,91.471298 0 1 1 -180.73845,0 90.369225,91.471298 0 1 1 180.73845,0 z"
+     sodipodi:type="arc"
+     style="fill:#80df00;fill-rule:evenodd"
+     sodipodi:ry="91.471298"
+     sodipodi:rx="90.369225"
+     id="path609" />
+  <path
+     sodipodi:cx="126.95164"
+     sodipodi:cy="608.8667"
+     transform="matrix(1.2748778,0,0,1.1291962,-10.671565,-339.71937)"
+     d="m 165.37122,608.8667 a 38.419582,40.925201 0 1 1 -76.839165,0 38.419582,40.925201 0 1 1 76.839165,0 z"
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:11.41699981999999900;fill-opacity:1"
+     sodipodi:ry="40.925201"
+     sodipodi:rx="38.419582"
+     id="path629" />
+  <path
+     sodipodi:cx="126.95164"
+     sodipodi:cy="608.8667"
+     transform="matrix(1.1231139,0,0,0.99476874,175.36586,-219.36039)"
+     d="m 165.37122,608.8667 a 38.419582,40.925201 0 1 1 -76.839165,0 38.419582,40.925201 0 1 1 76.839165,0 z"
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:11.41699981999999900"
+     sodipodi:ry="40.925201"
+     sodipodi:rx="38.419582"
+     id="path630" />
+  <path
+     sodipodi:cx="126.95164"
+     sodipodi:cy="608.8667"
+     transform="matrix(1.0624028,0,0,0.91411751,411.64775,-169.15164)"
+     d="m 165.37122,608.8667 a 38.419582,40.925201 0 1 1 -76.839165,0 38.419582,40.925201 0 1 1 76.839165,0 z"
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:11.41699981999999900"
+     sodipodi:ry="40.925201"
+     sodipodi:rx="38.419582"
+     id="path631" />
+  <path
+     sodipodi:cx="126.95164"
+     sodipodi:cy="608.8667"
+     transform="matrix(1.1231139,0,0,0.99476874,96.056022,-399.80994)"
+     d="m 165.37122,608.8667 a 38.419582,40.925201 0 1 1 -76.839165,0 38.419582,40.925201 0 1 1 76.839165,0 z"
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:11.41699981999999900"
+     sodipodi:ry="40.925201"
+     sodipodi:rx="38.419582"
+     id="path632" />
+  <path
+     sodipodi:cx="126.95164"
+     sodipodi:cy="608.8667"
+     transform="matrix(1.2141666,0,0,1.1291962,253.60055,-423.3387)"
+     d="m 165.37122,608.8667 a 38.419582,40.925201 0 1 1 -76.839165,0 38.419582,40.925201 0 1 1 76.839165,0 z"
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:11.41699981999999900"
+     sodipodi:ry="40.925201"
+     sodipodi:rx="38.419582"
+     id="path633" />
+  <path
+     sodipodi:cx="126.95164"
+     sodipodi:cy="608.8667"
+     transform="matrix(0.9713361,0,0,0.88722938,403.38165,-354.13568)"
+     d="m 165.37122,608.8667 a 38.419582,40.925201 0 1 1 -76.839165,0 38.419582,40.925201 0 1 1 76.839165,0 z"
+     sodipodi:type="arc"
+     style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:11.41699981999999900"
+     sodipodi:ry="40.925201"
+     sodipodi:rx="38.419582"
+     id="path635" />
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2009-05-26T15:57:28</dc:date>
+        <dc:description>Simple tree with fruits (apple tree?) by jmrivera. From OCAL 0.18 release.</dc:description>
+        <dc:source>https://openclipart.org/detail/26259/tree-with-fruits-by-anonymous-26259</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Anonymous</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>apple</rdf:li>
+            <rdf:li>basic</rdf:li>
+            <rdf:li>cartoon</rdf:li>
+            <rdf:li>colour</rdf:li>
+            <rdf:li>fruit</rdf:li>
+            <rdf:li>green</rdf:li>
+            <rdf:li>nature</rdf:li>
+            <rdf:li>plant</rdf:li>
+            <rdf:li>red</rdf:li>
+            <rdf:li>simple</rdf:li>
+            <rdf:li>tree</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/misc/landuse/wetland.svg
===================================================================
--- /trunk/images/presets/misc/landuse/wetland.svg	(revision 10565)
+++ /trunk/images/presets/misc/landuse/wetland.svg	(revision 10565)
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="wetland.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="10.114146"
+     inkscape:cy="-7.4187777"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       id="XMLID_33_"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       class="st0"
+       width="16.000004"
+       height="16.000042"
+       style="fill:#ffffff" />
+    <rect
+       id="XMLID_32_"
+       x="8.000001"
+       y="1040.3622"
+       class="st1"
+       width="4.000001"
+       height="0.99997616"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_31_"
+       x="13.000002"
+       y="1037.3621"
+       class="st1"
+       width="3.0000005"
+       height="1.0201575"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_30_"
+       x="11.000002"
+       y="1049.3621"
+       class="st1"
+       width="4.0000005"
+       height="1.0000415"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_29_"
+       x="0.0046444535"
+       y="1044.3621"
+       class="st1"
+       width="2.9953556"
+       height="0.99997544"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_28_"
+       x="5.0000005"
+       y="1047.3621"
+       class="st1"
+       width="4.0000005"
+       height="1.0000411"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_27_"
+       x="0.93384117"
+       y="1050.3621"
+       class="st1"
+       width="4.0661592"
+       height="1.0000416"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_26_"
+       x="1.9999999"
+       y="1038.3621"
+       class="st1"
+       width="4.000001"
+       height="1.0000395"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_25_"
+       x="4.0000005"
+       y="1042.3621"
+       class="st1"
+       width="4.0000005"
+       height="1.0000402"
+       style="fill:#2090cf" />
+    <rect
+       id="XMLID_24_"
+       x="10.000001"
+       y="1045.3621"
+       class="st1"
+       width="4.0000014"
+       height="1.0000405"
+       style="fill:#2090cf" />
+    <g
+       id="g25"
+       transform="matrix(0.07235156,0,0,0.07235156,-25.927739,1028.6929)">
+      <path
+         class="st3"
+         d="M 362.7,285.1"
+         id="path27"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#1f3d8a;stroke-miterlimit:10" />
+    </g>
+    <g
+       id="g29"
+       transform="matrix(0.07235156,0,0,0.07235156,-25.927739,1028.6929)">
+      <path
+         class="st3"
+         d="M 354.7,296.1"
+         id="path31"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#1f3d8a;stroke-miterlimit:10" />
+    </g>
+    <g
+       id="g33"
+       transform="matrix(0.07235156,0,0,0.07235156,-25.927739,1028.6929)">
+      <path
+         class="st4"
+         d="M 354.7,296.1"
+         id="path35"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#9c672c;stroke-width:2;stroke-miterlimit:10;stroke-dasharray:2, 1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/misc/pipeline_marker.svg
===================================================================
--- /trunk/images/presets/misc/pipeline_marker.svg	(revision 10565)
+++ /trunk/images/presets/misc/pipeline_marker.svg	(revision 10565)
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="16"
+   id="svg3042"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="10.svg">
+  <defs
+     id="defs3044" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="16.909011"
+     inkscape:cy="8.9007289"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3050"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-340px"
+       originy="-574px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-340,-462.36218)">
+    <rect
+       style="fill:#ffcc00;fill-opacity:1;stroke:none"
+       id="rect3052"
+       width="13"
+       height="16"
+       x="340"
+       y="462.36218"
+       ry="2" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3054"
+       width="9"
+       height="1"
+       x="342"
+       y="468.36218"
+       ry="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3056"
+       width="1"
+       height="5"
+       x="346"
+       y="469.36218" />
+    <rect
+       style="fill:#ffe680;fill-opacity:1;stroke:none"
+       id="rect3058"
+       width="3"
+       height="3"
+       x="341"
+       y="464.36218" />
+    <rect
+       style="fill:#ffe680;fill-opacity:1;stroke:none"
+       id="rect3060"
+       width="5"
+       height="3"
+       x="347"
+       y="464.36218" />
+    <rect
+       style="fill:#ffe680;fill-opacity:1;stroke:none"
+       id="rect3062"
+       width="4"
+       height="2"
+       x="341"
+       y="470.36218" />
+    <rect
+       style="fill:#ffe680;fill-opacity:1;stroke:none"
+       id="rect3064"
+       width="4"
+       height="2"
+       x="348"
+       y="470.36218" />
+    <rect
+       style="fill:#ffe680;fill-opacity:1;stroke:none"
+       id="rect3066"
+       width="7"
+       height="2"
+       x="343"
+       y="475.36218" />
+    <text
+       xml:space="preserve"
+       style="font-size:1.421085px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="327.96674"
+       y="488.47931"
+       id="text3068"
+       sodipodi:linespacing="125%"
+       transform="scale(1.051936,0.95062818)"><tspan
+         sodipodi:role="line"
+         id="tspan3070"
+         x="327.96674"
+         y="488.47931">GAS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:4.3321867px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="329.89066"
+       y="483.10718"
+       id="text3068-1"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0336891,0.96740886)"><tspan
+         sodipodi:role="line"
+         id="tspan3070-7"
+         x="329.89066"
+         y="483.10718">A</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:2.38257885px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="332.9227"
+       y="483.92914"
+       id="text3068-1-4"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0249278,0.97567849)"><tspan
+         sodipodi:role="line"
+         id="tspan3070-7-0"
+         x="332.9227"
+         y="483.92914">1,2</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:2.38257885px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="336.36353"
+       y="489.0759"
+       id="text3068-1-4-9"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0249278,0.97567849)"><tspan
+         sodipodi:role="line"
+         id="tspan3070-7-0-4"
+         x="336.36353"
+         y="489.0759">3,4</tspan></text>
+  </g>
+</svg>
Index: /trunk/images/presets/misc/rock.svg
===================================================================
--- /trunk/images/presets/misc/rock.svg	(revision 10565)
+++ /trunk/images/presets/misc/rock.svg	(revision 10565)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   width="16"
+   height="12.676259"
+   viewBox="0 0 16 12.676259"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="05.svg"><metadata
+   id="metadata9"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview5"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="32"
+   inkscape:cx="8.8945999"
+   inkscape:cy="3.398555"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Ebene_1"><inkscape:grid
+     type="xygrid"
+     id="grid2986"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true"
+     originx="0.22577686px"
+     originy="2.4504823px" /></sodipodi:namedview>
+
+<path
+   style="fill:#636363;fill-opacity:1;stroke:#000000;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   d="m 0.45,8.872259 c 1.6140233,1.408284 4.8950869,-0.8866663 6.4705465,4.391e-4 0.3838252,-0.6940654 1.029243,-1.56139 0,-2.2653676 -1.4392696,-0.6147503 -2.8785401,-4.886e-4 -4.3178094,0 -0.7074582,-1.1326923 -0.2086311,-2.2653766 0,-3.3980642 0.4562285,-0.8209334 0.724337,-1.6888664 2.1589047,-2.26537404 2.5810987,-0.4254466 5.1652443,-0.871682 7.5561662,0 1.474375,1.07176704 1.942152,2.22478294 2.158907,3.39806164 -0.475694,1.369464 -1.195326,2.1245872 -2.158907,2.2653766 -0.766809,0.8892275 -0.374262,1.5756988 0,2.2653676 1.300072,-0.512887 1.81114,-0.3943491 3.232192,-6.25e-5 l 0,3.3592464 -15.1,-0.0056 z"
+   id="path2988"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccccccccccccc" /><path
+   style="fill:none;stroke:#636363;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   d="m 0.45,9.629259 0,2.597 15.1,0.006 0,-3.006"
+   id="path3758"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="cccc" /></svg>
Index: /trunk/images/presets/misc/sand.svg
===================================================================
--- /trunk/images/presets/misc/sand.svg	(revision 10565)
+++ /trunk/images/presets/misc/sand.svg	(revision 10565)
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="5.4393354"
+     inkscape:cy="9.3429067"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-765px"
+       originy="-460px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-765,-576.36218)">
+    <rect
+       style="fill:#ffcc00;fill-opacity:1;stroke:none"
+       id="rect2987"
+       width="16"
+       height="16"
+       x="765"
+       y="576.36218" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(5,3)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-1"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(1,5)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-7"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(1,2)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-4"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(4,1)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-0"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(4,5)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-9"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(-1,4)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-48"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(0,9)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-8"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(4,8)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-2"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(2,7)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-45"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(-1,12)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-5"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(2,11)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-17"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(5,12)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-11"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(6,10)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-52"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(7,7)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-76"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(8,4)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-14"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(6,0)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-23"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(3,-1)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-22"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(-2,-2)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-85"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(-1,7)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-761"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(9,1)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-89"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(10,-2)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-27"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(12,0)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-95"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(12,2)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-43"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(11,4)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-12"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(9,6)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-3"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(11,8)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-34"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(9,9)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-113"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(8,12)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-87"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(8,12)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-42"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(11,11)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-77"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(12,12)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-93"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(13,6)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-19"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(6,6)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-86"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(7,-2)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-50"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(3,13)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-28"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+    <path
+       transform="translate(-2,10)"
+       sodipodi:type="arc"
+       style="fill:#a05a2c;fill-opacity:1;stroke:none"
+       id="path3757-6"
+       sodipodi:cx="767.5"
+       sodipodi:cy="578.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 768,578.86218 c 0,0.27614 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.22386 -0.5,-0.5 0,-0.27614 0.22386,-0.5 0.5,-0.5 0.27614,0 0.5,0.22386 0.5,0.5 z" />
+  </g>
+</svg>
Index: /trunk/images/presets/misc/stone.svg
===================================================================
--- /trunk/images/presets/misc/stone.svg	(revision 10565)
+++ /trunk/images/presets/misc/stone.svg	(revision 10565)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   width="12"
+   height="10.419232"
+   viewBox="0 0 12 10.419232"
+   enable-background="new 0 0 16 16"
+   xml:space="preserve"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="04.svg"><metadata
+   id="metadata9"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview5"
+   showgrid="true"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="32"
+   inkscape:cx="5.1221722"
+   inkscape:cy="3.7958654"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Ebene_1"><inkscape:grid
+     type="xygrid"
+     id="grid2986"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true"
+     originx="-3.0000001px"
+     originy="2.4192323px" /></sodipodi:namedview>
+
+<path
+   style="fill:#636363;fill-opacity:1;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   d="m 3,10 7.34375,0 C 11.314823,10 11.966704,0.50513101 10,1 0.99999999,2 0.99999999,6 0.99999999,6.6875 1.2832209,8.0984233 1.8845196,9.2548843 3,10 z"
+   id="path2984"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ccccc" /></svg>
Index: /trunk/images/presets/misc/valve.svg
===================================================================
--- /trunk/images/presets/misc/valve.svg	(revision 10565)
+++ /trunk/images/presets/misc/valve.svg	(revision 10565)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100.5"
+   height="100.5"
+   id="svg3010">
+  <defs
+     id="defs3012" />
+  <metadata
+     id="metadata3015">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-286.89286,-470.68361)"
+     id="layer1">
+    <rect
+       width="100"
+       height="100"
+       x="287.14285"
+       y="470.93362"
+       id="imagebot_36"
+       style="fill:#c0c0c0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none" />
+    <rect
+       width="14.585"
+       height="45.249001"
+       x="330.74487"
+       y="492.3006"
+       id="imagebot_32"
+       style="fill:#d1d1d1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none" />
+    <path
+       d="m 297.84386,565.10661 v -51.555 l 40.269,25.778 40.269,-25.778 v 51.555 l -40.269,-25.777 -40.269,25.777 z"
+       id="imagebot_31"
+       style="fill:#d1d1d1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round" />
+    <rect
+       width="59.244999"
+       height="12.483"
+       x="308.59787"
+       y="479.80362"
+       id="imagebot_34"
+       style="fill:#d1d1d1;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none" />
+  </g>
+</svg>
Index: /trunk/images/presets/money/dollar.svg
===================================================================
--- /trunk/images/presets/money/dollar.svg	(revision 10565)
+++ /trunk/images/presets/money/dollar.svg	(revision 10565)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="500" height="500">
+<path d="m 145,312 c -2,69 31,100 104,102 78,1 113,-34 109,-101 -6,-58 -62,-73 -106,-79 -48,-17 -99,-25 -99,-95 0,-48 32,-79 99,-78 60,0 97,25 96,84" style="fill:none;stroke:#000000;stroke-width:40"/>
+<path d="m 250,15 0,470" style="stroke:#000000;stroke-width:30"/>
+</svg>
Index: /trunk/images/presets/nautical/bay.svg
===================================================================
--- /trunk/images/presets/nautical/bay.svg	(revision 10565)
+++ /trunk/images/presets/nautical/bay.svg	(revision 10565)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bay.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="12.337305"
+     inkscape:cy="12.333068"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="3.3786003e-007"
+       y="1036.3622"
+       class="st1"
+       width="16.000008"
+       height="16.000044"
+       id="rect25"
+       style="fill:#2090cf" />
+    <path
+       style="fill:#ffbe34;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 13,1036.3621 -13.00000047683724,0 0,16 L 13,1052.3621 c 0.06378,-2.2208 1.872103,-6.3842 -0.338369,-6.0546 -3.7861414,0.5645 -3.2652544,4.1333 -7.5351073,2.4749 -2.8284272,-1.4805 -2.276,-4.3753 -2.2539029,-4.994 0.022097,-0.6187 1.016466,-4.9497 5.0381358,-4.3973 4.0216704,0.5524 2.8063304,2.4086 4.5078064,2.718 2.236126,0.2491 0.686854,-3.8141 0.581437,-5.747 z"
+       id="path4269"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccscsscc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/beach.svg
===================================================================
--- /trunk/images/presets/nautical/beach.svg	(revision 10565)
+++ /trunk/images/presets/nautical/beach.svg	(revision 10565)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="beach.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.7685029"
+     inkscape:cy="7.4972391"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="1.9999999"
+       y="1036.3621"
+       class="st1"
+       width="14.000003"
+       height="16.000042"
+       id="rect25-1"
+       style="fill:#2090cf" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffbe34;fill-opacity:1"
+       d="m -4.7683724e-7,1036.3621 0,16 L 11.800784,1052.362 c 0.499658,-2.4463 0.786705,-6.0014 -0.800782,-9 -1.4635294,-2.8145 -1.8382424,-5.1361 -1.8964844,-7 z"
+       id="path27-2"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/breakwater.svg
===================================================================
--- /trunk/images/presets/nautical/breakwater.svg	(revision 10565)
+++ /trunk/images/presets/nautical/breakwater.svg	(revision 10565)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="breakwater.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="10.535456"
+     inkscape:cy="1.4562662"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="3.3786003e-007"
+       y="1036.3622"
+       class="st1"
+       width="16.000008"
+       height="16.000044"
+       id="rect25"
+       style="fill:#2090cf" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffbe34;fill-opacity:1"
+       d="m -4.7683724e-7,1036.3621 0,16 4.00000067683724,0 c -0.2490234,-2 0,-3 1.0000002,-5 l 5.0000016,0 c -0.1876314,-0.746 -3.3291981,-4.0584 -4.0000014,-6 -0.5745244,-1.6629 -1.0000002,-4 -1.0000002,-5 z"
+       id="path27"
+       sodipodi:nodetypes="cccccscc" />
+    <g
+       transform="matrix(1,0,0,2.0000015,-246.89999,-78.638742)"
+       id="g51">
+      <rect
+         x="249.89999"
+         y="562"
+         class="st6"
+         width="11.000007"
+         height="0.99998534"
+         id="rect53" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/coast_line.svg
===================================================================
--- /trunk/images/presets/nautical/coast_line.svg	(revision 10565)
+++ /trunk/images/presets/nautical/coast_line.svg	(revision 10565)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="coast_line.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="4.9807805"
+     inkscape:cy="9.8815167"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="3.3786003e-007"
+       y="1036.3622"
+       class="st1"
+       width="16.000008"
+       height="16.000044"
+       id="rect25"
+       style="fill:#2090cf" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffbe34;fill-opacity:1"
+       d="m -4.7683724e-7,1036.3621 0,16 9.80078297683724,0 c 0.4996585,-2.4463 0.7867055,-6.0014 -0.800782,-9 -1.463529,-2.8145 -1.838242,-5.1361 -1.896484,-7 l -7.10351697683724,0 z"
+       id="path27" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#010202"
+       d="m 6.0000006,1036.3621 c 0.0496,1.8916 0.4481683,4.5905 1.9687503,7.5625 1.386949,2.6478 1.4587272,6.0489 1.0312502,8.4375 l 1.9999999,0 c 0.490741,-2.517 0.586272,-5.945 -1,-9 -1.4515628,-2.7649 -1.953408,-5.1907 -2,-7 z"
+       id="path29"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/dam.svg
===================================================================
--- /trunk/images/presets/nautical/dam.svg	(revision 10565)
+++ /trunk/images/presets/nautical/dam.svg	(revision 10565)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_dam2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="6.6866533"
+     inkscape:cy="8.2375347"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="opacity:1;fill:#2090cf;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 0,3 0,16 l 16,2e-6 0,-2 c -0.03627,-2.94 -2,-4 -3,-4 l -7,0 0,-7 z"
+       transform="translate(-4.7683724e-7,1036.3621)"
+       id="rect4191-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,1052.362 0,-4 7,0 1,4 z"
+       id="path4146"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6,1036.36 4,0 2,10 -6,0 z"
+       id="rect4188"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6.5,1036.8621 0,9.025 5.5,0 -2.075,-9.025 z"
+       id="path4139"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#000000;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 6,12 0,4 1,0 0,-3 5.21,0 0.79 3 1,0 -1,-4 z"
+       transform="translate(-4.7683724e-7,1036.3621)"
+       id="path4141"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/ferry.svg
===================================================================
--- /trunk/images/presets/nautical/ferry.svg	(revision 10565)
+++ /trunk/images/presets/nautical/ferry.svg	(revision 10565)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+   ***************************************************************************
+   Bundesanstalt fuer Strassenwesen
+   RWB-Symbol Nr.: 9
+   Bezeichnung:
+   Hafen, Faehrhafen, Faehre
+   Ausdehnung in cm:
+         X_min     X_max     Y_min     Y_max
+         0.00000  15.00000   0.00000  15.00000
+-->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   version="1.0"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="43.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true">
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs15" />
+  <sodipodi:namedview
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="32"
+     inkscape:cx="3.6005368"
+     inkscape:cy="11.203125"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     width="140px"
+     height="80px"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4150"
+       originx="-62"
+       originy="-33" />
+  </sodipodi:namedview>
+  <rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+     id="rect4167"
+     width="16"
+     height="14"
+     x="0"
+     y="0" />
+  <path
+     d="m 15.999588,11.18072 -0.2388,0.135912 -0.255856,0.145616 c -0.545829,0.310657 -1.159883,0.310657 -1.70571,0 l -0.511715,-0.291232 c -0.545827,-0.310656 -1.159882,-0.310656 -1.705709,0 l -0.511725,0.291232 c -0.545828,0.310657 -1.159883,0.310657 -1.705711,0 L 8.852649,11.171016 C 8.582411,11.017211 8.292551,10.938024 7.999794,10.938024 c -0.292757,0 -0.582617,0.07918 -0.852855,0.232992 l -0.511713,0.291232 c -0.545828,0.310657 -1.159883,0.310657 -1.70571,0 L 4.41779,11.171016 c -0.545828,-0.310656 -1.159882,-0.310656 -1.705709,0 l -0.511715,0.291232 c -0.545827,0.310657 -1.159882,0.310657 -1.705709,0 L 0.2388,11.316632 0,11.18072 l 0,1.304759 0.2388,0.135913 0.255857,0.145616 c 0.545827,0.310656 1.159882,0.310656 1.705709,0 l 0.511715,-0.291233 c 0.545827,-0.310656 1.159881,-0.310656 1.705709,0 l 0.511726,0.291233 c 0.545827,0.310656 1.159882,0.310656 1.70571,0 l 0.511713,-0.291233 c 0.270238,-0.153805 0.560098,-0.232992 0.852855,-0.232992 0.292757,0 0.582617,0.07918 0.852855,0.232992 l 0.511713,0.291233 c 0.545828,0.310656 1.159883,0.310656 1.705711,0 l 0.511725,-0.291233 c 0.545827,-0.310656 1.159882,-0.310656 1.705709,0 l 0.511715,0.291233 c 0.545827,0.310656 1.159881,0.310656 1.70571,0 l 0.255856,-0.145616 0.2388,-0.135913 0,-1.304759 z"
+     id="path6-6"
+     style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     inkscape:connector-curvature="0" />
+  <!--
+   ***************************************************************************
+-->
+  <!--
+      INHALT
+-->
+  <path
+     d="m 15.999588,8.217062 -0.2388,0.135913 -0.255856,0.145616 c -0.545829,0.310656 -1.159883,0.310656 -1.70571,0 L 13.287507,8.207358 c -0.545827,-0.310656 -1.159882,-0.310656 -1.705709,0 l -0.511725,0.291233 c -0.545828,0.310656 -1.159883,0.310656 -1.705711,0 L 8.852649,8.207358 C 8.582411,8.053553 8.292551,7.974366 7.999794,7.974366 c -0.292757,0 -0.582617,0.07918 -0.852855,0.232992 L 6.635226,8.498591 c -0.545828,0.310656 -1.159883,0.310656 -1.70571,0 L 4.41779,8.207358 c -0.545828,-0.310656 -1.159882,-0.310656 -1.705709,0 L 2.200366,8.498591 c -0.545827,0.310656 -1.159882,0.310656 -1.705709,0 L 0.2388,8.352975 0,8.217062 0,9.521821 0.2388,9.657734 0.494657,9.80335 c 0.545827,0.310656 1.159882,0.310656 1.705709,0 L 2.712081,9.512117 c 0.545827,-0.310656 1.159881,-0.310656 1.705709,0 L 4.929516,9.80335 c 0.545827,0.310656 1.159882,0.310656 1.70571,0 L 7.146939,9.512117 C 7.417177,9.358312 7.707037,9.279125 7.999794,9.279125 c 0.292757,0 0.582617,0.07918 0.852855,0.232992 L 9.364362,9.80335 c 0.545828,0.310656 1.159883,0.310656 1.705711,0 l 0.511725,-0.291233 c 0.545827,-0.310656 1.159882,-0.310656 1.705709,0 l 0.511715,0.291233 c 0.545827,0.310656 1.159881,0.310656 1.70571,0 l 0.255856,-0.145616 0.2388,-0.135913 0,-1.304759 z"
+     id="path6"
+     style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     inkscape:connector-curvature="0" />
+  <!--
+       OBERE WASSERWELLE
+       UNTERE WASSERWELLE
+-->
+  <!--
+      SCHIFF
+-->
+  <path
+     d="m 14.744728,5.3193174 0.01563,-1.3278205 -1.092296,0.016849 0.329492,-0.9938315 -2.391848,-0.02903 L 12.016875,2.0014552 8.7596676,2 9.0255522,1.0110491 5.9831785,0.988952 5.5140336,2.2982562 3.9731868,2.3017462 3.4029179,2.9991217 1.062612,3.000939 C 2.2619776,5.2429628 3,6 4.023266,7.0995886 c 0.545827,0.227428 1.159882,0.227428 1.70571,0 0.7530013,-0.1950567 1.1153851,-0.2986114 1.8880055,-0.321279 0.292757,0 0.9654295,0.05797 1.2356675,0.170571 l 0.511713,0.213208 c 0.545828,0.227428 1.159883,0.227428 1.705711,0 l 0.511725,-0.213208 c 0.545827,-0.227428 1.159882,-0.227428 1.705709,0 l 0.511715,0.213208 c 0.714666,-0.5110313 0.819894,-1.3594745 0.945506,-1.8427712 z"
+     id="path10"
+     style="fill:#000000;fill-rule:evenodd;stroke:none"
+     sodipodi:nodetypes="ccccccccccccccccccccccc"
+     inkscape:connector-curvature="0" />
+  <!--
+      HECK
+      AUFBAU
+      SCHORNSTEIN UNTERTEIL
+      VORDECK
+      BUG
+      GEWELLTE WASSERLINIE
+      SCHORNSTEIN
+-->
+</svg>
Index: /trunk/images/presets/nautical/groyne.svg
===================================================================
--- /trunk/images/presets/nautical/groyne.svg	(revision 10565)
+++ /trunk/images/presets/nautical/groyne.svg	(revision 10565)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="groyne2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-3.961104"
+     inkscape:cy="4.0710422"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="-4.7683727e-007"
+       y="1036.3621"
+       class="st1"
+       width="16.000011"
+       height="16.000046"
+       id="rect25-2"
+       style="fill:#208ece;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffbe34;fill-opacity:1"
+       d="m -1.9881402e-7,1036.362 0,16 7.24902599881402,0 c 0.499658,-2.4463 0.786705,-6.0014 -0.800782,-9 -1.46353,-2.8145 -1.838243,-5.1361 -1.896485,-7 z"
+       id="path27-8"
+       sodipodi:nodetypes="cccccc" />
+    <g
+       transform="matrix(0.33898304,0,0,2.0000018,-79.813555,-61.038921)"
+       id="g55-9">
+      <rect
+         x="250.2"
+         y="553.70001"
+         class="st6"
+         width="5.9000001"
+         height="1"
+         id="rect57-1" />
+    </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4290"
+       width="1.9999993"
+       height="2.0000401"
+       x="7.0000024"
+       y="1046.3621" />
+    <g
+       transform="matrix(0.33898304,0,0,2.0000018,-75.813555,-61.038895)"
+       id="g55-9-6">
+      <rect
+         x="250.2"
+         y="553.70001"
+         class="st6"
+         width="5.9000001"
+         height="1"
+         id="rect57-1-2" />
+    </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4290-6"
+       width="1.9999996"
+       height="2.0000403"
+       x="11.000005"
+       y="1046.3622" />
+    <g
+       transform="matrix(0.33898304,0,0,2.0000018,-71.813554,-61.038895)"
+       id="g55-9-6-4">
+      <rect
+         x="250.2"
+         y="553.70001"
+         class="st6"
+         width="5.9000001"
+         height="1"
+         id="rect57-1-2-4" />
+    </g>
+    <g
+       transform="matrix(0.33898304,0,0,2.0000018,-81.813558,-68.038921)"
+       id="g55-9-3">
+      <rect
+         x="250.2"
+         y="553.70001"
+         class="st6"
+         width="5.9000001"
+         height="1"
+         id="rect57-1-0" />
+    </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4290-3"
+       width="1.9999996"
+       height="2.0000403"
+       x="5.0000014"
+       y="1039.3622" />
+    <g
+       transform="matrix(0.33898304,0,0,2.0000018,-77.813558,-68.038921)"
+       id="g55-9-6-2">
+      <rect
+         x="250.2"
+         y="553.70001"
+         class="st6"
+         width="5.9000001"
+         height="1"
+         id="rect57-1-2-7" />
+    </g>
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4290-6-1"
+       width="2"
+       height="2.0000405"
+       x="9.0000048"
+       y="1039.3623" />
+    <g
+       transform="matrix(0.33898304,0,0,2.0000018,-73.813557,-68.038921)"
+       id="g55-9-6-4-2">
+      <rect
+         x="250.2"
+         y="553.70001"
+         class="st6"
+         width="5.9000001"
+         height="1"
+         id="rect57-1-2-4-0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/pier.svg
===================================================================
--- /trunk/images/presets/nautical/pier.svg	(revision 10565)
+++ /trunk/images/presets/nautical/pier.svg	(revision 10565)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="pier4.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="10.734206"
+     inkscape:cy="5.6898221"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="3.3786003e-007"
+       y="1036.3622"
+       class="st1"
+       width="16.000008"
+       height="16.000044"
+       id="rect25"
+       style="fill:#2090cf" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffbe34;fill-opacity:1"
+       d="m -4.7683724e-7,1036.3621 0,16 4.00000067683724,0 c -0.2490234,-2 -0.7849343,-2.9062 0,-5 2.6687815,-7.1188 2.0000004,-9 2.0000004,-11 z"
+       id="path27"
+       sodipodi:nodetypes="cccscc" />
+    <g
+       transform="matrix(0.99999949,0,0,2.0000015,-247.89987,-80.638742)"
+       id="g51">
+      <rect
+         x="248.89999"
+         y="562"
+         class="st6"
+         width="12.00001"
+         height="0.99998534"
+         id="rect53" />
+    </g>
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4140"
+       width="1"
+       height="4"
+       x="3"
+       y="1042.3621" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4142"
+       width="1"
+       height="4"
+       x="6.0000005"
+       y="1042.3621" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4146"
+       width="0.99999774"
+       height="4"
+       x="9.000001"
+       y="1042.3621" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.745;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4146-7"
+       width="0.99999791"
+       height="4.0000005"
+       x="12.000002"
+       y="1042.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/water.svg
===================================================================
--- /trunk/images/presets/nautical/water.svg	(revision 10565)
+++ /trunk/images/presets/nautical/water.svg	(revision 10565)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="natural_water.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.6561077"
+     inkscape:cy="7.6175991"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       x="-4.7683727e-007"
+       y="1036.3621"
+       class="st1"
+       width="16"
+       height="16"
+       id="rect25"
+       style="fill:#2090cf" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterfall.svg
===================================================================
--- /trunk/images/presets/nautical/waterfall.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterfall.svg	(revision 10565)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_waterfall.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.000001"
+     inkscape:cx="26.851957"
+     inkscape:cy="14.987213"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4.21875,1.9375 0,2 0,16 9,16 C 11.036162,14.221237 9.6178463,11.33203 6.4647303,11.446115 9.1202282,8.8778007 6.4268536,6.6786026 4.3867188,6.9199219 6.2930537,5.3457347 6.636446,3.1675457 4.21875,1.9375 Z"
+       transform="translate(-4.7683724e-7,1036.3621)"
+       id="path4165"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#2090cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4,1036.3621 c 0,0 7,0 9.4,5.0804 1.545,3.267 2.6,10.92 2.6,10.92 l -4,0 c -1,-12 -3,-14 -8,-14 l -4,0 0,-2 z"
+       id="path4141"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterway_canal.svg
===================================================================
--- /trunk/images/presets/nautical/waterway_canal.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterway_canal.svg	(revision 10565)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="10"
+   viewBox="0 0 16 10"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_canal4.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="7.2389602"
+     inkscape:cy="4.7333146"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="false"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3621)">
+    <path
+       style="fill:#1d8ece;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.0000002,1043.3621 12.0000018,0 -1.631965,8.2295 -8.6331209,0.2656 z"
+       id="path4245"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 0,0 0,1.515625 1.3730469,0 1.1425779,8.138673 c 0.1251798,0.3151999 0.2942498,0.3367032 0.5214844,0.345703 l 9.9472658,0 c 0.278941,-0.01 0.400094,-0.1466498 0.458984,-0.3437498 l 0,-0.00195 1.234375,-8.1347669 1.322266,0 0,-1.51562495 -2.349609,0 L 12.125,8.6250012 3.7890623,8.5937511 2.3535156,0 Z"
+       transform="translate(0,1042.3621)"
+       id="polygon3436"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterway_ditch.svg
===================================================================
--- /trunk/images/presets/nautical/waterway_ditch.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterway_ditch.svg	(revision 10565)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11"
+   height="11"
+   viewBox="0 0 11 11"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_ditch3.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="4.661675"
+     inkscape:cy="2.3736913"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1041.3621)">
+    <path
+       style="fill:#1d8ece;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.0000001,1046.3621 6.9614378,0 -1.8453204,4.9783 -3.116068,0.022 z"
+       id="path4245"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 431.47545,562.7808 2.5808,-8.7884 -1.27328,-0.44867 -2.50151,8.34591 -2.00783,0.0158 -2.58062,-8.34815 -1.21221,0.4543 2.63912,8.81555 c 0.10875,0.27376 0.30259,0.29222 0.5,0.3 l 3.45214,-0.0272 c 0.24233,-0.006 0.35223,-0.14802 0.40339,-0.31924 z"
+       id="polygon3436"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc"
+       transform="matrix(1.1510793,0,0,1.1510794,-488.63316,404.18931)" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterway_drain.svg
===================================================================
--- /trunk/images/presets/nautical/waterway_drain.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterway_drain.svg	(revision 10565)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="8"
+   height="7"
+   viewBox="0 0 8 7"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_drain3.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="0.58070291"
+     inkscape:cy="3.2701754"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1045.3621)">
+    <path
+       style="fill:#1d8ece;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.142857,1048.3621 5.7142869,0 -1.5238107,3.3308 -2.6666335,0 z"
+       id="path4245"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 6.0047978,1052.1373 1.9952034,-6.3897 -1.1428573,-0.3855 -1.7801991,5.829 -2.1230756,-0.012 L 1.142857,1045.3622 2.8499999e-6,1045.7476 2.0104926,1052.1585 c 0.083454,0.2144 0.2322033,0.2287 0.3836929,0.2349 l 3.3036579,-0.021 c 0.1859607,0 0.2676949,-0.1002 0.3069544,-0.2348 z"
+       id="polygon3436"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterway_river.svg
===================================================================
--- /trunk/images/presets/nautical/waterway_river.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterway_river.svg	(revision 10565)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_river2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="7.0154651"
+     inkscape:cy="9.8634013"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="XMLID_172_"
+       class="st0"
+       d="m 15.999998,1044.8546 c -3.327311,-0.4178 -5.847849,-0.6853 -8.7379577,-1.3254 -1.0764995,-0.2384 -1.7615565,-0.4248 -1.7509906,-0.5811 0.00212,-0.1271 2.6473992,0.2017 4.0266021,0.1042 1.3868742,-0.098 4.6457662,-0.1576 5.2345402,-2.0835 0.861618,-2.8131 -6.6416497,-1.8373 -7.7114935,-3.0681 -0.014361,-0.5627 3.2813355,-1.3715 3.6690635,-1.5386 -0.8687994,0.097 -4.7101856,0.2462 -4.6814639,1.8023 0.028723,1.3802 3.8198443,2.0484 4.6886449,2.277 -2.7069217,0.053 -5.3133197,-0.5627 -8.0130603,0.158 -1.6729767,0.4395 -3.41057577,2.0922 -2.44843329,4.3252 0.58877241,1.3626 1.95300309,2.0922 3.04438719,2.6726 1.4001314,0.7473 2.8505233,1.3363 4.3009152,1.8988 2.7643622,1.0727 5.5646252,1.9782 8.3648852,2.8661 0.01436,-2.5143 0.01436,-5.0111 0.01436,-7.5079 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece"
+       sodipodi:nodetypes="cscscccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterway_riverbank.svg
===================================================================
--- /trunk/images/presets/nautical/waterway_riverbank.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterway_riverbank.svg	(revision 10565)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_riverbank2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="10.251193"
+     inkscape:cy="7.9076999"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="XMLID_172_"
+       class="st0"
+       d="m 15.63024,1044.8222 c -2.800615,0.1618 -5.7012928,-0.3125 -8.4745147,-0.8239 -0.1780338,-0.031 -1.5925808,-0.3564 -1.5378017,-0.7444 0.061628,-0.4682 2.3226138,-0.1753 2.582818,-0.2156 1.3078651,-0.21 5.6970884,-0.019 6.2585804,-1.7841 0.821696,-2.5834 -6.3339034,-1.6873 -7.3541747,-2.8174 -0.013725,-0.5167 3.1292897,-1.2593 3.4990517,-1.4127 -0.8285424,0.088 -4.4919335,0.2259 -4.4645439,1.6549 0.027383,1.2673 3.6428506,1.881 4.4713929,2.0907 -2.5814945,0.049 -5.0671243,-0.5166 -7.6417684,0.1462 -1.5954589,0.4036 -3.25254595,1.9212 -2.3349855,3.9718 0.5614928,1.2511 1.8625105,1.9211 2.903324,2.4539 1.3352546,0.6862 2.7184443,1.2272 4.1016307,1.7438 2.6362742,0.9848 5.3067832,1.8162 7.9772942,2.6317 0.01372,-2.3089 0.01372,-4.6014 0.01372,-6.8941 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece"
+       sodipodi:nodetypes="cccccccccccccccc" />
+    <g
+       id="XMLID_170_"
+       transform="matrix(0.06847461,0,0,0.08072631,-2.0841437,1002.6669)"
+       style="fill:#000080">
+      <path
+         style="fill:#000080"
+         d="M 264.1,615.6 C 204.04191,599.71348 143.49174,584.655 85.646918,561.70032 65.711544,553.06011 42.203521,544.22139 33.104688,522.67227 c -7.223309,-15.43301 0.868163,-33.71435 14.569091,-42.44742 20.673947,-14.17361 46.998496,-14.45239 71.135591,-14.81704 5.185,-0.4956 21.7258,2.18703 9.09341,-2.33835 -9.55373,-3.54351 -17.9853,-15.55705 -10.40283,-24.89605 10.64848,-11.34648 27.47346,-12.43666 41.98859,-14.72984 22.38835,-2.15632 44.81234,-3.97467 67.21146,-6.04357 -19.43803,6.6516 -38.36778,14.97682 -58.56455,19.15283 -6.04804,2.02197 -21.18476,4.60829 -21.46262,7.13167 28.91215,5.85806 59.51926,3.02129 87.44959,13.57466 10.335,3.33074 17.46146,15.51718 11.55892,25.61873 -8.26985,13.91095 -25.85102,16.71869 -40.48509,19.31149 -26.84664,3.90288 -54.33913,1.24654 -81.09102,1.33702 46.10092,7.63224 91.64267,12.242 139.89477,14.1736 0.0665,32.59986 -0.13316,65.46686 0.1,97.9 z M 115.6,476.2 c -19.691615,0.46547 -40.657922,0.86299 -58.286304,10.7103 -10.679379,5.63034 -19.724252,18.30617 -14.593261,30.58255 7.149494,18.08323 26.975857,25.40085 43.410839,32.69908 49.742706,20.38908 101.910086,34.01334 153.742166,47.92311 6.22404,1.248 15.98804,7.0567 13.32656,-3.21057 L 253.2,529 c -47.407,-3.51207 -91.36207,-8.58015 -135.95814,-17.09016 -12.66636,-2.41705 -13.11929,-16.69483 0.2022,-17.88736 29.97182,-2.68307 69.42106,2.80072 102.99366,-6.3293 10.6563,-0.31882 24.92869,-15.80834 9.15042,-20.9967 -28.97052,-10.15804 -60.60221,-6.34971 -90.09939,-14.07919 -6.84559,0.4996 -11.30278,-9.22459 -12.20127,-9.09385 -4.44794,10.91928 15.6755,12.8753 23.01059,16.09911 11.94323,3.33501 24.14851,5.5805 36.30191,7.97745 -1.33697,3.37669 1.19413,10.99027 -3.46577,10.7272 C 160.60234,478.4251 138.13197,476.18093 115.6,476.2 Z"
+         id="XMLID_176_"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccccccccccccccsscccccccc" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/waterway_stream.svg
===================================================================
--- /trunk/images/presets/nautical/waterway_stream.svg	(revision 10565)
+++ /trunk/images/presets/nautical/waterway_stream.svg	(revision 10565)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waterway_stream.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="15.025273"
+     inkscape:cy="9.2455363"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="XMLID_164_"
+       class="st0"
+       d="m 15.999938,1048.734 c -2.349253,-0.4988 -4.691597,-1.0417 -7.0201254,-1.6729 -1.2920892,-0.3486 -2.5841799,-0.7282 -3.8555412,-1.1828 -0.2418342,-0.088 -2.9538393,-0.9225 -2.9538393,-1.3728 0,-0.8473 6.6539155,-1.536 7.2895962,-1.6331 1.2851817,-0.1942 2.6118197,-0.3133 3.8693587,-0.715 0.732418,-0.2338 1.924319,-1.0063 0.791149,-1.7567 -0.82915,-0.5472 -2.556542,-0.9268 -3.513519,-1.0593 -1.2886362,-0.1758 -2.5565415,-0.428 -3.7588087,-0.6754 -1.3162729,-0.2735 0.5216731,-1.3064 0.7358691,-1.3947 0.9915272,-0.4104 2.0210511,-0.6709 3.0436676,-0.9092 -0.8291485,0.1288 -5.2063628,0.5871 -4.8159707,2.2113 0.2452902,1.0152 2.4148957,1.333 3.0885794,1.5006 1.3542773,0.34 2.5599973,0.4812 3.9039093,0.8874 -3.081671,0.3309 -5.880047,0.2692 -8.8926203,0.7547 -1.3577306,0.2207 -4.9265226,1.1255 -3.63443503,3.8135 0.62186151,1.2976 2.11778353,1.9201 3.17149443,2.4364 1.4890133,0.7283 3.0194822,1.3109 4.5534056,1.8581 2.6429143,0.9446 5.3169183,1.7612 7.9943743,2.538 0.0035,-1.2093 0.0035,-2.4188 0.0035,-3.6281 z"
+       inkscape:connector-curvature="0"
+       style="fill:#208ece" />
+  </g>
+</svg>
Index: /trunk/images/presets/nautical/weir.svg
===================================================================
--- /trunk/images/presets/nautical/weir.svg	(revision 10565)
+++ /trunk/images/presets/nautical/weir.svg	(revision 10565)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3001"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="weir3.svg">
+  <defs
+     id="defs3003" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.481547"
+     inkscape:cx="11.766361"
+     inkscape:cy="1.0402914"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3006">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-307.55961,-178.84817)">
+    <path
+       style="fill:#2090cf;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 307.55961,178.84817 0,16 16,0 0,-3 -1,0 c 0,0 -3,-13 -5,-13 z"
+       id="path4193"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none"
+       d="m 314.55961,182.84817 3,0 2.64063,12 -5.64063,0 z"
+       id="path4137"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 313.55961,181.84817 0,13 1,0 0,-12 2.205,-0.002 2.8,12 1,0 -3,-13 z"
+       id="path4145"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/accountant.svg
===================================================================
--- /trunk/images/presets/office/accountant.svg	(revision 10565)
+++ /trunk/images/presets/office/accountant.svg	(revision 10565)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="accountant.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-8.1116609"
+     inkscape:cy="2.6919727"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       ry="0"
+       y="1041.8585"
+       x="0.49999952"
+       height="10.00354"
+       width="8.0039082"
+       id="rect4217"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4219"
+       d="m 4.5000504,1042.8692 0,8.1636"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cssc"
+       inkscape:connector-curvature="0"
+       id="path4221"
+       d="m 6.5402884,1044.0562 c 0,0 -4.086376,-1.3424 -4.086371,1.4593 4e-6,2.8016 4.068423,0.2334 4.068417,3.035 -6e-6,2.8017 -4.0579,1.109 -4.0579,1.109"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/administrative.svg
===================================================================
--- /trunk/images/presets/office/administrative.svg	(revision 10565)
+++ /trunk/images/presets/office/administrative.svg	(revision 10565)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="administrative.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-0.74560552"
+     inkscape:cy="4.0690032"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5664"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4162"
+       width="1"
+       height="9.0000019"
+       x="-5.3644186e-007"
+       y="1043.3621" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4175"
+       width="8.000001"
+       height="6.0000415"
+       x="0.9999997"
+       y="1043.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/advertising_agency.svg
===================================================================
--- /trunk/images/presets/office/advertising_agency.svg	(revision 10565)
+++ /trunk/images/presets/office/advertising_agency.svg	(revision 10565)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="advertising_agency.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.999999"
+     inkscape:cx="3.2021092"
+     inkscape:cy="5.3780868"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6"
+       width="2.0000002"
+       height="3.5624599"
+       x="3.7500005"
+       y="1048.7996"
+       ry="0.00014840672" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4183"
+       width="8.5000019"
+       height="12.005615"
+       x="0.49999964"
+       y="1036.8621"
+       ry="0" />
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4292"
+       cx="3.5000002"
+       cy="1043.8621"
+       r="0.5" />
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4292-9"
+       cx="6.3507385"
+       cy="1043.8621"
+       r="0.50000012" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.8601247,1042.8621 4.1427251,0"
+       id="path4309"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.3035139,1041.3853 1.9666407,-0.022 1.0496117,1.3589 -3.8780388,0.1 z"
+       id="path4322"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6.0052678,1040.6026 1.7949404,-2.4797"
+       id="path4324"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#008000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.6464474,1047.0692 2,-2 2,2"
+       id="path4326"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4153"
+       d="m 3.8002073,1040.6026 -1.7949404,-2.4797"
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.9999995,1037.6771 0,2.685"
+       id="path4155"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/architect.svg
===================================================================
--- /trunk/images/presets/office/architect.svg	(revision 10565)
+++ /trunk/images/presets/office/architect.svg	(revision 10565)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="architect.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-4.4474266"
+     inkscape:cy="18.729768"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.9497461,1037.314 -4.3310298,4.5741 8.9935159,-0.044 z"
+       id="path4146"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffdd55;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0.3437477,1041.7293 4.6562509,-4.3672 4.6523446,4.3633"
+       id="path4154-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <rect
+       style="opacity:1;fill:#ffdd55;fill-opacity:1;stroke:#808080;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4144-4"
+       width="8.9991627"
+       height="9.9960957"
+       x="0.49999967"
+       y="1041.866"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4148"
+       width="2.0000005"
+       height="3.0000005"
+       x="3.9999986"
+       y="1048.3621"
+       ry="0.00014840702" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4150"
+       width="2.0000005"
+       height="2.0000005"
+       x="1.999998"
+       y="1043.3621"
+       ry="0.00014840702" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152"
+       width="2.0000005"
+       height="2.0000005"
+       x="5.9999986"
+       y="1043.3621"
+       ry="0.00014840702" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/association.svg
===================================================================
--- /trunk/images/presets/office/association.svg	(revision 10565)
+++ /trunk/images/presets/office/association.svg	(revision 10565)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="association.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-27.750963"
+     inkscape:cy="14.817644"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2ca02c;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="M 5.5234375,4 C 5.2827341,4 5.04231,4.1887532 5.046875,4.5644531 c -0.00886,1.5873785 -0.00728,3.0618654 0,4.4453125 0,0.6044999 0.362299,1.1337034 0.9570312,1.0332034 l 0.4921876,0 0,5.957031 1.2265624,0 0,-3 0.6054688,0 0,3 1.2265625,0 0,-5.957031 0.5410155,0 0,3.958984 c -0.0092,0.7514 0.964248,0.7514 0.955078,0 l 0,-4.0742186 0,-0.7226563 c 0,-0.6657999 -0.461731,-1.203125 -1.033203,-1.203125 l -3.9355468,0 c -0.04495,0 -0.038507,0.00173 -0.082031,0.00195 L 6,4.5644531 C 6.0045635,4.1887532 5.7641409,4 5.5234375,4 Z"
+       id="path3772-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scccccccccccccccsssccs"
+       transform="translate(-4.7683724e-7,1036.3621)" />
+    <ellipse
+       style="opacity:1;fill:#2ca02c;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-2"
+       cx="8.0502539"
+       cy="1042.569"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5664"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 4.0313961,1040.3621 c 0.2407035,0 0.4811276,0.1888 0.4765626,0.5645 0.00886,1.5873 0.00728,3.0618 0,4.4453 0,0.6045 -0.362299,1.1337 -0.9570313,1.0332 l -0.4921877,0 0,5.957 -1.2265631,0 0,-3 -0.605468,0 0,3 -1.22656300175,0 c -2.52e-4,-2.666 -3.52e-4,-5.332 0.001200002,-7.998 l 3.4715088,0 0.082031,0 2e-7,-3.4394 c -0.00456,-0.3757 0.2358591,-0.5645 0.4765625,-0.5645 z"
+       id="path3772-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccsccsc" />
+    <ellipse
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-2-4"
+       cx="-1.5045782"
+       cy="1042.5693"
+       rx="1.2044045"
+       ry="1.2043883"
+       transform="scale(-1,1)" />
+    <g
+       id="g4199"
+       transform="translate(0.04588891,0)">
+      <path
+         sodipodi:nodetypes="ccccccccccccsssccsc"
+         inkscape:connector-curvature="0"
+         id="path3772-3-0"
+         d="m 5.4776113,1043.8006 c -0.2407034,0 -0.4811276,0.1888 -0.4765626,0.5645 -0.00886,1.5873 -0.00728,3.0618 0,4.4453 0,0.6045 0.3622991,1.1337 0.9570314,1.0332 l 0.4921877,0 0,2.5127 3.0585942,0 0,-2.5127 0.541016,0 0,2.5127 0.955078,0 0,-2.628 0,-0.7226 c 0,-0.6658 -0.461731,-1.2031 -1.033203,-1.2031 l -3.9355479,0 -0.082031,0 -2e-7,-3.4394 c 0.00456,-0.3757 -0.2358592,-0.5645 -0.4765626,-0.5645 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate" />
+      <ellipse
+         ry="1.2043883"
+         rx="1.2044045"
+         cy="1046.0077"
+         cx="8.0044289"
+         id="path4145-2-2"
+         style="opacity:1;fill:#00ffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4195"
+       transform="translate(0,-0.4375)">
+      <path
+         sodipodi:nodetypes="ccccccccsccsc"
+         inkscape:connector-curvature="0"
+         id="path3772-3-7-5"
+         d="m 4.0313968,1044.2381 c 0.2407036,0 0.4811277,0.1888 0.4765627,0.5645 0.00886,1.5873 0.00728,3.0618 0,4.4453 0,0.6045 -0.362299,1.1337 -0.9570314,1.0332 l -0.4921878,0 0,2.5195 -3.05859470175,0 c 0,0 -3.52e-4,-1.8945 0.001200002,-4.5605 l 3.4715094,0 0.082031,0 2e-7,-3.4394 c -0.00456,-0.3757 0.2358591,-0.5645 0.4765625,-0.5645 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate" />
+      <ellipse
+         transform="scale(-1,1)"
+         ry="1.2043883"
+         rx="1.2044045"
+         cy="1046.4451"
+         cx="-1.5045781"
+         id="path4145-2-4-0"
+         style="opacity:1;fill:#ff5555;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/office/educational_institution.svg
===================================================================
--- /trunk/images/presets/office/educational_institution.svg	(revision 10565)
+++ /trunk/images/presets/office/educational_institution.svg	(revision 10565)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="educational_institution.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627418"
+     inkscape:cx="-15.036468"
+     inkscape:cy="11.530192"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#c87137;stroke-width:1.20000017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.4963127,1051.7548 3,-5 3,5"
+       id="path4333"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5664"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#008000;fill-opacity:1;fill-rule:nonzero;stroke:#c87137;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4183"
+       width="8.008234"
+       height="7.0303302"
+       x="0.49999964"
+       y="1040.8621"
+       ry="0" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6"
+       width="1.0000006"
+       height="1.0000402"
+       x="6.0000005"
+       y="1043.3621"
+       ry="4.1660169e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6-7"
+       width="1.0000011"
+       height="1.0000404"
+       x="1.9999999"
+       y="1043.3621"
+       ry="4.1660176e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6-7-5"
+       width="1.0000013"
+       height="1.0000407"
+       x="1.9999999"
+       y="1045.3621"
+       ry="4.1660183e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6-7-8"
+       width="3.0000002"
+       height="1.0000407"
+       x="4.0000005"
+       y="1045.3621"
+       ry="4.1660183e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6-7-6"
+       width="2.0000005"
+       height="1.0000407"
+       x="1.9999999"
+       y="1041.3621"
+       ry="4.1660183e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6-7-4"
+       width="1.0000001"
+       height="1.0000407"
+       x="5.0000005"
+       y="1041.3621"
+       ry="4.1660183e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6-7-0"
+       width="1.0000013"
+       height="1.0000407"
+       x="4.0000005"
+       y="1043.3621"
+       ry="4.1660183e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/employment_agency.svg
===================================================================
--- /trunk/images/presets/office/employment_agency.svg	(revision 10565)
+++ /trunk/images/presets/office/employment_agency.svg	(revision 10565)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="employment_agency.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="12.027543"
+     inkscape:cy="20.4988"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4254-9"
+       width="1.0000005"
+       height="6.0000429"
+       x="0.9999994"
+       y="1046.3621"
+       ry="1.6663518e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4258-4"
+       width="4.2044048"
+       height="1.0000005"
+       x="2.7955961"
+       y="1048.3621"
+       ry="4.1658514e-005" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 3.031466,1042.9534 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,0.8334 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-0.8334 0.491463,0 0,6.6097 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-3.247 0.606985,0 0,3.247 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-6.6097 0.541489,0 0,0.8334 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-0.9485 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936446,0 z"
+       id="path3772-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4"
+       cx="5.0000005"
+       cy="1041.1577"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4254"
+       width="1.0000002"
+       height="6.000042"
+       x="8.000001"
+       y="1046.3621"
+       ry="1.6663515e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4258"
+       width="10.000001"
+       height="1.0000002"
+       x="1.7881413e-007"
+       y="1046.3621"
+       ry="4.1658506e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/foundation.svg
===================================================================
--- /trunk/images/presets/office/foundation.svg	(revision 10565)
+++ /trunk/images/presets/office/foundation.svg	(revision 10565)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="foundation.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-7.27988"
+     inkscape:cy="5.6187523"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4"
+       cx="1.204404"
+       cy="1051.1577"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4-1"
+       cx="4.7356548"
+       cy="1051.1577"
+       rx="1.2044047"
+       ry="1.2043885" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4-1-9"
+       cx="8.2669058"
+       cy="1051.1577"
+       rx="1.204405"
+       ry="1.2043887" />
+    <ellipse
+       ry="1.2043883"
+       rx="1.2044045"
+       cy="1047.7599"
+       cx="1.204404"
+       id="ellipse4184"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="1.2043885"
+       rx="1.2044047"
+       cy="1047.7599"
+       cx="4.7356548"
+       id="ellipse4186"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="1.2043887"
+       rx="1.204405"
+       cy="1047.7599"
+       cx="8.2669058"
+       id="ellipse4188"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4190"
+       cx="1.204404"
+       cy="1044.3622"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4192"
+       cx="4.7356548"
+       cy="1044.3622"
+       rx="1.2044047"
+       ry="1.2043885" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4194"
+       cx="8.2669058"
+       cy="1044.3622"
+       rx="1.204405"
+       ry="1.2043887" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/government.svg
===================================================================
--- /trunk/images/presets/office/government.svg	(revision 10565)
+++ /trunk/images/presets/office/government.svg	(revision 10565)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="government.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="6.5574036"
+     inkscape:cy="8.9030505"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5664"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4162"
+       width="1"
+       height="16.000042"
+       x="-3.5762773e-007"
+       y="1036.3621" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4175"
+       width="8.000001"
+       height="6.0000415"
+       x="0.9999997"
+       y="1036.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/insurance.svg
===================================================================
--- /trunk/images/presets/office/insurance.svg	(revision 10565)
+++ /trunk/images/presets/office/insurance.svg	(revision 10565)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="insurance.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627418"
+     inkscape:cx="3.4840778"
+     inkscape:cy="6.8405064"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4144-4"
+       width="7.9895883"
+       height="11.997437"
+       x="0.49999964"
+       y="1039.8646"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152"
+       width="9.0000019"
+       height="2.0000408"
+       x="-4.7683727e-007"
+       y="1044.8633"
+       ry="0.00014841002" />
+    <rect
+       style="opacity:1;fill:#ff6600;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4148"
+       width="2.0000005"
+       height="12.997803"
+       x="3.5039067"
+       y="1039.3643"
+       ry="0.00054400211" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/it.svg
===================================================================
--- /trunk/images/presets/office/it.svg	(revision 10565)
+++ /trunk/images/presets/office/it.svg	(revision 10565)
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="it.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="4.6552983"
+     inkscape:cy="8.4648393"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4183"
+       width="6"
+       height="4"
+       x="1.4999995"
+       y="1040.8621"
+       ry="4.1658499e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4254"
+       width="1.0000002"
+       height="6.000042"
+       x="7.000001"
+       y="1046.3621"
+       ry="1.6663515e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4258"
+       width="9.000001"
+       height="1.0000002"
+       x="1.7881413e-007"
+       y="1046.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4274"
+       width="1.0000002"
+       height="1.0000002"
+       x="1.9999999"
+       y="1043.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276"
+       width="1.0000001"
+       height="1.9999604"
+       x="5.0000005"
+       y="1041.3621"
+       ry="8.3315339e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ac9393;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4287"
+       width="2.0000007"
+       height="1.0000002"
+       x="4"
+       y="1043.3621"
+       ry="4.1658506e-005" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4301-4"
+       width="1.0000005"
+       height="1.0000005"
+       x="3"
+       y="1042.3621"
+       ry="4.1658514e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4185"
+       width="1"
+       height="1"
+       x="3.9999993"
+       y="1045.3621"
+       ry="4.1658499e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4254-9"
+       width="1.0000005"
+       height="6.0000429"
+       x="0.9999997"
+       y="1046.3621"
+       ry="1.6663518e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/lawyer.svg
===================================================================
--- /trunk/images/presets/office/lawyer.svg	(revision 10565)
+++ /trunk/images/presets/office/lawyer.svg	(revision 10565)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="lawyer.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.000001"
+     inkscape:cx="4.0768219"
+     inkscape:cy="8.7837436"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 3.031466,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,0.8334 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-0.8334 0.491463,0 0,1.5316 3.059322,0 0,-1.5316 0.541489,0 0,0.8334 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-0.9485 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936446,0 z"
+       id="path3772-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccsscc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4"
+       cx="5.0000005"
+       cy="1037.5665"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#784421;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4258"
+       width="10.000001"
+       height="9.5912285"
+       x="1.7881413e-007"
+       y="1042.7709"
+       ry="0.00039955613" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/newspaper.svg
===================================================================
--- /trunk/images/presets/office/newspaper.svg	(revision 10565)
+++ /trunk/images/presets/office/newspaper.svg	(revision 10565)
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="newspaper.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="-0.061727405"
+     inkscape:cy="7.7775336"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4203"
+       width="9.0067482"
+       height="13.006809"
+       x="0.50000113"
+       y="1038.8621"
+       ry="0" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4260"
+       width="4.000001"
+       height="2.0000401"
+       x="1.9999998"
+       y="1040.3621"
+       ry="8.3318664e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4262"
+       width="1.0000002"
+       height="1.0000002"
+       x="7.000001"
+       y="1040.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4274"
+       width="1.0000002"
+       height="1.0000002"
+       x="1.9999999"
+       y="1043.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276"
+       width="2.0000005"
+       height="1.0000002"
+       x="6.0000005"
+       y="1043.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4285"
+       width="2.0000005"
+       height="1.0000002"
+       x="1.9999999"
+       y="1045.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4287"
+       width="1.0000002"
+       height="1.0000002"
+       x="5"
+       y="1045.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4291"
+       width="1.0000002"
+       height="1.0000002"
+       x="1.9999999"
+       y="1047.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4293"
+       width="2.0000005"
+       height="1.0000002"
+       x="4"
+       y="1047.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4295"
+       width="1.0000002"
+       height="1.0000002"
+       x="7.0000019"
+       y="1047.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4299"
+       width="3.0000005"
+       height="1.0000002"
+       x="1.9999999"
+       y="1049.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4301"
+       width="1.0000002"
+       height="1.0000002"
+       x="6"
+       y="1049.3621"
+       ry="4.1658506e-005" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4301-0"
+       width="1.0000005"
+       height="1.0000005"
+       x="7.000001"
+       y="1045.3621"
+       ry="4.1658514e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4301-4"
+       width="1.0000005"
+       height="1.0000005"
+       x="4"
+       y="1043.3621"
+       ry="4.1658514e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/notary.svg
===================================================================
--- /trunk/images/presets/office/notary.svg	(revision 10565)
+++ /trunk/images/presets/office/notary.svg	(revision 10565)
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="notary.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="8.2497112"
+     inkscape:cy="7.5629731"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4203"
+       width="9.0067463"
+       height="13.006807"
+       x="0.49999964"
+       y="1038.8553"
+       ry="3.870315e-005" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.0000011,1044.3621 c 0,0 -7.0000012,0 -7.0000012,7"
+       id="path4154"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4285"
+       width="2.0000005"
+       height="1.0000002"
+       x="1.9999994"
+       y="1040.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4287"
+       width="1.0000002"
+       height="1.0000002"
+       x="4.9999995"
+       y="1040.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4291"
+       width="1.0000002"
+       height="1.0000002"
+       x="1.9999994"
+       y="1042.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4293"
+       width="2.0000005"
+       height="1.0000002"
+       x="3.9999995"
+       y="1042.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4295"
+       width="1.0000002"
+       height="1.0000002"
+       x="7.0000014"
+       y="1042.3621"
+       ry="4.1658506e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4299"
+       width="1.0000007"
+       height="1.0000002"
+       x="1.9999994"
+       y="1044.3621"
+       ry="4.1658506e-005" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4301-0"
+       width="1.0000005"
+       height="1.0000005"
+       x="7.0000005"
+       y="1040.3621"
+       ry="4.1658514e-005" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4293-7"
+       width="4.0000005"
+       height="1.0000005"
+       x="-739.07898"
+       y="746.10168"
+       ry="4.1658514e-005"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/ong.svg
===================================================================
--- /trunk/images/presets/office/ong.svg	(revision 10565)
+++ /trunk/images/presets/office/ong.svg	(revision 10565)
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ong.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-7.27988"
+     inkscape:cy="5.6187523"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4"
+       cx="1.204404"
+       cy="1051.1577"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4-1"
+       cx="4.7356548"
+       cy="1051.1577"
+       rx="1.2044047"
+       ry="1.2043885" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4-1-9"
+       cx="8.2669058"
+       cy="1051.1577"
+       rx="1.204405"
+       ry="1.2043887" />
+    <ellipse
+       ry="1.2043883"
+       rx="1.2044045"
+       cy="1047.7599"
+       cx="1.204404"
+       id="ellipse4184"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="1.2043885"
+       rx="1.2044047"
+       cy="1047.7599"
+       cx="4.7356548"
+       id="ellipse4186"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="1.2043887"
+       rx="1.204405"
+       cy="1047.7599"
+       cx="8.2669058"
+       id="ellipse4188"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4190"
+       cx="1.204404"
+       cy="1044.3622"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4192"
+       cx="4.7356548"
+       cy="1044.3622"
+       rx="1.2044047"
+       ry="1.2043885" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4194"
+       cx="8.2669058"
+       cy="1044.3622"
+       rx="1.204405"
+       ry="1.2043887" />
+    <ellipse
+       ry="1.2043883"
+       rx="1.2044045"
+       cy="1040.9644"
+       cx="1.204404"
+       id="ellipse4196"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="1.2043885"
+       rx="1.2044047"
+       cy="1040.9644"
+       cx="4.7356548"
+       id="ellipse4198"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       ry="1.2043887"
+       rx="1.204405"
+       cy="1040.9644"
+       cx="8.2669058"
+       id="ellipse4200"
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4148"
+       cx="1.204404"
+       cy="1037.5665"
+       rx="1.2044045"
+       ry="1.2043883" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4150"
+       cx="4.7356548"
+       cy="1037.5665"
+       rx="1.2044047"
+       ry="1.2043885" />
+    <ellipse
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4152"
+       cx="8.2669058"
+       cy="1037.5665"
+       rx="1.204405"
+       ry="1.2043887" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/political_party.svg
===================================================================
--- /trunk/images/presets/office/political_party.svg	(revision 10565)
+++ /trunk/images/presets/office/political_party.svg	(revision 10565)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="political_party.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="-81.196118"
+     inkscape:cy="14.590393"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 1.031466,1044.3647 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,5.9565 1.226168,0 0,-3 0.606984,0 0,3 1.226169,0 0,-5.9565 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772-3-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-2-3"
+       cx="3"
+       cy="1042.569"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 6.0817199,1044.3647 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,5.9565 1.226168,0 0,-3 0.606984,0 0,3 1.226169,0 0,-5.9565 0.5414891,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.9364451,0 z"
+       id="path3772-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-2"
+       cx="8.0502539"
+       cy="1042.569"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5664"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4141"
+       width="5"
+       height="4"
+       x="0.9999997"
+       y="1036.3621" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4143"
+       width="1"
+       height="9.000041"
+       x="-2.9802328e-007"
+       y="1036.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/private_company.svg
===================================================================
--- /trunk/images/presets/office/private_company.svg	(revision 10565)
+++ /trunk/images/presets/office/private_company.svg	(revision 10565)
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="private_company.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627418"
+     inkscape:cx="6.2533127"
+     inkscape:cy="11.697794"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4321"
+       width="8"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="0.00014840699" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3621 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.919e-4,0.013 -3.919e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5664"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4232"
+       width="1"
+       height="16"
+       x="7.9999995"
+       y="1036.3621"
+       ry="0.00014840699" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234"
+       width="3.0000007"
+       height="2.0000396"
+       x="-1.3709068e-006"
+       y="1038.3621"
+       ry="0.00014840992" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-2"
+       width="3.0000012"
+       height="2.0000401"
+       x="3.9999995"
+       y="1038.3621"
+       ry="0.00014840995" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-4"
+       width="3.0000012"
+       height="2.0000401"
+       x="-3.8146968e-006"
+       y="1041.3621"
+       ry="0.00014840995" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-2-6"
+       width="3.0000017"
+       height="2.0000405"
+       x="3.9999981"
+       y="1041.3621"
+       ry="0.00014840998" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-1"
+       width="3.0000012"
+       height="2.0000401"
+       x="-3.2186504e-006"
+       y="1044.3621"
+       ry="0.00014840995" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-2-1"
+       width="3.0000017"
+       height="2.0000405"
+       x="3.9999981"
+       y="1044.3621"
+       ry="0.00014840998" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-4-6"
+       width="3.0000017"
+       height="2.0000405"
+       x="-5.8412552e-006"
+       y="1047.3621"
+       ry="0.00014840998" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-2-6-1"
+       width="3.0000021"
+       height="2.000041"
+       x="3.9999971"
+       y="1047.3621"
+       ry="0.00014841001" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-4-6-1"
+       width="3.0000021"
+       height="2.000041"
+       x="-3.3378601e-006"
+       y="1050.3621"
+       ry="0.00014841001" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4234-2-6-1-5"
+       width="3.0000026"
+       height="2.0000415"
+       x="4.0000005"
+       y="1050.3621"
+       ry="0.00014841004" />
+    <rect
+       style="opacity:1;fill:#d38d5f;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4323"
+       width="8"
+       height="1"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="0.00014840699" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/real_state.svg
===================================================================
--- /trunk/images/presets/office/real_state.svg	(revision 10565)
+++ /trunk/images/presets/office/real_state.svg	(revision 10565)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="real_state.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-14.817651"
+     inkscape:cy="8.1817033"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.949747,1037.314 -4.33102905,4.5741 8.99351435,-0.044 z"
+       id="path4146"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffdd55;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 0.3437494,1041.7293 4.6562501,-4.3672 4.6523438,4.3633"
+       id="path4154"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <rect
+       style="opacity:1;fill:#ffdd55;fill-opacity:1;stroke:#ff0000;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4144"
+       width="8.9991608"
+       height="9.9960938"
+       x="0.50000155"
+       y="1041.866"
+       ry="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.81929415px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 4.9371319,1042.8107 0,8.1636"
+       id="path4366"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.87107658px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 6.9932009,1044.0175 c 0,0 -4.0863752,-1.3424 -4.0863703,1.4593 4.9e-6,2.8016 4.0684222,0.2334 4.0684164,3.035 -5.6e-6,2.8017 -4.0578992,1.109 -4.0578992,1.109"
+       id="path4368"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cssc" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/religion.svg
===================================================================
--- /trunk/images/presets/office/religion.svg	(revision 10565)
+++ /trunk/images/presets/office/religion.svg	(revision 10565)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="religion.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-2.1418789"
+     inkscape:cy="12.971447"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.33549738;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 3.0000001,1038.3621 0,14 2.0000003,0 0,-14 -2.0000003,0 z"
+       id="path4231"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.30940175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m -4.8841862e-7,1041.3621 0,2 8.00000148841862,0 0,-2 -8.00000148841862,0 z"
+       id="path4233"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/research.svg
===================================================================
--- /trunk/images/presets/office/research.svg	(revision 10565)
+++ /trunk/images/presets/office/research.svg	(revision 10565)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="research.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.000001"
+     inkscape:cx="-2.2157162"
+     inkscape:cy="14.866346"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.7499994,1041.909 3.3437498,0 1.265625,5.1094 -5.7656248,0 z"
+       id="path4143"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#00aa00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.8251704,1046.3623 -1.29437828,5.4574 8.02493628,-0.019 -1.3255306,-5.4387 z"
+       id="path4164"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.3078344,1041.9023 1.6156978,0 -2.42354659,9.9598 8.07848939,0 -2.4235466,-9.9598 1.6156985,0"
+       id="path4162"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00aa00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4199"
+       cx="3.5155647"
+       cy="1037.9656"
+       r="1.6034237" />
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00aa00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4206"
+       cx="4.5528994"
+       cy="1040.998"
+       r="1.0204619" />
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00aa00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4208"
+       cx="4.0849366"
+       cy="1043.8723"
+       r="0.5985868" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031467,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.921e-4,0.013 -3.921e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606985,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936446,0 z"
+       id="path3772-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-4"
+       cx="13.000001"
+       cy="1037.5665"
+       rx="1.2044045"
+       ry="1.2043883" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/tax_advisor.svg
===================================================================
--- /trunk/images/presets/office/tax_advisor.svg	(revision 10565)
+++ /trunk/images/presets/office/tax_advisor.svg	(revision 10565)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tax_advisor.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-10.189045"
+     inkscape:cy="10.56325"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <rect
+       ry="0"
+       y="1041.8585"
+       x="0.49999952"
+       height="10.00354"
+       width="8.0039082"
+       id="rect4217"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#808080;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4219"
+       d="m 4.5000504,1042.8692 0,8.1636"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="cssc"
+       inkscape:connector-curvature="0"
+       id="path4221"
+       d="m 6.5402884,1044.0562 c 0,0 -4.086376,-1.3424 -4.086371,1.4593 4e-6,2.8016 4.068423,0.2334 4.068417,3.035 -6e-6,2.8017 -4.0579,1.109 -4.0579,1.109"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccc"
+       style="fill:#008000;fill-rule:evenodd;stroke:none;stroke-width:1.20000017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.5019531,1038.3585 3.0000005,3 3.0000006,-3"
+       id="path4231"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4269"
+       width="2.0000012"
+       height="2.9844143"
+       x="3.5019531"
+       y="1036.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/office/telecommunication.svg
===================================================================
--- /trunk/images/presets/office/telecommunication.svg	(revision 10565)
+++ /trunk/images/presets/office/telecommunication.svg	(revision 10565)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="telecommunication.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627416"
+     inkscape:cx="6.1022863"
+     inkscape:cy="7.0393083"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.07500005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4276-0-6"
+       width="1.0000002"
+       height="10.593793"
+       x="4.5072579"
+       y="1041.7683"
+       ry="0.0004413214" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.031468,1039.3622 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.917e-4,0.013 -3.917e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.00913,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,10.2347 c -0.01173,0.9661 1.237895,0.9661 1.226168,0 l 0,-6.2782 0.606984,0 0,6.2782 c -0.01162,0.9659 1.237788,0.9659 1.226169,0 l 0,-10.2347 0.541489,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936445,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccccccsscc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="13.000002"
+       cy="1037.5665"
+       rx="1.2044042"
+       ry="1.204388" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff6600;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.5067825,1037.9151 c 0,0 1.530331,0.4918 1.530331,2 0,1.4861 -1.530328,2 -1.530328,2"
+       id="path4155"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff6600;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.4959485,1036.8653 c 0,0 1.999999,1 1.999999,3 0,2 -1.999999,3 -1.999999,3"
+       id="path4155-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0"
+       id="path4190"
+       d="m 3.4891646,1038.0714 c 0,0 -1.530331,0.4918 -1.530331,2 0,1.4861 1.530328,2 1.530328,2"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6600;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0"
+       id="path4192"
+       d="m 2.4999986,1037.0216 c 0,0 -1.99999896,1 -1.99999896,3 0,2 1.99999896,3 1.99999896,3"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6600;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;fill:#ff6600;fill-opacity:1;stroke:#ff6600;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4194"
+       cx="5.0312495"
+       cy="1040.0183"
+       r="0.71875006" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/bay.svg
===================================================================
--- /trunk/images/presets/power/bay.svg	(revision 10565)
+++ /trunk/images/presets/power/bay.svg	(revision 10565)
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__bay.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-4.1208993"
+     inkscape:cy="7.8651042"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.5000004,1042.3621 0,10"
+       id="path4226"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4228"
+       d="m 8.5000011,1042.3621 0,10"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.500002,1042.3621 0,10"
+       id="path4230"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4238"
+       cx="3.5000007"
+       cy="1048.8621"
+       r="1.5" />
+    <circle
+       r="1.5"
+       cy="1048.8621"
+       cx="8.5000029"
+       id="circle4240"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle4242"
+       cx="13.500004"
+       cy="1048.8621"
+       r="1.5" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4258"
+       d="m 3.4999996,1036.3621 0,6"
+       style="fill:none;fill-rule:evenodd;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.5000003,1036.3621 0,6"
+       id="path4260"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4262"
+       d="m 13.500002,1036.3621 0,6"
+       style="fill:none;fill-rule:evenodd;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/busbar.svg
===================================================================
--- /trunk/images/presets/power/busbar.svg	(revision 10565)
+++ /trunk/images/presets/power/busbar.svg	(revision 10565)
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__busbar2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="4.0453444"
+     inkscape:cy="6.8909456"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0,1049.8621 16,0"
+       id="path4251"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4253"
+       d="m 0,1046.8621 16,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 0,1043.8621 16,0"
+       id="path4255"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5000002,1036.3621 0,8"
+       id="path4257"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.5000003,1036.3621 0,11"
+       id="path4259"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.500001,1036.3621 0,14"
+       id="path4261"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/cable.svg
===================================================================
--- /trunk/images/presets/power/cable.svg	(revision 10565)
+++ /trunk/images/presets/power/cable.svg	(revision 10565)
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__cable2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="29.263749"
+     inkscape:cy="-5.274116"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4336"
+       width="16"
+       height="6.9999185"
+       x="0"
+       y="1045.3621" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#00d400;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.9073489e-6,1044.3621 16.0000000926511,0"
+       id="path4206"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4208"
+       d="m 0,1048.8621 16,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/cable_distribution_cabinet.svg
===================================================================
--- /trunk/images/presets/power/cable_distribution_cabinet.svg	(revision 10565)
+++ /trunk/images/presets/power/cable_distribution_cabinet.svg	(revision 10565)
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__cable_distribution_cabinet7.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="11.163551"
+     inkscape:cy="15.362753"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:#333333;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4208"
+       width="7.0000014"
+       height="10.99992"
+       x="4.5000005"
+       y="1040.8621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4348"
+       d="m 9.0000011,1042.8621 -2.6415095,4.2453 3.2830188,-1.4906 -2.6415095,4.2453"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#c87137;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.9073489e-6,1051.8621 16.0000000926511,0"
+       id="path4221"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/compensator.svg
===================================================================
--- /trunk/images/presets/power/compensator.svg	(revision 10565)
+++ /trunk/images/presets/power/compensator.svg	(revision 10565)
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__compensator2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-1.4356981"
+     inkscape:cy="7.0826301"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4264"
+       width="8.000001"
+       height="12.000042"
+       x="3.9999993"
+       y="1039.3621"
+       ry="2.0000401"
+       rx="2.0000401" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.5,1040.3621 0,-4"
+       id="path4212"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4216"
+       d="m 6.5,1040.3621 0,-4"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/converter.svg
===================================================================
--- /trunk/images/presets/power/converter.svg	(revision 10565)
+++ /trunk/images/presets/power/converter.svg	(revision 10565)
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__converter2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-5.9676933"
+     inkscape:cy="7.5346371"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14,1049.8621 -12,0"
+       id="path4295"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4307"
+       d="M 12.000001,1047.8621 3,1047.8621"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12.000001,1045.8621 3,1045.8621"
+       id="path4309"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4311"
+       d="M 12.000001,1043.8621 3,1043.8621"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 13.5,1036.3621 0,16"
+       id="path4313"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12.000001,1041.8621 3,1041.8621"
+       id="path4315"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4317"
+       d="m 14,1039.8621 -12,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4321"
+       d="m 4.4999999,1040.3621 0,9"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.500001,1040.3621 0,9"
+       id="path4323"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/generator.svg
===================================================================
--- /trunk/images/presets/power/generator.svg	(revision 10565)
+++ /trunk/images/presets/power/generator.svg	(revision 10565)
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__generator2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-3.4347714"
+     inkscape:cy="6.7346687"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4227"
+       cx="8"
+       cy="1044.3621"
+       rx="6.5"
+       ry="6.5000176" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.9999992,1039.6016 0,9.5211"
+       id="path4213"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4215"
+       d="m 12.760494,1044.3621 -9.5209888,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 11.366177,1040.996 -6.7323553,6.7323"
+       id="path4217"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4219"
+       d="m 4.6338382,1040.9959 6.7323228,6.7325"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/insulator.svg
===================================================================
--- /trunk/images/presets/power/insulator.svg	(revision 10565)
+++ /trunk/images/presets/power/insulator.svg	(revision 10565)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__insulator6.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="1.9345873"
+     inkscape:cy="8.3262637"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.5,1036.3621 0,16"
+       id="path4282"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path4248"
+       d="m 6,1042.8621 2.5,-2 2.5,2 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 6,1045.8621 2.5,-2 2.5,2 z"
+       id="path4250"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0"
+       id="path4252"
+       d="m 6,1048.8621 2.5,-2 2.5,2 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.5000002,1039.3621 0,11"
+       id="path4254"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/line.svg
===================================================================
--- /trunk/images/presets/power/line.svg	(revision 10565)
+++ /trunk/images/presets/power/line.svg	(revision 10565)
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__line9.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="4.0017303"
+     inkscape:cy="9.3213242"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#00d400;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1044.3621 16,0"
+       id="path4208"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4336"
+       width="16"
+       height="6.9999185"
+       x="0"
+       y="1045.3621" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5000004,1045.3621 0,-8"
+       id="path4206"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4210"
+       d="m 13.500002,1045.3621 0,-8"
+       style="fill:none;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16.000002,1038.8621 c -1,0 -2.5,-1.5 -2.5,-1.5 0,0 -2.55979,2.5008 -5.500002,2.5008 -2.9402124,0 -5.4999997,-2.5008 -5.4999997,-2.5008 0,0 -1.5000002,1.5 -2.5000003,1.5"
+       id="path4216"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cczcc" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/plant.svg
===================================================================
--- /trunk/images/presets/power/plant.svg	(revision 10565)
+++ /trunk/images/presets/power/plant.svg	(revision 10565)
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__plant5.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.4252009"
+     inkscape:cy="6.6588019"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4231"
+       width="4.8506665"
+       height="4.9962158"
+       x="9.6493359"
+       y="1045.866" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.0000001,1050.8621 c 0,0 3.5000004,-5 2.5000003,-12 l 6.0000007,0 c -0.9999999,7 2.4999999,12 2.4999999,12 z"
+       id="path4229"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/pole.svg
===================================================================
--- /trunk/images/presets/power/pole.svg	(revision 10565)
+++ /trunk/images/presets/power/pole.svg	(revision 10565)
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__pole2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="2.4580159"
+     inkscape:cy="9.6013118"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 4,1036.3621 0,2 -4,0 0,6 3,0 0,-2 1,0 0,10 4,0 0,-10 1,0 0,2 3,0 0,-6 -4,0 0,-2 -4,0 z"
+       id="path4218"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.0000008,1037.3621 0,15"
+       id="path4282"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4216"
+       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/pole_transformer.svg
===================================================================
--- /trunk/images/presets/power/pole_transformer.svg	(revision 10565)
+++ /trunk/images/presets/power/pole_transformer.svg	(revision 10565)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__pole__transformer_distribution2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="3.5064502"
+     inkscape:cy="6.2853706"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 4,0 4,2 0,2 0,8 3,8 3,6 4,6 4,16 8,16 8,13 11,13 11,8 12,8 12,2 8,2 8,0 Z"
+       transform="translate(0,1036.3621)"
+       id="path4218"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccc" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.0000008,1037.3621 0,15"
+       id="path4282"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path4216"
+       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7,1044.3621 0,1 1,0 0,3 2,0 0,-4 -2,0 -1,0 z"
+       id="rect4290" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/portal.svg
===================================================================
--- /trunk/images/presets/power/portal.svg	(revision 10565)
+++ /trunk/images/presets/power/portal.svg	(revision 10565)
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__portal8.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-1.7241793"
+     inkscape:cy="8.8479371"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <g
+       id="g4212"
+       transform="translate(-4.4804688,0)">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4211"
+         transform="translate(0,1036.3621)"
+         d="M 7.5078125,1.9999999 4.4804688,16 5.5,16 8.0019531,4.4640781 10.521484,16 11.539062,16 8.4902344,1.9999999 Z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 9.1385373,1043.8621 -2.1385365,0"
+         id="path4311"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 10.031748,1048.8621 -4.0317473,0"
+         id="path4226"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4221"
+         d="m 8.000001,1038.5007 0,-2.1386"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       transform="translate(4.4609399,0)"
+       id="g4218">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="M 7.5078125,1.9999999 4.4804688,16 5.5,16 8.0019531,4.4640781 10.521484,16 11.539062,16 8.4902344,1.9999999 Z"
+         transform="translate(0,1036.3621)"
+         id="path4220"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4222"
+         d="m 9.1385373,1043.8621 -2.1385365,0"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4224"
+         d="m 10.031748,1048.8621 -4.0317473,0"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 8.000001,1038.5007 0,-2.1386"
+         id="path4227"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.0000005,1038.8621 7.9999995,0"
+       id="path4229"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6.5000008,1039.3621 0,2"
+       id="path4231"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.5000011,1039.3621 0,2"
+       id="path4233"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/power.svg
===================================================================
--- /trunk/images/presets/power/power.svg	(revision 10565)
+++ /trunk/images/presets/power/power.svg	(revision 10565)
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="5.1515274"
+     inkscape:cy="3.9731809"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4348"
+       d="m 9.8629924,1037.9979 -4.9211118,7.7194 6.1162384,-2.7104 -4.9211115,7.7194"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/substation.svg
===================================================================
--- /trunk/images/presets/power/substation.svg	(revision 10565)
+++ /trunk/images/presets/power/substation.svg	(revision 10565)
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__substation3.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="5.1127825"
+     inkscape:cy="7.901"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.50000006;stroke-opacity:1"
+       id="rect4263"
+       width="12"
+       height="10.000039"
+       x="2.5"
+       y="1039.8621" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.5,1046.8621 2,0 0,-10.5"
+       id="path4223"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       y="1045.8621"
+       x="4.5"
+       height="2.0000401"
+       width="2.000001"
+       id="rect4222"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4224"
+       width="2.000001"
+       height="2.0000401"
+       x="8.500001"
+       y="1045.8621" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4232"
+       d="m 8.5000014,1036.3621 0,9"
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.5000004,1036.3621 0,9"
+       id="path4234"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.5000006,1036.3621 0,9"
+       id="path4236"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.5,1036.3621 0,9"
+       id="path4238"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.5000014,1043.3621 0,1"
+       id="path4240"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4242"
+       d="m 4.5000004,1043.3621 0,1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4244"
+       d="m 6.5000006,1043.3621 0,1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4246"
+       d="m 10.5,1043.3621 0,1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4250"
+       d="m 8.500002,1041.3621 0,1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4.500001,1041.3621 0,1"
+       id="path4252"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.5000012,1041.3621 0,1"
+       id="path4254"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.5,1041.3621 0,1"
+       id="path4256"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4262"
+       d="m 12.500001,1043.3621 0,1"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 12.500002,1041.3621 0,1"
+       id="path4266"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/switch.svg
===================================================================
--- /trunk/images/presets/power/switch.svg	(revision 10565)
+++ /trunk/images/presets/power/switch.svg	(revision 10565)
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__switch3.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-5.4276153"
+     inkscape:cy="3.2745605"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4228"
+       d="m 8.5000014,1036.3621 0,5"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.5000011,1052.3621 0,-4 -5.5000011,-7"
+       id="path4246"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/switchgear.svg
===================================================================
--- /trunk/images/presets/power/switchgear.svg	(revision 10565)
+++ /trunk/images/presets/power/switchgear.svg	(revision 10565)
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__switch3.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="10.797181"
+     inkscape:cy="11.826427"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.5000007,1036.3621 0,10"
+       id="path4226"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4228"
+       d="m 8.5000014,1036.3621 0,10"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.500002,1036.3621 0,10"
+       id="path4230"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4232"
+       width="3"
+       height="3"
+       x="1.9999995"
+       y="1041.3621" />
+    <rect
+       y="1041.3621"
+       x="7.000001"
+       height="3"
+       width="3"
+       id="rect4234"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4236"
+       width="3"
+       height="3"
+       x="12.000002"
+       y="1041.3621" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4238"
+       cx="3.4999993"
+       cy="1038.8621"
+       r="1.5" />
+    <circle
+       r="1.5"
+       cy="1038.8621"
+       cx="8.500001"
+       id="circle4240"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="circle4242"
+       cx="13.500002"
+       cy="1038.8621"
+       r="1.5" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.5000011,1052.3621 0,-3 -2.0000002,-3"
+       id="path4246"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4254"
+       d="m 13.500002,1052.3621 0,-3 -2,-3"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.5000005,1052.3621 0,-3 -1.9999998,-3"
+       id="path4256"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/tower.svg
===================================================================
--- /trunk/images/presets/power/tower.svg	(revision 10565)
+++ /trunk/images/presets/power/tower.svg	(revision 10565)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__tower2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="11.92309"
+     inkscape:cy="5.7391443"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 4.4726562,1036.3621 -0.1894531,1 -3.2832031,0 0,4 -1,0 0,4 2.7597656,0 -1.3339844,7 3.0546876,0 0.3808593,-2 2.265625,0 0.3808594,2 3.0527345,0 -1.328125,-7 2.767578,0 0,-4 -1,0 0,-4 -3.2832031,0 -0.1894531,-1 -3.0546876,0 z"
+       id="path4221"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 1,1042.3621 0,2 1,0 0,-1 8,0 0,1 1,0 0,-2 z"
+       id="path4280"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 2.0000005,1038.3621 0,2 1,0 0,-1 6.0000005,0 0,1 1,0 0,-2 z"
+       id="path4296"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4310"
+       d="m 4.0000007,1048.3621 0,1 4.0000003,0 0,-1 -4.0000003,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 4.0000008,1046.3621 0,1 4.0000002,0 0,-1 -4.0000002,0 z"
+       id="path4312"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4314"
+       d="m 5.0000008,1040.3621 0,1 2.0000003,0 0,-1 -2.0000003,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 5.4921875,1036.3621 -3.046875,16 1.0175781,0 2.5351563,-13.3203 2.5273441,13.3203 1.017578,0 -3.0332034,-16 -1.0175781,0 z"
+       id="path4316"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4318"
+       d="m 4.0000009,1044.3621 0,1 4.0000001,0 0,-1 -4.0000001,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/transformer.svg
===================================================================
--- /trunk/images/presets/power/transformer.svg	(revision 10565)
+++ /trunk/images/presets/power/transformer.svg	(revision 10565)
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="power__transformer2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.5613292"
+     inkscape:cy="11.94635"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+    <sodipodi:guide
+       position="1.0000001,1.0000001"
+       orientation="0,1"
+       id="guide4231" />
+    <sodipodi:guide
+       position="2.0000002,9.0000006"
+       orientation="1,0"
+       id="guide4233" />
+    <sodipodi:guide
+       position="14.000002,10.000001"
+       orientation="1,0"
+       id="guide4235" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.00000048;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.9999999,1050.362 1e-6,-11"
+       id="path4227"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5000004,1049.8621 0,-10.0001 10.9999996,0 2e-6,10.0001 z"
+       id="path4225"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4215"
+       d="M 4.0000004,1041.862 12,1041.862"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4217"
+       d="M 4.0000004,1043.862 12,1043.862"
+       style="fill:none;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:#ff6600;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.0000004,1045.862 12,1045.862"
+       id="path4221"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4223"
+       d="M 4.0000003,1047.862 12,1047.862"
+       style="fill:#ff6600;fill-rule:evenodd;stroke:#ff6000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9.5,1040.3621 0,-4"
+       id="path4216"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4218"
+       d="m 6.5,1040.3621 0,-4"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/power/transformer_tower.svg
===================================================================
--- /trunk/images/presets/power/transformer_tower.svg	(revision 10565)
+++ /trunk/images/presets/power/transformer_tower.svg	(revision 10565)
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="building__transformer_tower.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="22.701255"
+     inkscape:cy="2.5189815"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4288"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3621" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8,1039.3621 0,13"
+       id="path4282"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1e-7,1041.8621 3.9999999,0"
+       id="path4208"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4214"
+       d="m 3,1038.8621 10,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/service/administration/courthouse.svg
===================================================================
--- /trunk/images/presets/service/administration/courthouse.svg	(revision 10565)
+++ /trunk/images/presets/service/administration/courthouse.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 7,0 C 6,0 6,1 6,1 L 2.25,2 2.25,3 0,8 C 0,9 0.792008,10 2.5,10 4.207992,10 5,9 5,8 L 2.75,3 6,3 6,13 2,13 1,14 13,14 12,13 8,13 8,3 11.25,3 9,8 c 0,1 0.77294,2 2.5,2 C 13.22706,10 14,9 14,8 L 11.75,3 11.75,2 8,1 C 8,1 8,0 7,0 z M 2.5,4 4.25,8 0.75,8 z m 9,0 1.75,4 -3.5,0 z" id="courthouse" style="fill:#734a08;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/service/administration/prison.svg
===================================================================
--- /trunk/images/presets/service/administration/prison.svg	(revision 10565)
+++ /trunk/images/presets/service/administration/prison.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 0,0 0,14 14,14 14,0 0,0 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 3.200928,9.13501 3,9.5625 3,10 L 3,13 1,13 1,1 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 5,13 5,1 z m 5,0 3,0 0,12 -2,0 0,-3 C 11,9.5625 10.799072,9.13501 10.5,8.78125 L 10.5,13 10,13 10,1 z M 7,3 C 6.399152,3 5.866615,3.2680514 5.5,3.6875 l 0,2.625 C 5.866615,6.7319486 6.399152,7 7,7 7.600847,7 8.133385,6.7319486 8.5,6.3125 l 0,-2.625 C 8.133385,3.2680514 7.600847,3 7,3 z" id="prison" style="fill:#734a08;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/service/clock.svg
===================================================================
--- /trunk/images/presets/service/clock.svg	(revision 10565)
+++ /trunk/images/presets/service/clock.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 7,0 C 3.1458514,0 0,3.1458514 0,7 c 0,3.854149 3.1458514,7 7,7 3.854149,0 7,-3.145851 7,-7 C 14,3.1458514 10.854149,0 7,0 z m 0,2 c 2.7732686,0 5,2.2267316 5,5 0,2.7732686 -2.2267314,5 -5,5 C 4.2267316,12 2,9.7732686 2,7 2,4.2267316 4.2267316,2 7,2 z M 6.75,3.21875 A 0.750075,0.750075 0 0 0 6.59375,3.25 0.750075,0.750075 0 0 0 6,4 l 0,3 0,0.375 0.3125,0.21875 2,1.5 a 0.750075,0.750075 0 1 0 0.875,-1.1875 L 7.5,6.625 7.5,4 A 0.750075,0.750075 0 0 0 6.75,3.21875 z" id="clock" style="fill:#734a08;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/service/elevator.svg
===================================================================
--- /trunk/images/presets/service/elevator.svg	(revision 10565)
+++ /trunk/images/presets/service/elevator.svg	(revision 10565)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__elevator.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.7228925"
+     inkscape:cy="10.87432"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#005cff;fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4284"
+       width="16.000004"
+       height="16.000042"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       ry="2.0000393"
+       rx="2.0000393" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:45;marker:none;"
+       d="m 2.3751718,1041.0393 0,4.1972 c -0.00799,0.6574 0.8424554,0.6574 0.8344694,0 l 0,-3.4636 0.4300275,0 0,8.9553 c -0.010264,0.8453 1.0831517,0.8453 1.0728906,0 l 0,-5.4934 0.5311078,0 0,5.4934 c -0.010167,0.8452 1.0830581,0.8452 1.0728915,0 l 0,-8.9553 0.4737998,0 0,3.4636 c -0.00805,0.6574 0.8424938,0.6574 0.8344701,0 l 0,-4.1974 c 0,-0.5826 -0.4029823,-1.0521 -0.9030169,-1.0521 l -3.4016003,10e-5 c -0.5980515,10e-5 -0.9450395,0.4694 -0.9450395,1.0522 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccscc" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="4.9998994"
+       cy="1038.4159"
+       rx="1.0538474"
+       ry="1.0538332" />
+    <path
+       style="color:#000000;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 12.494142,1045.3739 c -0.276115,0 -0.497334,0.2297 -0.49414,0.5058 l 0,2.4824 -1.503907,0 c -0.447994,2e-4 -0.6697598,0.5441 -0.349609,0.8575 l 2,2 c 0.195265,0.1952 0.511766,0.1952 0.707031,0 l 2,-2 c 0.374791,-0.3616 0.03953,-0.8621 -0.351562,-0.8594 l -1.501953,0 0,-2.4805 c 0.0032,-0.2807 -0.225157,-0.5091 -0.50586,-0.5058 z"
+       id="path4296-9"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4225"
+       d="m 12.494142,1043.3503 c -0.276115,0 -0.497334,-0.2297 -0.49414,-0.5058 l 0,-2.4824 -1.503907,0 c -0.447994,-2e-4 -0.6697605,-0.5441 -0.349609,-0.8575 l 2,-2 c 0.195265,-0.1952 0.511766,-0.1952 0.707031,0 l 2,2 c 0.37479,0.3616 0.03953,0.8621 -0.351562,0.8594 l -1.501953,0 0,2.4805 c 0.0032,0.2807 -0.225157,0.5091 -0.50586,0.5058 z"
+       style="color:#000000;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/service/emergency_access_point.svg
===================================================================
--- /trunk/images/presets/service/emergency_access_point.svg	(revision 10565)
+++ /trunk/images/presets/service/emergency_access_point.svg	(revision 10565)
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__emergency_access_point.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-2.011933"
+     inkscape:cy="14.758289"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#007704;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254-5"
+       width="16.000008"
+       height="16.000046"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2.0000021" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 10.000003,1046.362 5.000001,0 0,-4 -5.000001,0 0,-5 -4.0000014,0 0,5 -5.000001,0 0,4 5.000001,0 0,5 4.0000014,0 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path1883-9"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.81099999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4204"
+       cx="8.000001"
+       cy="1044.3621"
+       rx="2.0000002"
+       ry="1.99998" />
+  </g>
+</svg>
Index: /trunk/images/presets/service/ranger_station.svg
===================================================================
--- /trunk/images/presets/service/ranger_station.svg	(revision 10565)
+++ /trunk/images/presets/service/ranger_station.svg	(revision 10565)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="50"
+   height="50"
+   id="svg3812"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ranger_station.svg">
+  <defs
+     id="defs3814" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="74.900738"
+     inkscape:cy="15.36495"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3817">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-152.19785,-290.16487)">
+    <path
+       id="path361"
+       d="m 158.17358,291.17084 c -2.74014,0 -4.95955,2.22424 -4.95955,4.95905 v 38.03963 c 0,2.73481 2.22447,4.96411 4.95955,4.96411 h 38.04854 c 2.74014,0 4.95955,-2.2293 4.95955,-4.96411 v -38.03963 c 0,-2.73481 -2.22447,-4.95905 -4.95955,-4.95905 h -38.04854 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+    <path
+       id="path363"
+       d="m 158.17358,340.16487 c -3.29626,0 -5.97573,-2.66909 -5.97573,-5.98524 V 296.14 c 0,-3.30098 2.67442,-5.97513 5.97573,-5.97513 h 38.04854 c 3.29626,0 5.97573,2.66404 5.97573,5.97513 v 38.03963 c 0,3.30604 -2.67442,5.98524 -5.97573,5.98524 h -38.04854 z"
+       inkscape:connector-curvature="0"
+       style="fill:#550000" />
+    <path
+       id="path365"
+       d="m 180.848,311.10815 v -8.57345 h 2.96765 c 1.23356,0 1.4459,0.80376 1.59757,0.96047 0.46006,0.44485 0.76845,0.71783 1.42063,0.71783 h 3.28614 v -7.2844 h -3.28614 c -0.65218,0 -0.96057,-0.26792 -1.42063,-0.72288 -0.15167,-0.13649 -0.36401,-0.95542 -1.59757,-0.95542 h -4.52983 v 14.85694 l -2.0728,-1.35982 -18.26087,11.7885 h 4.2821 v 14.24527 h 10.36906 v -11.31331 h 7.20425 v 11.06056 h 10.37411 v -13.99758 h 4.26694 L 180.848,311.10815 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" />
+  </g>
+</svg>
Index: /trunk/images/presets/service/recycling/recycling.svg
===================================================================
--- /trunk/images/presets/service/recycling/recycling.svg	(revision 10565)
+++ /trunk/images/presets/service/recycling/recycling.svg	(revision 10565)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16">
+  <path
+     d="m 5.8039383,9.6927765 -1.8884929,-3.3652691 -3.79805848,0 L 1.6612772,7.2415626 0.70680532,8.9238794 C 0.62540244,9.0764392 0.5847036,9.2357531 0.58470703,9.4018258 c -3.43e-6,0.1660797 0.040695,0.3253953 0.12209829,0.4779444 L 2.2091701,12.559182 C 2.2769334,12.365215 2.3446928,12.198926 2.4124615,12.06032 L 4.2811194,8.7787216 5.8039383,9.6927765 z M 2.9814254,12.393105 c -0.1086743,0.180023 -0.163009,0.373778 -0.1630043,0.581266 -4.7e-6,0.31863 0.1117699,0.588665 0.3353051,0.8101 0.2235314,0.221436 0.4908661,0.332152 0.8020048,0.332152 l 3.7373194,0 0,-3.094599 -3.9399889,0 c -0.027282,0.05537 -0.1289213,0.235383 -0.3049365,0.540063 l -0.4666996,0.831018 z m 5.0568471,-7.6648751 3.7776055,0 1.908946,-3.3646344 -1.543271,0.9140538 -0.955092,-1.68295137 c -0.176033,-0.3181934 -0.446676,-0.4772963 -0.811924,-0.477311 l -3.0059698,0 c 0.1218843,0.1382007 0.223528,0.2765969 0.3049363,0.4151914 L 9.5610903,3.8141746 9.2567744,4.0011689 8.0382725,4.7282299 z M 6.1900666,0.28346423 c -0.4334462,1.34e-5 -0.758422,0.1937693 -0.974926,0.5812673 L 3.3266474,4.1881632 C 4.043942,4.6175196 4.9172219,5.1299056 5.9464895,5.7253218 6.5555251,4.6591455 7.2120857,3.4959775 7.9161744,2.2358131 L 7.1649925,0.86473153 C 6.9484705,0.47723353 6.6234959,0.28347763 6.1900666,0.28346423 l 0,0 z m 4.8541764,10.69672377 0,-0.373991 0,-1.4325691 -1.8891123,3.3646361 1.8891123,3.344349 0,-1.807191 1.888493,0 c 0.365658,0 0.643117,-0.159314 0.832373,-0.477947 l 1.502986,-2.679408 c -0.202891,0.05537 -0.372095,0.08304 -0.507606,0.08304 l -3.716246,-0.02093 z m 2.802679,-5.6909754 c -0.06778,0.041425 -0.941266,0.5538077 -2.620461,1.5371574 0.83959,1.4815957 1.503175,2.6517361 1.990757,3.51043 l 1.522819,0 c 0.447057,2e-6 0.778848,-0.193963 0.995379,-0.5819044 0.202859,-0.3739848 0.196043,-0.7547351 -0.02046,-1.1422517 L 13.846927,5.2892126 z"
+     id="path4"
+     style="fill:#ffffff;stroke:#000000;stroke-width:0.3" />
+</svg>
Index: /trunk/images/presets/service/recycling/recycling_centre.svg
===================================================================
--- /trunk/images/presets/service/recycling/recycling_centre.svg	(revision 10565)
+++ /trunk/images/presets/service/recycling/recycling_centre.svg	(revision 10565)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16">
+  <path
+     d="m 5.8039383,9.6927765 -1.8884929,-3.3652691 -3.79805848,0 L 1.6612772,7.2415626 0.70680532,8.9238794 C 0.62540244,9.0764392 0.5847036,9.2357531 0.58470703,9.4018258 c -3.43e-6,0.1660797 0.040695,0.3253953 0.12209829,0.4779444 L 2.2091701,12.559182 C 2.2769334,12.365215 2.3446928,12.198926 2.4124615,12.06032 L 4.2811194,8.7787216 5.8039383,9.6927765 z M 2.9814254,12.393105 c -0.1086743,0.180023 -0.163009,0.373778 -0.1630043,0.581266 -4.7e-6,0.31863 0.1117699,0.588665 0.3353051,0.8101 0.2235314,0.221436 0.4908661,0.332152 0.8020048,0.332152 l 3.7373194,0 0,-3.094599 -3.9399889,0 c -0.027282,0.05537 -0.1289213,0.235383 -0.3049365,0.540063 l -0.4666996,0.831018 z m 5.0568471,-7.6648751 3.7776055,0 1.908946,-3.3646344 -1.543271,0.9140538 -0.955092,-1.68295137 c -0.176033,-0.3181934 -0.446676,-0.4772963 -0.811924,-0.477311 l -3.0059698,0 c 0.1218843,0.1382007 0.223528,0.2765969 0.3049363,0.4151914 L 9.5610903,3.8141746 9.2567744,4.0011689 8.0382725,4.7282299 z M 6.1900666,0.28346423 c -0.4334462,1.34e-5 -0.758422,0.1937693 -0.974926,0.5812673 L 3.3266474,4.1881632 C 4.043942,4.6175196 4.9172219,5.1299056 5.9464895,5.7253218 6.5555251,4.6591455 7.2120857,3.4959775 7.9161744,2.2358131 L 7.1649925,0.86473153 C 6.9484705,0.47723353 6.6234959,0.28347763 6.1900666,0.28346423 l 0,0 z m 4.8541764,10.69672377 0,-0.373991 0,-1.4325691 -1.8891123,3.3646361 1.8891123,3.344349 0,-1.807191 1.888493,0 c 0.365658,0 0.643117,-0.159314 0.832373,-0.477947 l 1.502986,-2.679408 c -0.202891,0.05537 -0.372095,0.08304 -0.507606,0.08304 l -3.716246,-0.02093 z m 2.802679,-5.6909754 c -0.06778,0.041425 -0.941266,0.5538077 -2.620461,1.5371574 0.83959,1.4815957 1.503175,2.6517361 1.990757,3.51043 l 1.522819,0 c 0.447057,2e-6 0.778848,-0.193963 0.995379,-0.5819044 0.202859,-0.3739848 0.196043,-0.7547351 -0.02046,-1.1422517 L 13.846927,5.2892126 z"
+     id="path4"
+     style="fill:#0088ff;stroke:#000000;stroke-width:0.3" />
+</svg>
Index: /trunk/images/presets/service/recycling/recycling_container.svg
===================================================================
--- /trunk/images/presets/service/recycling/recycling_container.svg	(revision 10565)
+++ /trunk/images/presets/service/recycling/recycling_container.svg	(revision 10565)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16 16">
+  <path
+     d="m 5.8039383,9.6927765 -1.8884929,-3.3652691 -3.79805848,0 L 1.6612772,7.2415626 0.70680532,8.9238794 C 0.62540244,9.0764392 0.5847036,9.2357531 0.58470703,9.4018258 c -3.43e-6,0.1660797 0.040695,0.3253953 0.12209829,0.4779444 L 2.2091701,12.559182 C 2.2769334,12.365215 2.3446928,12.198926 2.4124615,12.06032 L 4.2811194,8.7787216 5.8039383,9.6927765 z M 2.9814254,12.393105 c -0.1086743,0.180023 -0.163009,0.373778 -0.1630043,0.581266 -4.7e-6,0.31863 0.1117699,0.588665 0.3353051,0.8101 0.2235314,0.221436 0.4908661,0.332152 0.8020048,0.332152 l 3.7373194,0 0,-3.094599 -3.9399889,0 c -0.027282,0.05537 -0.1289213,0.235383 -0.3049365,0.540063 l -0.4666996,0.831018 z m 5.0568471,-7.6648751 3.7776055,0 1.908946,-3.3646344 -1.543271,0.9140538 -0.955092,-1.68295137 c -0.176033,-0.3181934 -0.446676,-0.4772963 -0.811924,-0.477311 l -3.0059698,0 c 0.1218843,0.1382007 0.223528,0.2765969 0.3049363,0.4151914 L 9.5610903,3.8141746 9.2567744,4.0011689 8.0382725,4.7282299 z M 6.1900666,0.28346423 c -0.4334462,1.34e-5 -0.758422,0.1937693 -0.974926,0.5812673 L 3.3266474,4.1881632 C 4.043942,4.6175196 4.9172219,5.1299056 5.9464895,5.7253218 6.5555251,4.6591455 7.2120857,3.4959775 7.9161744,2.2358131 L 7.1649925,0.86473153 C 6.9484705,0.47723353 6.6234959,0.28347763 6.1900666,0.28346423 l 0,0 z m 4.8541764,10.69672377 0,-0.373991 0,-1.4325691 -1.8891123,3.3646361 1.8891123,3.344349 0,-1.807191 1.888493,0 c 0.365658,0 0.643117,-0.159314 0.832373,-0.477947 l 1.502986,-2.679408 c -0.202891,0.05537 -0.372095,0.08304 -0.507606,0.08304 l -3.716246,-0.02093 z m 2.802679,-5.6909754 c -0.06778,0.041425 -0.941266,0.5538077 -2.620461,1.5371574 0.83959,1.4815957 1.503175,2.6517361 1.990757,3.51043 l 1.522819,0 c 0.447057,2e-6 0.778848,-0.193963 0.995379,-0.5819044 0.202859,-0.3739848 0.196043,-0.7547351 -0.02046,-1.1422517 L 13.846927,5.2892126 z"
+     id="path4"
+     style="fill:#00AA00;stroke:#000000;stroke-width:0.3" />
+</svg>
Index: /trunk/images/presets/service/recycling/sanitary_dump_station.svg
===================================================================
--- /trunk/images/presets/service/recycling/sanitary_dump_station.svg	(revision 10565)
+++ /trunk/images/presets/service/recycling/sanitary_dump_station.svg	(revision 10565)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="7.9572548"
+     inkscape:cy="8.0221397"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-695px"
+       originy="-330px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-695,-706.36218)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3770"
+       width="16"
+       height="16"
+       x="695"
+       y="706.36218" />
+    <path
+       style="fill:#362d8e;fill-opacity:1;stroke:none"
+       d="m 696,712.36218 0,9 14,0 0,-9 -3,0 0,2 1,0 0,5 -10,0 0,-5 1,0 0,-2 z"
+       id="path2998"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#362d8e;fill-opacity:1;stroke:none"
+       d="m 700,711.36218 3,4 3,-4 -2,0 0,-4 -2,0 0,4 z"
+       id="path3768"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/service/shower.svg
===================================================================
--- /trunk/images/presets/service/shower.svg	(revision 10565)
+++ /trunk/images/presets/service/shower.svg	(revision 10565)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   xml:space="preserve"
+   enable-background="new 0 0 100 100"
+   viewBox="0 0 100 100"
+   height="100px"
+   width="100px"
+   y="0px"
+   x="0px"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="shower12.svg"><metadata
+     id="metadata49"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs47" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview45"
+     showgrid="true"
+     inkscape:zoom="4.72"
+     inkscape:cx="21.580445"
+     inkscape:cy="47.596424"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"><inkscape:grid
+       type="xygrid"
+       id="grid3026" /></sodipodi:namedview><rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     id="rect3028"
+     width="100"
+     height="100"
+     x="0"
+     y="0" /><path
+     d="M83.397,45.72H16.614c0-11.309,9.167-20.469,20.469-20.469h5.729V-0.211H57.2v25.462h5.729  C74.231,25.251,83.397,34.412,83.397,45.72z"
+     id="path3" /><path
+     d="m 85.357,94.836 c 1.751,-0.696 2.598,-2.683 1.901,-4.427 l -0.026,-0.072 c -0.703,-1.751 -2.683,-2.591 -4.421,-1.861 -1.751,0.696 -2.584,2.715 -1.881,4.459 0.527,1.335 1.81,2.148 3.164,2.148 0.417,0 0.853,-0.078 1.263,-0.247 z"
+     id="path15"
+     inkscape:connector-curvature="0" /><path
+     d="m 80.364,76.062 c 1.803,-0.54 2.825,-2.441 2.285,-4.245 l -0.02,-0.064 C 82.088,69.949 80.207,68.96 78.391,69.5 c -1.797,0.54 -2.819,2.468 -2.272,4.277 0.437,1.478 1.797,2.429 3.262,2.429 0.325,0 0.651,-0.046 0.983,-0.144 z"
+     id="path17"
+     inkscape:connector-curvature="0" /><path
+     d="M75.943,57.081c1.751-0.697,2.598-2.683,1.901-4.428l-0.026-0.064c-0.696-1.745-2.676-2.585-4.421-1.869  c-1.751,0.703-2.584,2.721-1.881,4.466c0.533,1.328,1.81,2.142,3.164,2.142C75.097,57.328,75.533,57.25,75.943,57.081z"
+     id="path19" /><path
+     d="m 61.532,95.139816 c 1.875,-0.188 3.242,-1.861 3.053,-3.736 l -0.006,-0.065 c -0.183,-1.868 -1.85,-3.235 -3.725,-3.015 -1.881,0.183 -3.248,1.889 -3.053,3.764 0.176,1.758 1.66,3.072 3.385,3.072 0.112,0 0.235,-0.006 0.346,-0.02 z"
+     id="path23"
+     inkscape:connector-curvature="0" /><path
+     d="m 59.755,76.812 c 1.849,-0.365 3.047,-2.162 2.676,-4.011 l -0.014,-0.065 c -0.364,-1.849 -2.168,-3.014 -4.004,-2.643 -1.849,0.364 -3.04,2.193 -2.669,4.043 0.325,1.627 1.745,2.74 3.333,2.74 0.229,0 0.456,-0.02 0.678,-0.064 z"
+     id="path25"
+     inkscape:connector-curvature="0" /><path
+     d="m 57.646,57.263 c 1.855,-0.364 3.053,-2.161 2.682,-4.01 l -0.013,-0.065 c -0.371,-1.849 -2.2,-3.027 -4.004,-2.643 -1.855,0.364 -3.047,2.194 -2.669,4.042 0.325,1.621 1.744,2.741 3.333,2.741 0.227,0 0.456,-0.019 0.671,-0.065 z"
+     id="path27"
+     inkscape:connector-curvature="0" /><path
+     d="m 19.082,92.935 0.026,-0.064 c 0.703,-1.745 -0.156,-3.698 -1.908,-4.395 -1.731,-0.703 -3.743,0.176 -4.446,1.934 -0.697,1.744 0.149,3.73 1.901,4.427 0.41,0.169 0.846,0.247 1.263,0.247 1.353,-0.001 2.636,-0.814 3.164,-2.149 z"
+     id="path31"
+     inkscape:connector-curvature="0" /><path
+     d="m 23.893,73.777 0.02,-0.071 C 24.46,71.902 23.418,70.04 21.621,69.5 c -1.836,-0.573 -3.724,0.508 -4.258,2.317 -0.541,1.804 0.481,3.705 2.285,4.245 0.332,0.098 0.657,0.144 0.983,0.144 1.465,0 2.826,-0.951 3.262,-2.429 z"
+     id="path33"
+     inkscape:connector-curvature="0" /><path
+     d="M28.496,55.187l0.026-0.065c0.703-1.751-0.156-3.698-1.908-4.401c-1.719-0.703-3.743,0.182-4.446,1.933  c-0.697,1.745,0.149,3.73,1.901,4.428c0.41,0.169,0.846,0.247,1.263,0.247C26.686,57.328,27.961,56.515,28.496,55.187z"
+     id="path35" /><path
+     d="m 42.21,92.086816 0.006,-0.065 c 0.195,-1.875 -1.178,-3.516 -3.06,-3.698 -1.868,-0.221 -3.542,1.211 -3.73,3.08 -0.188,1.875 1.179,3.548 3.054,3.736 0.11,0.014 0.234,0.02 0.345,0.02 1.725,0 3.21,-1.315 3.385,-3.073 z"
+     id="path39"
+     inkscape:connector-curvature="0" /><path
+     d="m 44.268,74.136 0.013,-0.065 c 0.371,-1.849 -0.833,-3.613 -2.683,-3.978 -1.81,-0.404 -3.646,0.859 -4.017,2.708 -0.371,1.849 0.827,3.646 2.676,4.011 0.221,0.045 0.449,0.064 0.677,0.064 1.589,0 3.008,-1.113 3.334,-2.74 z"
+     id="path41"
+     inkscape:connector-curvature="0" /><path
+     d="m 46.371,54.587 0.02,-0.071 c 0.371,-1.843 -0.833,-3.607 -2.689,-3.971 -1.816,-0.384 -3.646,0.866 -4.017,2.708 -0.371,1.849 0.827,3.646 2.683,4.01 0.215,0.046 0.442,0.065 0.67,0.065 1.587,0 3.007,-1.12 3.333,-2.741 z"
+     id="path43"
+     inkscape:connector-curvature="0" /></svg>
Index: /trunk/images/presets/shop/antique.svg
===================================================================
--- /trunk/images/presets/shop/antique.svg	(revision 10565)
+++ /trunk/images/presets/shop/antique.svg	(revision 10565)
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2276"
+   sodipodi:docname="Gramophone.svg"
+   height="148.65891"
+   sodipodi:version="0.32"
+   width="126.87975"
+   inkscape:version="0.48.5 r10040"
+   version="1.1">
+  <defs
+     id="defs2278">
+    <linearGradient
+       id="linearGradient2310">
+      <stop
+         id="stop2311"
+         style="stop-color:#6f6234"
+         offset="0" />
+      <stop
+         id="stop2312"
+         style="stop-color:#7f7655"
+         offset=".5" />
+      <stop
+         id="stop2313"
+         style="stop-color:#2d2711"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2300">
+      <stop
+         id="stop2301"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2302"
+         style="stop-color:#ffffff;stop-opacity:.020833"
+         offset=".49620" />
+      <stop
+         id="stop2303"
+         style="stop-color:#ffffff;stop-opacity:.53125"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2288">
+      <stop
+         id="stop2289"
+         style="stop-color:#ede1b9"
+         offset="0" />
+      <stop
+         id="stop2291"
+         style="stop-color:#7a7152"
+         offset=".5" />
+      <stop
+         id="stop2290"
+         style="stop-color:#927f39"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2283">
+      <stop
+         id="stop2284"
+         style="stop-color:#1d1100;stop-opacity:.66667"
+         offset="0" />
+      <stop
+         id="stop2292"
+         style="stop-color:#4f340c;stop-opacity:.30196"
+         offset=".52659" />
+      <stop
+         id="stop2285"
+         style="stop-color:#3d3001;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       id="radialGradient2286"
+       fx="86.442383"
+       fy="60.641514"
+       xlink:href="#linearGradient2283"
+       cy="56.434727"
+       cx="104.16177"
+       r="20.573427"
+       gradientTransform="matrix(0.92416218,0,0,1.0820612,-21.02338,-2.7357642)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2287"
+       y2="-13.319842"
+       xlink:href="#linearGradient2288"
+       y1="137.88396"
+       x2="291.10336"
+       x1="106.91916"
+       gradientTransform="matrix(0.48867066,0,0,0.63997744,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2293"
+       y2="288.53662"
+       xlink:href="#linearGradient2288"
+       y1="44.530285"
+       x2="423.51227"
+       x1="167.38974"
+       gradientTransform="matrix(0.4891886,0,0,0.63929982,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2296"
+       y2="139.84502"
+       xlink:href="#linearGradient2288"
+       y1="222.94662"
+       x2="80.841118"
+       x1="52.200809"
+       gradientTransform="matrix(0.65517346,0,0,0.4773365,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2297"
+       y2="233.77164"
+       xlink:href="#linearGradient2300"
+       y1="210.41183"
+       x2="45.221279"
+       x1="66.328804"
+       gradientTransform="matrix(0.501949,0,0,0.62304776,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2305"
+       y2="192.06702"
+       xlink:href="#linearGradient2300"
+       y1="74.241417"
+       x2="226.5798"
+       x1="182.66423"
+       gradientTransform="matrix(0.52411373,0,0,0.59669908,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2306"
+       y2="167.97333"
+       xlink:href="#linearGradient2288"
+       y1="52.916672"
+       x2="138.99986"
+       x1="281.13297"
+       gradientTransform="matrix(0.4891886,0,0,0.63929982,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2309"
+       y2="257.42313"
+       xlink:href="#linearGradient2310"
+       y1="378.07291"
+       x2="66.36496"
+       x1="90.823395"
+       gradientTransform="matrix(0.68264915,0,0,0.45812433,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2316"
+       y2="894.27612"
+       xlink:href="#linearGradient2310"
+       y1="838.66858"
+       x2="24.911583"
+       x1="23.705992"
+       gradientTransform="matrix(2.4069002,0,0,0.12993401,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2318"
+       xlink:href="#linearGradient2310"
+       gradientTransform="matrix(0.25436896,0,0,1.2294668,-16.21178,-12.168664)"
+       x1="187.5188"
+       y1="82.68367"
+       x2="197.01346"
+       y2="82.68367"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2341"
+       y2="253.13097"
+       xlink:href="#linearGradient2283"
+       y1="273.28244"
+       x2="82.798813"
+       x1="39.017715"
+       gradientTransform="matrix(0.58793891,0,0,0.53192292,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2460"
+       y2="104.70568"
+       xlink:href="#linearGradient2310"
+       y1="116.10118"
+       x2="23.555061"
+       x1="24.21303"
+       gradientTransform="matrix(1.3401544,0,0,0.74618265,-21.02338,-2.7357642)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient2598"
+       y2="233.9549"
+       xlink:href="#linearGradient2300"
+       y1="233.65829"
+       x2="65.41333"
+       x1="37.520344"
+       gradientTransform="matrix(1.6424044,0,0,0.60886345,-21.02338,-2.7357642)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2283"
+       id="radialGradient3034"
+       cx="198.30634"
+       cy="109.06019"
+       fx="143.6067"
+       fy="122.0465"
+       r="63.510036"
+       gradientTransform="matrix(0.51683436,0,0,0.6051033,-16.21178,-12.168664)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     pagecolor="#ffffff"
+     inkscape:zoom="2.8284271"
+     inkscape:window-x="-8"
+     borderopacity="1.0"
+     inkscape:cx="49.283795"
+     inkscape:cy="71.445898"
+     inkscape:window-y="-8"
+     inkscape:window-height="971"
+     showborder="true"
+     inkscape:pageopacity="0.0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2276" />
+  <g
+     id="g2385"
+     transform="matrix(0.55923,0,0,0.55923,-200.65337,-198.88577)">
+    <path
+       id="path2367"
+       style="fill:#000000;fill-opacity:0.08264501;fill-rule:evenodd"
+       d="m 492.32,361.86 c -31.52,0.35 -52.24,31.14 -53.67,60.24 -6.77,15.8 11.32,38.09 -4.25,48.44 -9.51,8.32 -22.81,17.12 -19.88,31.63 2.61,9.41 -2.11,16.63 -12.28,14.03 -8.56,-0.64 -17.89,2 -25.88,-1.14 5.58,-10.43 -7.18,-8.34 -4.64,1.28 4.9,8.34 16.43,4.02 24.57,5.8 5.81,0.59 23.91,-0.98 14.96,6.16 -7.21,1.23 -17.27,-2.66 -22.46,2.34 5.27,4.98 15.38,1.13 22.66,2.35 6.13,4.84 -11.75,2.35 -16.9,3.03 -5.76,0.44 -17.85,-0.6 -19.82,0.72 -3.57,-1.7 5.17,6.68 5.68,12.66 -0.44,10.6 -0.89,21.2 -1.34,31.8 -5.65,4.14 -15.25,5.58 -14.03,14.41 3.42,6.09 4.85,15.19 9.48,19.43 42.42,-0.25 84.85,-0.49 127.27,-0.74 0.74,-9.9 -10.83,-12.02 -16.83,-17.65 -3.54,-5.55 -0.77,-14.48 -1.86,-21.35 0.27,-10.76 -2.47,-22.12 3.83,-31.71 -0.47,-4.75 -13.32,-3.58 -18.62,-6.06 -12.91,-3.78 -26.47,-1.23 -39.7,-1.79 -0.53,-6.13 13.18,-1.14 18.42,-2.75 5.31,0.97 24.22,-0.15 12.25,-4.69 h -32.55 c 1.67,-11.1 -9.33,10.3 -8.91,-5.44 13.27,-4.91 1.75,-21.35 8.32,-30.26 8.63,-0.79 17.56,0.67 26.31,0.76 15.43,30.01 47.24,60.24 83.66,52.28 34.97,-8.66 46.81,-49.74 42.86,-81.66 -4.11,-39.97 -27.37,-80.47 -64.45,-98.03 -7.01,-2.88 -14.61,-4.4 -22.2,-4.09 z m -74.4,171.13 c 13.83,-2.23 -0.21,8.43 0,0 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2371"
+       style="fill:#000000;fill-opacity:0.08264501;fill-rule:evenodd"
+       d="m 486.44,360.66 c -24.63,3.39 -42.75,25.74 -47.51,49.16 -1.23,9.89 -5.17,19.84 -2.32,29.83 1.03,9.36 5.99,20.93 -1.92,28.57 -8.74,7.81 -20.33,15.15 -21.89,27.81 -1.47,5.91 3.82,13.45 -2.41,17.71 -4.49,2.97 -10.11,-0.15 -15.14,0.88 -5.57,0.33 -11.21,0.63 -16.66,-0.78 2.64,-3.57 -1.77,-9.87 -5.65,-6.23 -6.52,4.29 -1.82,15.21 5.56,14.93 10.63,2 21.84,0.02 32.34,2.47 0.35,2.89 -6.73,1.71 -9.31,1.49 -5.5,-0.35 -11.46,0.01 -15.59,4.16 1.39,2.61 11.39,4.4 4.33,3.79 -6.18,0.07 -12.37,0.19 -18.55,0.24 2.03,6.97 8.87,12.63 6.84,20.41 -0.36,8.37 -0.71,16.74 -1.06,25.12 -6.1,3.41 -15.63,7.26 -14.03,15.94 3.78,6.67 4.62,15.77 11.06,20.5 42.98,-0.24 85.96,-0.49 128.94,-0.72 1.49,-9.98 -8.84,-14.77 -15.74,-19.26 -5.39,-5.55 -1.83,-13.99 -2.96,-20.87 0.03,-10.76 -2.05,-22.59 4.01,-32.22 -3.57,-7.48 -13.47,-4.64 -19.83,-7.68 -2.51,-0.82 -8.07,-1.38 -8.79,-1.66 2.94,-0.85 7.28,-2.86 3.06,-5.59 -6.2,-4.15 -14.11,-0.96 -21.04,-1.97 -4.26,-0.59 -11.07,1.19 -13.71,-0.91 -1.22,-4.89 -6.18,0.34 -8.53,0.72 -1.26,-4.31 5.59,-5.47 5.56,-9.92 2.14,-7.29 -1.86,-15.39 1.69,-22.39 8.09,-0.05 16.17,0.2 24.25,0.75 13.08,23.82 33.6,45.96 60.93,52.37 19.92,4.32 42.43,-3.29 53.8,-20.62 16.98,-23.31 17.8,-54.61 10.91,-81.7 -7.99,-31.72 -27.57,-61.5 -56.47,-77.66 -10.45,-5.94 -22.27,-7.92 -34.17,-6.67 z m -65,173.65 c -1.79,0.78 -1.59,-0.72 0,0 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2375"
+       style="fill:#000000;fill-opacity:0.08264501;fill-rule:evenodd"
+       d="m 486.47,358.16 c -23.66,3.74 -42.22,23.57 -48.41,46.12 -4.01,14.58 -6.26,30.14 -2.19,44.97 1.56,7.05 0.79,15.58 -5.98,19.63 -9.2,8.35 -20.99,18.05 -19.4,31.94 1.04,4.23 1.4,11.82 -4.99,11.2 -7.38,0.32 -14.93,0.14 -22.23,0.06 -2.52,-1.67 -1.78,-7.01 -6.03,-7.29 -7.54,-2.41 -12.23,8.69 -8.03,14.26 3.51,7.44 13.24,6 19.35,6.83 -5.08,0.57 -2.71,7.07 -6.09,6.18 -4.22,0.94 -11.34,-2.38 -13.03,3.25 3.55,7.71 8.74,15.69 6.59,24.54 -0.26,6.27 -0.52,12.54 -0.78,18.81 -7.15,3.45 -16.69,10.01 -13.6,19.21 3.82,7.22 5.25,16.97 12.97,21.16 43.77,-0.24 87.53,-0.49 131.29,-0.72 2.35,-10.35 -6.86,-18.02 -14.85,-22.56 -6.56,-5.61 -2.57,-15.02 -3.75,-22.41 -0.15,-10.09 -1,-20.98 4.38,-30 -4.09,-5.23 -2.7,-3.69 1.97,-0.84 13.48,7.16 29.46,10.72 44.42,6.3 16.22,-4.13 29.8,-16.23 36.21,-31.65 12.91,-25.43 10.91,-55.83 2.31,-82.3 -10.03,-30.26 -30.81,-58.3 -60.11,-72.05 -9.34,-4.25 -19.87,-5.19 -30.02,-4.64 z m -36.25,139.15 c 8.62,15.36 20.05,29.27 34.4,39.6 -5.64,-2.34 -12.44,-1.82 -17.84,-4.35 0.33,-3.91 -1.78,-7.49 -6.05,-7.39 -9.55,-2.87 -19.83,0.77 -29.4,-1.53 -4.36,-2.37 -6.13,-1.99 -3.33,-6.76 1.58,-6.65 -0.76,-13.61 1.06,-20.22 7.05,0.22 14.11,0.43 21.16,0.65 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2384"
+       style="fill:#000000;fill-opacity:0.08264501;fill-rule:evenodd"
+       d="m 486.25,355.75 c -25.79,4.56 -46.2,26.8 -51.36,52.07 -4.1,15.19 -4.18,31.3 -0.87,46.64 0.57,11.21 -11.54,16.03 -17.14,24.03 -6.94,7.23 -10.51,17.45 -8.22,27.35 -1.19,6.26 -8.63,2.93 -12.99,3.77 -4.17,-1 -11.13,2.56 -12.55,-2.92 -3.15,-5.76 -11.48,-6.01 -15.17,-0.7 -6.11,7.47 -0.87,20.22 8.86,21.04 5.19,-0.04 7.97,2.75 1.07,2.75 -4.76,-1.55 -12.67,1.96 -10.06,7.79 5.13,8.56 6.98,18.66 5.52,28.55 -0.49,5.14 1.11,11.93 -5.15,14.03 -6.62,3.63 -11.31,11.4 -8.61,18.99 3.86,8 6.29,19.34 15.86,22.33 44.22,-0.24 88.43,-0.49 132.65,-0.72 3.2,-11.49 -5.92,-21.63 -15.31,-26.78 -5.54,-7.68 -1.91,-17.68 -3.07,-26.41 -0.15,-7.59 0.53,-15.39 3.85,-22.31 13.94,6.75 30.09,10.23 45.25,5.67 17.03,-4.26 30.95,-17.29 37.83,-33.29 13.89,-29 10.46,-63.56 -1.34,-92.65 -11.86,-28.21 -32.86,-54.43 -61.96,-65.79 -8.69,-3.22 -17.89,-3.84 -27.09,-3.44 z M 433.44,499 c 5.25,1.46 11.67,-1.03 16.22,2.03 7.08,11.58 15.45,22.47 25.84,31.28 -4.68,0.29 -6.73,-3.07 -8.58,-6.56 -7.9,-6.2 -18.93,-3.46 -28.25,-3.85 -3.22,-0.59 -11.16,-0.24 -8.35,-5.36 1.5,-5.62 -0.89,-12.67 1.87,-17.51 0.41,0.01 0.83,-0.03 1.25,-0.03 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <rect
+     id="rect2317"
+     style="fill:url(#linearGradient2318);fill-rule:evenodd;stroke-width:1pt"
+     rx="0.075110182"
+     ry="5.8366838"
+     width="2.4151466"
+     y="89.488159"
+     x="31.487185"
+     height="11.673368" />
+  <path
+     id="path2295"
+     sodipodi:nodetypes="czzzzzzcczzzzzzcc"
+     style="fill:url(#linearGradient2296);fill-rule:evenodd;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round"
+     d="m 8.835573,82.514567 -0.8539442,3.416896 c -0.4099156,1.638543 1.4439319,3.897833 3.1311282,3.981717 l 21.916224,1.140829 c 2.078099,0.106254 4.611411,-2.192181 4.55381,-4.272517 L 37.298143,76.536399 c -0.03188,-1.157607 0.836049,-2.902404 1.992536,-2.846481 l 17.080003,0.855622 -6.548583,-18.784536 -13.3779,11.665538 c -2.430414,2.125074 -4.654472,5.318277 -4.55381,8.539442 l 0.284648,9.109857 c 0.0274,0.872398 -0.833253,1.979674 -1.707889,1.990858 l -17.647062,0.285208 c -0.894768,0.01678 -2.560154,-0.570415 -2.276625,-1.420444 l 1.138033,-3.416896 H 8.835573 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2280"
+     sodipodi:nodetypes="czzzz"
+     style="fill:url(#linearGradient2293);fill-rule:evenodd;stroke:url(#linearGradient2306);stroke-width:0.55922999pt"
+     d="M 66.900983,2.5340517 C 90.237651,-5.8146929 110.73344,17.903929 119.27288,38.397472 127.81232,59.457514 126.67149,90.95894 105.61089,101.58487 83.409452,112.21024 58.931955,91.339776 49.822099,66.862279 40.712242,42.951841 44.129137,10.312941 66.900983,2.5340517 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2281"
+     sodipodi:nodetypes="czzzz"
+     style="fill:url(#linearGradient2287);fill-rule:evenodd;stroke-width:0.90177002pt"
+     d="M 68.511565,8.8019016 C 89.560982,1.2729881 108.03795,22.661858 115.73854,41.142173 c 7.7006,18.99201 6.67721,47.395301 -12.31983,56.979944 C 83.398268,107.70172 61.32546,88.883638 53.115963,66.81083 44.900875,45.246921 47.982232,15.816883 68.511565,8.8019016 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2282"
+     sodipodi:nodetypes="czzzz"
+     style="fill:url(#radialGradient3034);fill-rule:evenodd;stroke-width:1pt"
+     d="M 61.565929,20.85219 C 52.243565,27.738548 49.195761,48.832144 57.600988,71.654321 65.967069,94.152144 97.31191,94.38702 105.7451,87.279207 114.21744,80.501339 126.87841,62.868817 108.93831,34.908995 91.076496,7.6057086 71.167908,13.930041 61.565929,20.85219 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2304"
+     sodipodi:nodetypes="czzzz"
+     style="fill:url(#linearGradient2305);fill-rule:evenodd;stroke-width:1pt"
+     d="m 102.41769,80.663516 c 13.30967,-17.330538 -4.826165,-55.706578 6.57654,-38.934711 10.603,16.772426 8.89735,43.906266 -2.37114,52.898684 C 92.933139,106.83548 72.946259,88.050944 63.953841,78.527257 54.961422,68.997978 89.108006,97.429231 102.41769,80.663516 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2315"
+     sodipodi:nodetypes="ccccc"
+     style="fill:url(#linearGradient2316);fill-rule:evenodd;stroke-width:1pt"
+     d="m 9.1470642,98.346369 5.6353608,2.818511 57.762866,0.20133 -15.697586,-3.422487 -47.6989632,0.402646 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2307"
+     sodipodi:nodetypes="cccccccccccccccc"
+     style="fill:url(#linearGradient2309);fill-rule:evenodd;stroke-width:1pt"
+     d="m 14.380338,100.56092 21.937475,0.40264 1.811346,-9.864812 2.415314,9.663492 32.401786,0.60397 -2.818519,6.63806 0.402646,23.54917 9.663494,6.64366 0.603968,3.82513 -71.8498697,0.40264 -4.6309837,-10.87143 0.6039684,-3.82513 7.245384,-4.22219 0.804732,-19.12007 -4.2261012,-6.039681 5.6353602,2.214551 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2308"
+     style="fill:url(#linearGradient2297);fill-rule:evenodd;stroke-width:1pt"
+     d="m 17.399062,130.14418 -6.842739,8.25424 -4.830628,-9.86482 6.843297,-4.62483 4.83007,6.23541 z"
+     inkscape:connector-curvature="0" />
+  <rect
+     id="rect2314"
+     style="fill-rule:evenodd;stroke-width:1pt"
+     rx="1.3082067"
+     ry="1.3082067"
+     width="42.063606"
+     y="93.917259"
+     x="17.600388"
+     height="2.6164134" />
+  <path
+     id="path2340"
+     style="fill:url(#linearGradient2341);fill-rule:evenodd;stroke-width:1pt"
+     d="m 41.853071,107.84768 -21.632694,0.57042 v 21.63101 l -6.261698,10.2451 35.86342,-0.57042 -7.969028,-31.87611 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2459"
+     sodipodi:nodetypes="ccccc"
+     style="fill:url(#linearGradient2460);fill-rule:evenodd;stroke-width:1pt"
+     d="m 16.38562,78.255236 c 0,1.519 -2.846,4.955 -5.726,4.955 -2.8799994,0 -4.7079994,-3.436 -4.7079994,-4.955 0,-1.519 1.828,-0.55 4.7079994,-0.55 2.88,0 5.726,-0.969 5.726,0.55 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2534"
+     sodipodi:nodetypes="czzzz"
+     style="fill:url(#radialGradient2286);fill-rule:evenodd;stroke-width:1pt"
+     d="m 60.92362,39.230236 c -5.4,3.989 -7.165,16.207 -2.297,29.428 4.845,13.031 23,13.17 27.89,9.052 4.9,-3.928 12.24,-14.142 1.85,-30.338 -10.348,-15.815 -21.881,-12.152 -27.443,-8.142 z"
+     inkscape:connector-curvature="0" />
+  <path
+     id="path2597"
+     sodipodi:nodetypes="ccccc"
+     style="fill:url(#linearGradient2598);fill-rule:evenodd;stroke-width:1pt"
+     d="m 78.50462,140.79423 -24.52,-0.59 -1.295,-8.98 13.914,0.67 11.901,8.9 z"
+     inkscape:connector-curvature="0" />
+  <metadata
+     id="metadata57">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2009-05-01T00:45:54</dc:date>
+        <dc:description>A Gramophone icon by Andrew Fitzsimon. Etiquette Icon set. From 0.18 OCAL database.</dc:description>
+        <dc:source>https://openclipart.org/detail/25563/gramophone-by-anonymous-25563</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Anonymous</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>etiquette</rdf:li>
+            <rdf:li>gramophone</rdf:li>
+            <rdf:li>icon</rdf:li>
+            <rdf:li>music</rdf:li>
+            <rdf:li>sound</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/shop/art.svg
===================================================================
--- /trunk/images/presets/shop/art.svg	(revision 10565)
+++ /trunk/images/presets/shop/art.svg	(revision 10565)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="695.06635"
+   height="695.06635"
+   id="svg3034"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3036">
+    <filter
+       id="filter4280"
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always">
+      <feGaussianBlur
+         id="feGaussianBlur4282"
+         stdDeviation="2.9027502"
+         inkscape:collect="always" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="913.96173"
+     inkscape:cy="7.5331587"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3039">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(538.96173,155.17098)">
+    <g
+       id="g37657"
+       transform="matrix(2.2848,0,0,2.2848,-991.38274,-142.16064)">
+      <rect
+         id="rect3481"
+         style="fill:#000000;fill-opacity:0.99607999;filter:url(#filter4280)"
+         height="290.28"
+         width="290.28"
+         y="1.2723"
+         x="204.98" />
+      <rect
+         id="rect3502"
+         style="fill:#a05a2c;fill-opacity:0.99607999"
+         height="290.28"
+         width="290.28"
+         y="-2.7277"
+         x="200.98" />
+      <rect
+         id="rect3484"
+         style="fill:#784421;fill-opacity:0.99607999"
+         height="280.04999"
+         width="280.04999"
+         y="2.3828001"
+         x="206.09" />
+      <rect
+         id="rect3486"
+         style="fill:#c87137;fill-opacity:0.99607999"
+         height="255.52"
+         width="255.52"
+         y="14.648"
+         x="218.36" />
+      <rect
+         id="rect3488"
+         style="fill:#784421;fill-opacity:0.99607999"
+         height="235.08"
+         width="235.08"
+         y="24.868999"
+         x="228.58" />
+      <rect
+         id="rect3490"
+         style="fill:#ffffff;fill-opacity:0.99607999"
+         height="204.42"
+         width="204.42"
+         y="40.200001"
+         x="243.91" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3492"
+         style="fill:#2b1100;fill-opacity:0.99607999"
+         d="M 486.64,282.98 V 1.71 H 205.37 l 4.9462,4.9461 h 271.38 v 271.38 l 4.9461,4.9461 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3500"
+         style="fill:#d38d5f;fill-opacity:0.99607999"
+         d="m 205.37,1.7121 v 281.27 h 281.27 l -4.9462,-4.9461 h -271.38 V 6.656 l -4.9461,-4.9461 z" />
+      <g
+         id="g4291"
+         transform="matrix(0.90578,0,0,0.90578,-1237.3,-654.51)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4287"
+           style="fill:#2b1100;fill-opacity:0.99607999"
+           d="M 1888.9,1020.4 V 739.13 h -281.27 l 4.9462,4.9461 h 271.38 v 271.38 l 4.9461,4.9461 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4289"
+           style="fill:#d38d5f;fill-opacity:0.99607999"
+           d="m 1607.7,739.11 v 281.27 h 281.27 l -4.9462,-4.9461 h -271.38 v -271.38 l -4.9461,-4.9461 z" />
+      </g>
+      <g
+         id="g4295"
+         transform="matrix(0.83468,0,0,0.83468,-1113,-591.95)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4297"
+           style="fill:#2b1100;fill-opacity:0.99607999"
+           d="M 1888.9,1020.4 V 739.13 h -281.27 l 4.9462,4.9461 h 271.38 v 271.38 l 4.9461,4.9461 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4299"
+           style="fill:#d38d5f;fill-opacity:0.99607999"
+           d="m 1607.7,739.11 v 281.27 h 281.27 l -4.9462,-4.9461 h -271.38 v -271.38 l -4.9461,-4.9461 z" />
+      </g>
+      <g
+         id="g4301"
+         transform="matrix(0.72802,0,0,0.72802,-926.53,-498.12)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4303"
+           style="fill:#2b1100;fill-opacity:0.99607999"
+           d="M 1888.9,1020.4 V 739.13 h -281.27 l 4.9462,4.9461 h 271.38 v 271.38 l 4.9461,4.9461 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4305"
+           style="fill:#d38d5f;fill-opacity:0.99607999"
+           d="m 1607.7,739.11 v 281.27 h 281.27 l -4.9462,-4.9461 h -271.38 v -271.38 l -4.9461,-4.9461 z" />
+      </g>
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/shop/bag.svg
===================================================================
--- /trunk/images/presets/shop/bag.svg	(revision 10565)
+++ /trunk/images/presets/shop/bag.svg	(revision 10565)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="410.14688"
+   height="357.28976"
+   id="svg3038"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="TheresaKnott_handbag5höher.svg">
+  <defs
+     id="defs3040">
+    <radialGradient
+       id="path7801_1_"
+       gradientUnits="userSpaceOnUse"
+       cy="230.88"
+       cx="271.73001"
+       gradientTransform="matrix(0.87531853,-0.19539677,-0.97380937,-1.5228783,418.86746,833.05644)"
+       r="37.351002">
+      <stop
+         style="stop-color:#FFFFFF"
+         offset="0"
+         id="stop24" />
+      <stop
+         style="stop-color:#FFFFFF"
+         offset="1"
+         id="stop26" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       id="path6918_1_"
+       y2="103.45"
+       gradientUnits="userSpaceOnUse"
+       x2="309.17999"
+       gradientTransform="matrix(1.0157055,0,0,-0.87390907,-2.5183149,521.09501)"
+       y1="112.37"
+       x1="287">
+      <stop
+         style="stop-color:#FFFFFE"
+         offset="0"
+         id="stop18" />
+      <stop
+         style="stop-color:#FFFFFE"
+         offset="1"
+         id="stop20" />
+      <a:midPointStop
+         style="stop-color:#FFFFFE"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#FFFFFE"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#FFFFFE"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       id="path5115_1_"
+       gradientUnits="userSpaceOnUse"
+       cy="-73.265999"
+       cx="-613.88"
+       gradientTransform="matrix(0.2223793,0.05343814,0.34616778,-1.5802266,359.91295,542.83956)"
+       r="67.028">
+      <stop
+         style="stop-color:#FFFFFF"
+         offset="0"
+         id="stop12" />
+      <stop
+         style="stop-color:#FFFFFF"
+         offset="1"
+         id="stop14" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="1" />
+    </radialGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="250.2755"
+     inkscape:cy="72.991791"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3043">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-166.35513,-355.03125)">
+    <path
+       style="fill:#ff1e17"
+       inkscape:connector-curvature="0"
+       id="path2393"
+       d="m 240.28409,710.10528 c -0.35797,-0.3139 -13.21577,-0.87109 -28.57335,-1.23929 -25.50262,-0.60933 -28.42935,-0.88629 -33.76285,-3.19326 -7.39432,-3.19543 -10.681,-8.5034 -11.49993,-18.56758 -0.65594,-8.05482 2.24279,-27.71941 6.21842,-42.17594 3.32769,-12.10396 9.22014,-38.72202 14.86861,-67.17674 2.56777,-12.93051 5.50649,-26.7875 6.53039,-30.78884 1.02392,-4.00352 3.91564,-17.22619 6.42441,-29.38554 2.50976,-12.15827 5.20652,-23.14132 5.99345,-24.4056 0.78592,-1.26317 3.00371,-2.81418 4.92853,-3.44632 4.05263,-1.32943 8.26123,-0.89172 34.36681,3.57558 10.53702,1.80191 20.06613,3.27797 21.17602,3.27797 2.65476,0 3.60967,-2.38625 7.6203,-19.04114 13.07578,-54.29836 20.82706,-80.63728 26.88849,-91.36835 8.09725,-14.33272 19.98614,-23.66159 36.11165,-28.33633 6.16841,-1.78779 11.28994,-2.32543 22.17093,-2.32543 15.90952,0 24.85969,1.98981 34.37879,7.64208 5.69048,3.37899 9.17515,5.22869 16.86744,11.03737 3.85763,2.91195 9.49212,8.38827 14.45566,12.91096 7.82626,7.12725 16.77743,22.44402 25.00967,42.78744 18.80424,46.46728 26.39754,63.16671 29.47725,64.83936 1.37587,0.74618 5.82646,0.28565 14.22068,-1.4728 18.04831,-3.77978 35.92765,-6.5136 37.41852,-5.71963 2.44877,1.3012 3.94263,6.63741 9.16715,32.76671 2.87173,14.3566 12.05687,54.56881 20.4101,89.36008 13.18576,54.90226 15.21158,64.76333 15.33956,74.64612 0.15999,12.57208 -1.31887,15.75339 -9.10015,19.57335 -5.77446,2.83375 -72.24228,4.45535 -197.6416,4.81812 -58.68254,0.16944 -111.66961,0.68427 -117.75904,1.14371 -6.08944,0.45944 -11.33895,0.56479 -11.69891,0.24982 z M 444.89505,500.11077 c 3.44967,-1.19585 3.57766,-1.53472 3.57766,-9.50591 0,-11.33931 -4.62357,-37.52834 -8.48621,-48.06826 -4.23261,-11.55002 -12.18187,-27.54996 -21.66898,-43.61507 -5.76547,-9.76224 -9.27914,-14.28384 -13.72573,-17.65088 -7.5203,-5.69681 -19.58217,-10.82014 -29.42926,-12.50148 -20.83705,-3.55711 -48.47449,8.40889 -59.0855,25.58404 -8.73118,14.13287 -22.08294,53.46638 -25.17665,74.17366 -0.78793,5.2667 -2.2508,13.40516 -3.2527,18.08534 -2.36479,11.0428 -2.29778,13.06084 0.45496,13.70601 1.25188,0.29326 20.08112,0.57348 41.8401,0.62236 21.75997,0.05 39.91129,0.40512 40.33724,0.78854 1.34988,1.21647 70.77342,-0.2824 74.62307,-1.61835 z"
+       sodipodi:nodetypes="cssssssssssssssssssssssssssssccsssssssssssc" />
+    <path
+       style="opacity:0.17300002;stroke:#000000;stroke-width:0.9421919"
+       inkscape:connector-curvature="0"
+       id="path8684"
+       enable-background="new    "
+       d="m 277.35064,497.78642 7.66529,1.05573 c 0,0 6.13142,-49.8593 17.78234,-78.35204 7.14533,-17.47601 14.10269,-31.92059 26.05957,-39.57137 11.95689,-7.64969 22.68689,-11.07972 25.14067,-11.60759 2.45277,-0.52786 -5.82546,-5.54041 -11.65092,-3.95681 -5.82446,1.58251 -26.97949,13.71795 -29.12529,18.20263 -2.1468,4.48468 -20.54109,65.95266 -22.68789,72.81164 -2.13981,6.86441 -13.17877,41.94676 -13.17877,41.41456 z"
+       sodipodi:nodetypes="ccssssssc" />
+    <path
+       style="opacity:0.5405;fill:#b90000"
+       inkscape:connector-curvature="0"
+       id="path2391"
+       d="m 221.51583,712.321 c -15.46256,-4.92782 -36.60159,4.66715 -48.13752,-8.44801 -7.97125,-14.98331 21.79498,-23.73109 16.93343,-40.14268 -0.92992,-26.95693 4.59057,-53.92147 9.54111,-80.51889 5.65847,-27.22738 12.57783,-54.37657 13.89171,-82.10684 23.07385,-2.29284 37.5955,18.55021 50.32232,31.60454 9.15014,18.61319 -10.02708,35.95018 -4.39159,54.7339 2.22779,17.71388 -15.51257,40.72377 7.24932,52.86357 13.37775,8.56097 30.76314,12.95114 46.84764,7.68445 15.61254,-4.27723 31.38108,-9.11707 48.04553,-8.21666 21.70997,1.72914 41.8141,-5.33403 56.34875,-19.06503 13.22777,-10.32812 36.22662,-11.1286 42.08908,-27.64338 3.07671,-8.47298 -0.14898,-14.75522 11.13396,-17.67042 8.44022,-14.00906 11.69092,-29.56585 15.0586,-44.9847 5.20652,-16.03471 24.11376,-29.37361 43.19799,-30.59008 11.7709,10.25534 5.91644,30.01442 12.23085,43.9105 9.66511,45.0553 21.93896,89.66638 31.2311,134.7901 -9.42012,12.11048 -5.4085,21.58272 2.45177,14.40441 -0.75093,17.61177 -23.66779,17.58245 -38.90138,17.1708 -104.99023,1.96592 -210.10044,0.81461 -315.12067,2.21573 z m -13.31876,-7.01647 c 29.14329,-1.85839 58.37257,3.41591 87.44986,-0.13903 48.79746,-0.42142 97.73791,2.00611 146.40637,-1.64985 8.25024,2.33087 29.30828,-4.2164 9.82409,-5.17545 -37.38052,0.15531 -74.89603,-5.46439 -112.06956,0.01 -20.79308,0.7679 -41.46014,-1.90944 -62.34421,-1.36963 -22.93386,-2.1864 -45.66775,0.47465 -67.85068,5.54909 -8.04925,-0.6343 -33.62487,7.05341 -11.91989,4.0839 3.50967,-0.35843 7.01935,-0.78202 10.49902,-1.31423 z m 302.15188,-3.4322 c -4.47958,-7.124 -34.97975,-4.92674 -26.10957,-0.81244 8.67919,0.48876 17.40838,1.87903 26.10757,0.8146 z"
+       enable-background="new    " />
+    <path
+       style="opacity:0.23239997;fill:#ffffff"
+       inkscape:connector-curvature="0"
+       id="path3329"
+       d="m 284.39998,505.96507 c 7.98625,2.56546 16.84843,2.54808 25.22665,3.67441 22.82788,-0.77442 45.69475,-0.46704 68.54262,-0.6039 10.59602,0.0435 58.59755,1.61184 72.67124,1.34791 7.99526,-1.28925 21.75397,-4.97453 21.59199,6.11932 0.092,6.87418 -6.09443,12.24841 -7.80228,18.82825 -4.10961,6.7721 -9.6021,14.05684 -18.41328,16.62773 -4.94654,5.20045 -5.15352,12.80127 -11.54192,17.2425 -6.5794,4.97235 -8.04725,12.51016 -9.07916,19.58312 -3.13971,10.93852 -16.48547,15.9087 -23.85878,24.44251 -6.23342,6.98498 -81.86838,22.6493 -93.19632,18.55889 -5.83046,-3.71786 8.13824,-20.23589 0.049,-20.71054 -34.23382,5.36446 -13.66373,-9.32125 -20.91006,-13.55395 -8.77218,-6.90459 11.8139,-25.93161 7.13034,-34.45999 -4.41459,-9.88932 -7.12234,-20.29781 -12.74581,-29.79937 -2.27479,-6.08564 -7.92627,-12.46238 -5.67047,-19.01724 1.87982,-3.21498 5.40949,-5.43071 7.98925,-8.24381 z"
+       sodipodi:nodetypes="ccccccccccccccccc"
+       enable-background="new    " />
+    <path
+       style="opacity:0.8595;fill-opacity:0.40859997"
+       inkscape:connector-curvature="0"
+       id="path5111"
+       d="m 524.8476,491.96471 c -18.06532,1.80734 -35.75167,9.83935 -54.08097,6.01831 -16.48546,0.38123 -31.0881,9.04537 -47.81554,7.96467 -39.7843,1.57924 -79.64159,-0.79506 -119.3989,-0.98405 -24.78569,-3.08246 -49.67637,-4.33696 -74.0461,-9.66883 -6.70738,-0.93516 -18.63026,-4.27721 -21.45,3.52671 -5.60249,30.06004 -13.09379,59.89198 -19.01424,89.93139 -5.93244,29.80153 -14.19068,59.32937 -18.59826,89.3112 -1.39588,9.08449 -0.32597,22.07039 12.19886,24.63151 13.02679,3.16502 26.90349,0.14337 40.13226,2.21572 48.20752,1.35551 96.41303,-1.54231 144.63654,-0.76572 64.90196,-0.416 130.0379,0.54633 194.73188,-4.07303 10.89798,-3.5897 7.80427,-15.7056 6.71338,-23.38027 -8.08126,-48.41148 -22.98487,-95.77266 -32.17002,-144.04403 -2.97471,-13.68212 -5.88145,-27.37944 -9.43011,-40.96272 l -1.29088,0.15097 -1.1199,0.13034 z m -5.04953,12.63182 c 9.07215,44.58392 20.10513,88.85176 30.58316,133.20434 3.67066,16.61469 7.41631,33.29999 9.34512,50.02439 0.29498,5.47416 -8.77318,2.43622 -12.59983,3.7939 -89.54565,5.60013 -179.4033,1.55969 -269.06495,4.26744 -26.94749,0.85045 -53.88598,-0.6821 -80.79448,-0.9243 -6.26642,0.3291 -16.24449,0.0597 -16.50847,-7.17288 -1.39786,-12.65789 3.59467,-25.14852 5.4265,-37.68257 10.23005,-48.29201 21.41401,-96.56446 30.96612,-144.88036 -1.29688,-6.18123 6.90035,-0.69404 10.23705,-1.09917 36.09364,6.1204 72.62724,10.188 109.46981,10.1337 31.73905,0.83958 63.64607,1.41197 95.31512,0.2031 15.28159,-1.37505 29.41227,-9.61235 45.05181,-6.78729 14.30867,0.60389 28.05439,-3.34858 41.8421,-6.01831 0.22998,0.96667 0.46996,1.94419 0.70994,2.92171 z"
+       enable-background="new    " />
+    <path
+       style="opacity:0.8595;fill:#ffffff"
+       inkscape:connector-curvature="0"
+       id="path4223"
+       d="m 525.21756,494.18044 c -16.0995,1.79322 -31.84703,7.84628 -48.1835,7.13703 -11.58893,-4.61176 -35.85067,7.14572 -44.76784,6.36804 -41.9361,2.76206 -84.08217,-0.65168 -126.08827,-0.17486 -9.09015,-0.97319 -33.08392,-3.98071 -41.31216,-4.26854 -14.27966,-1.38157 -28.35035,-4.7334 -42.49204,-6.78838 -4.70756,-0.55393 -11.98488,-1.40764 -11.91389,4.23378 -3.2127,18.85215 -8.5712,37.72276 -12.11687,56.68027 -7.77928,38.04643 -16.64745,75.96904 -24.60071,113.95792 -0.59894,8.78362 -3.59467,19.87311 3.98463,26.90588 11.61792,6.6461 26.7895,1.90292 39.84829,4.23269 42.87401,2.0061 85.78802,-1.17955 128.69802,-0.45401 71.05938,-0.43011 142.47674,0.4703 213.27015,-3.74501 9.77709,-0.93843 8.17124,-11.9519 7.19733,-17.9474 -6.12943,-41.7317 -19.19921,-82.51631 -27.56843,-123.96127 -4.57957,-20.72357 -8.74919,-41.63179 -13.93871,-62.17071 z m -4.10961,4.82246 c 1.67385,6.91221 3.2707,13.84396 4.79656,20.78223 9.69109,51.11379 24.81068,101.33261 34.2778,152.47247 -0.19998,6.67542 5.00354,14.61838 0.20198,20.64211 -62.58217,5.09183 -126.08826,3.73307 -189.0724,4.26854 -54.44193,-0.93192 -108.99985,2.94887 -163.3348,0 -8.88117,-0.69622 -19.96814,1.98654 -27.32445,-3.28775 -6.4604,-9.66449 -0.50896,-21.46541 0.32497,-31.83914 10.84399,-50.73691 22.15294,-101.41842 32.77295,-152.19008 1.76283,-2.96517 -0.98891,-11.14163 5.4085,-9.62212 26.61452,5.46111 53.99896,8.11782 81.15944,10.8462 40.12127,0.90041 80.35252,2.6567 120.51878,1.40004 17.00642,1.47823 32.10702,-6.45494 48.51149,-7.94186 17.02941,3.16935 34.08982,-2.25918 50.54229,-5.31775 l 1.20989,-0.20637 z"
+       enable-background="new    " />
+    <path
+       style="opacity:0.83780003;fill:url(#path5115_1_)"
+       inkscape:connector-curvature="0"
+       id="path5115"
+       d="m 206.53723,474.3475 c 0.043,7.70291 2.90373,24.10147 2.92972,37.47404 0.029,14.69875 0.032,27.82367 -2.41677,43.35115 -2.1688,13.75163 -5.86846,18.52957 -7.79828,30.7682 -1.81283,11.49789 -6.48239,22.43207 -8.5032,35.24311 -1.81883,11.53373 -8.22324,25.10289 -11.36294,34.68591 -3.83965,11.72272 -0.64894,24.14925 1.12989,30.20449 5.27051,17.93545 16.37448,-5.93793 23.88978,-20.70945 5.3375,-10.49103 6.3874,-21.47518 6.3694,-31.04734 -0.02,-10.21841 8.84218,-44.92279 8.82118,-55.93952 -0.027,-14.07096 -4.10461,-67.97831 -5.50549,-77.18553 -1.90982,-12.58837 1.66985,-14.57601 -7.54929,-26.86027 z"
+       sodipodi:nodetypes="cssssssssssc"
+       enable-background="new    " />
+    <path
+       style="fill:url(#path6918_1_)"
+       inkscape:connector-curvature="0"
+       id="path6918"
+       d="m 339.9748,360.06374 c 0,0 -23.40181,12.34183 -29.44125,18.83803 -6.03944,6.49621 -18.87325,42.22265 -20.76007,47.41875 -1.88782,5.1961 -8.30523,42.87215 -11.32395,50.34264 -3.01971,7.46938 -6.41739,14.29035 -7.54929,19.48645 -0.62994,2.89131 7.17133,0 7.17133,0 0,0 9.81309,-37.35022 10.94598,-45.14545 1.13189,-7.79523 12.83381,-41.24838 16.23049,-50.99106 3.39768,-9.74378 10.56901,-25.0084 18.49628,-28.25705 7.90926,-3.2367 16.58845,-11.36103 16.21849,-11.68687 z"
+       sodipodi:nodetypes="csssscsssc" />
+    <path
+       style="fill:url(#path7801_1_)"
+       inkscape:connector-curvature="0"
+       id="path7801"
+       d="m 380.29106,367.61242 c 0,0 16.90942,8.20797 22.97986,12.31142 6.07044,4.10343 19.74716,25.11809 24.7147,34.32313 5.63747,10.44651 20.3781,50.36654 20.81006,63.79667 0.43496,13.43122 4.44559,19.86661 5.63747,17.16212 1.19289,-2.70449 -0.86691,-20.51939 -3.03471,-27.60754 -2.1678,-7.08924 -21.43701,-59.08825 -29.48326,-70.51227 -17.34839,-24.62282 -42.05609,-30.5966 -41.62612,-29.47787 z"
+       sodipodi:nodetypes="cssssssc" />
+    <path
+       style="opacity:0.24320003;stroke:#000000;stroke-width:0.9421919"
+       inkscape:connector-curvature="0"
+       id="path9559"
+       enable-background="new    "
+       d="m 358.18311,355.67573 c 0,0 25.58062,2.98472 28.61634,4.10344 3.03472,1.11982 37.72049,27.23499 40.75721,30.96589 3.03371,3.73089 35.98665,75.36298 40.7572,89.16675 4.76856,13.80376 -3.03471,17.90829 -3.03471,17.90829 l -8.6722,-0.37255 c 0,0 -5.63648,-38.05513 -7.80627,-44.3971 -2.1668,-6.34198 -22.97886,-60.06685 -30.78313,-66.78138 -7.80628,-6.71561 -36.85458,-23.87772 -45.09281,-24.99645 -8.23923,-1.12958 -13.87871,-5.2352 -14.73863,-5.60449 z"
+       sodipodi:nodetypes="csssccsssc" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/beauty.svg
===================================================================
--- /trunk/images/presets/shop/beauty.svg	(revision 10565)
+++ /trunk/images/presets/shop/beauty.svg	(revision 10565)
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4149"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shop__beauty10.svg">
+  <defs
+     id="defs4151" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.9789706"
+     inkscape:cy="9.4003253"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="false"
+     inkscape:snap-page="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4697" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4154">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#cccccc;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.295261,1046.0461 c 0.4758102,-2.617 3.9820475,-3.2654 6.704739,-3.2918 2.722692,-0.026 4,0 7.490264,3.2389 l -6.8728131,2.4055 z"
+       id="path4180"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#7f2aff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.2421875,2.7324219 7.65625,5.4082031 6.4726562,5.4785151 5.0429688,3.1328125 5.4082031,5.7949219 4.3671875,6.3222656 2.7773438,3.90625 3.40625,6.921875 2.6425781,7.4609375 0.84302229,5.1284462 1.5429688,8.3222656 c 0,0 -1.04882818,0.6350453 -1.04882818,1.4941406 0,0.8590958 0.85156248,1.2246098 0.85156248,1.2246098 L 0.53320312,14.134766 2.375,11.615234 3.3066406,12.103519 2.5996094,15.091797 4.28125,12.541016 5.4082031,12.9375 l -0.3652343,2.662109 1.46875,-2.410156 1.1230468,0.0293 L 8.2421875,16 8.7558594,13.078125 9.828125,12.835938 l 1.365234,2.732421 -0.316406,-3.044921 1.007813,-0.333985 1.52539,2.947266 -0.404297,-3.351563 1.009766,-0.378906 1.595703,2.884766 -0.607422,-3.273438 c 0,0 0.996094,-0.339191 0.996094,-1.2167968 0,-0.8415147 -1.103516,-1.5 -1.103516,-1.5 L 15.655522,4.8391538 13.90625,7.5234375 13.005859,6.9550781 13.542739,3.7724798 11.958984,6.4023438 10.900391,5.9804688 11.193359,3.1640625 9.9238281,5.7050781 8.7265625,5.4902344 Z M 7.2871094,7.3925781 c 2.258149,-0.1888014 6.0175786,2.1445313 6.0175786,2.1445313 0,0 -3.9387404,1.7891436 -6.0253911,1.7128906 C 5.7728828,11.194951 3.03125,9.6992188 3.03125,9.6992188 c 0,0 1.9977104,-2.1178393 4.2558594,-2.3066407 z"
+       transform="translate(0,1036.3622)"
+       id="path4151"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccczcccccccccccccccccccccsccccccccccczcacz" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#784421;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.0137856,1040.3622 c 2.1448529,0 4.3896429,-3 6.5344961,-3 3.7258593,0 5.3068623,1 7.4517183,1"
+       id="path4150"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1"
+       id="path4146"
+       cx="7.5187278"
+       cy="1045.6886"
+       r="1.9343969" />
+    <circle
+       r="0.96719843"
+       cy="1045.6886"
+       cx="7.5187278"
+       id="circle4148"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/bed.svg
===================================================================
--- /trunk/images/presets/shop/bed.svg	(revision 10565)
+++ /trunk/images/presets/shop/bed.svg	(revision 10565)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="418.47101"
+   height="243.89426"
+   id="svg2997"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Neues Dokument 2">
+  <defs
+     id="defs2999" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="199.27301"
+     inkscape:cy="133.22119"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3002">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(512.09264,469.58494)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1894"
+       d="m -469.39064,-446.50069 c 0,-30.779 -42.702,-30.779 -42.702,0 v 220.81 h 43.651 v -63.74 h 332.12 v 63.261 h 42.699997 v -190.63 c 0,-32.482 -43.173997,-32.482 -43.173997,0 v 76.088 h -332.59 z"
+       style="fill:#ac39ac;fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3033"
+       d="m -447.41564,-418.07569 51.253,54.701"
+       style="fill:none;stroke:#ac39ac;stroke-width:40;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3815"
+       d="m -352.61264,-364.79469 h 193.48"
+       style="fill:none;stroke:#ac39ac;stroke-width:40;stroke-linecap:round;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/body.svg
===================================================================
--- /trunk/images/presets/shop/body.svg	(revision 10565)
+++ /trunk/images/presets/shop/body.svg	(revision 10565)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns1="http://sozi.baierouge.fr" id="svg3570" sodipodi:docname="buddy.svg" viewBox="0 0 485.2 493.06" sodipodi:version="0.32" version="1.0" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.46">
+  <sodipodi:namedview id="base" bordercolor="#666666" inkscape:pageshadow="2" guidetolerance="10.0" pagecolor="#ffffff" gridtolerance="10.0" inkscape:zoom="0.93701046" objecttolerance="10.0" borderopacity="1.0" inkscape:current-layer="svg3570" inkscape:cx="93.724066" inkscape:cy="246.52873" inkscape:window-y="66" inkscape:window-x="88" inkscape:window-height="675" showgrid="false" inkscape:pageopacity="0.0" inkscape:window-width="640"/>
+  <g id="layer1" transform="translate(-77.174 10.598)">
+    <g id="g2577" transform="matrix(2.332 0 0 2.332 997.06 -122.71)">
+      <g id="g2579" transform="translate(1.4286 -131.43)">
+        <rect id="rect2581" style="fill:#000000" rx="12" ry="12" height="138.57" width="84.286" y="252.36" x="-334.29"/>
+        <path id="path2583" style="fill:#000000" d="m-291.43 172.36a48.571 48.571 0 1 1 -97.14 0 48.571 48.571 0 1 1 97.14 0z" transform="matrix(.72059 0 0 .72059 -47.143 90.303)"/>
+      </g>
+      <rect id="rect2585" style="fill:#000000" transform="rotate(40)" rx="8" ry="8" height="114.29" width="25.714" y="298.63" x="-172.71"/>
+      <rect id="rect2587" style="fill:#000000" transform="matrix(-.76604 .64279 .64279 .76604 0 0)" rx="8" ry="8" height="114.29" width="25.714" y="-74.733" x="272.25"/>
+    </g>
+  </g>
+  <metadata>
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>Buddy</dc:title>
+        <dc:date>2008-11-03T14:42:04</dc:date>
+        <dc:description/>
+        <dc:source>https://openclipart.org/detail/19935/buddy-by-sheikh_tuhin-19935</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>sheikh_tuhin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>gents</rdf:li>
+            <rdf:li>how i did it</rdf:li>
+            <rdf:li>male symbol</rdf:li>
+            <rdf:li>man</rdf:li>
+            <rdf:li>person</rdf:li>
+            <rdf:li>silhouette</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/shop/book.svg
===================================================================
--- /trunk/images/presets/shop/book.svg	(revision 10565)
+++ /trunk/images/presets/shop/book.svg	(revision 10565)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:cc="http://web.resource.org/cc/" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns1="http://sozi.baierouge.fr" id="svg2" sodipodi:docname="book.svg" viewBox="0 0 110 115" sodipodi:version="0.32" version="1.0" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:version="0.45.1" sodipodi:docbase="/home/denilson/Arte/book">
+  <sodipodi:namedview id="base" gridspacingy="10px" gridspacingx="10px" inkscape:zoom="2.2594447" height="115px" borderopacity="1.0" inkscape:current-layer="layer1" inkscape:cx="135.47134" inkscape:cy="89.800824" inkscape:object-paths="false" inkscape:grid-bbox="false" showgrid="true" width="110px" inkscape:document-units="px" bordercolor="#666666" inkscape:window-x="0" guidetolerance="10" objecttolerance="10" inkscape:object-nodes="false" inkscape:window-y="20" inkscape:window-width="1024" inkscape:pageopacity="0.0" inkscape:pageshadow="2" pagecolor="#ffffff" gridtolerance="10000" inkscape:object-points="false" inkscape:window-height="748"/>
+  <defs id="defs4">
+    <linearGradient id="linearGradient8148">
+      <stop id="stop8150" style="stop-color:#bfbfbf" offset="0"/>
+      <stop id="stop8152" style="stop-color:#f0f0f0" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient7144">
+      <stop id="stop7146" style="stop-color:#5e411f" offset="0"/>
+      <stop id="stop7148" style="stop-color:#be843f" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient9162" y2="57.382" gradientUnits="userSpaceOnUse" x2="110.66" gradientTransform="translate(-23.251 -22.479)" y1="84.858" x1="105.88" inkscape:collect="always">
+      <stop id="stop8142" style="stop-color:#fffe7f" offset="0"/>
+      <stop id="stop8144" style="stop-color:#ffffbf" offset="1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient9165" y2="139.47" xlink:href="#linearGradient7144" gradientUnits="userSpaceOnUse" x2="129.18" gradientTransform="translate(-22.118 -21.799)" y1="86.894" x1="48.713" inkscape:collect="always"/>
+    <linearGradient id="linearGradient9168" y2="107.82" xlink:href="#linearGradient8148" gradientUnits="userSpaceOnUse" x2="139.63" gradientTransform="translate(-22.118 -21.799)" y1="105.83" x1="133.04" inkscape:collect="always"/>
+    <linearGradient id="linearGradient9171" y2="147.33" xlink:href="#linearGradient8148" gradientUnits="userSpaceOnUse" x2="106.26" gradientTransform="translate(-22.118 -21.799)" y1="136.25" x1="107.39" inkscape:collect="always"/>
+    <linearGradient id="linearGradient9174" y2="154.3" xlink:href="#linearGradient7144" gradientUnits="userSpaceOnUse" x2="134.56" gradientTransform="translate(-22.118 -21.799)" y1="82.104" x1="81.779" inkscape:collect="always"/>
+    <linearGradient id="linearGradient9177" y2="98.218" xlink:href="#linearGradient7144" gradientUnits="userSpaceOnUse" x2="62.828" gradientTransform="translate(-22.118 -21.799)" y1="97.321" x1="59.666" inkscape:collect="always"/>
+  </defs>
+  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer" transform="translate(-22.269 -20.463)">
+    <path id="path4189" sodipodi:nodetypes="ccccc" style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#linearGradient9177)" d="m55.76 23.935c-2.053-0.205-2.916 3.207-4.162 6.355l-25.938 83.93 5.341 3.14 24.759-93.425z"/>
+    <path id="path3206" sodipodi:nodetypes="ccccccc" style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#linearGradient9174)" d="m29.901 109.39c-4.816-0.41-6.508 12.96-2.998 13.72l85.247 8.89 17.35-88.172-14.43-1.967-13.25 68.909-71.919-1.38z"/>
+    <path id="path5162" sodipodi:nodetypes="cccc" style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#linearGradient9171)" d="m104.31 114.26l-72.679-6.17c-3.682 0.01-6.16 12.41-3.277 12.99l81.346 7.73"/>
+    <path id="path6139" sodipodi:nodetypes="ccccc" style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#linearGradient9168)" d="m126.03 45.556l-16.88 83.004c-4.03-1.55-6.76-10.51-4.2-14.17l16.6-83.31c-1.24 3.888 1.31 13.362 4.48 14.476z"/>
+    <path id="path4187" style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#linearGradient9165)" d="m107.32 117.17l-77.623-7.78 26.009-85.404 69.014 4.916-17.4 88.268z"/>
+    <path id="path3214" sodipodi:nodetypes="ccccc" style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#linearGradient9162)" d="m64.316 33.137l43.664 3.255-5.69 28.898-44.558-4.117 6.584-28.036z"/>
+  </g>
+  <metadata>
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/>
+        <dc:publisher>
+          <cc:Agent rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title>Book</dc:title>
+        <dc:date>2007-12-03T18:49:27</dc:date>
+        <dc:description>A simple SVG book based on a drawing made on Gimp by Sam Switzer.</dc:description>
+        <dc:source>https://openclipart.org/detail/9358/book-by-crazyterabyte</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>CrazyTerabyte</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>book</rdf:li>
+            <rdf:li>how i did it</rdf:li>
+            <rdf:li>remix</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/shop/cosmetics.svg
===================================================================
--- /trunk/images/presets/shop/cosmetics.svg	(revision 10565)
+++ /trunk/images/presets/shop/cosmetics.svg	(revision 10565)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4149"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shop__cosmetics13.svg">
+  <defs
+     id="defs4151" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="37.830213"
+     inkscape:cx="1.0303849"
+     inkscape:cy="5.3991722"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="false"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4697" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4154">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       rx="0"
+       ry="0"
+       y="1045.8622"
+       x="8"
+       height="3"
+       width="6"
+       id="rect4168"
+       style="opacity:1;fill:#9955ff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1" />
+    <path
+       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3.9999999,1036.6354 c 0,-1 -2.99999995,1.0175 -2.99999995,1.6882 l 0,5.3118 2.99999995,0 z"
+       id="path4138"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="opacity:1;fill:#808080;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1"
+       id="rect4136"
+       width="5"
+       height="9"
+       x="0"
+       y="1043.3622"
+       ry="1.0000174"
+       rx="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.5,1052.3622 0,-8"
+       id="path4147"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff8080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1.9999999,1043.3622 0,-5"
+       id="path4151"
+       inkscape:connector-curvature="0" />
+    <rect
+       rx="0"
+       ry="1.0000174"
+       y="1047.3622"
+       x="6"
+       height="4.9999828"
+       width="10"
+       id="rect4164"
+       style="opacity:1;fill:#6600ff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#ac9393;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1"
+       id="rect4166"
+       width="8"
+       height="2.999974"
+       x="7"
+       y="1043.3622"
+       ry="1.0000174"
+       rx="1.0000174" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4170"
+       d="m 7.5,1052.3622 0,-5"
+       style="fill:none;fill-rule:evenodd;stroke:#b380ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#c8b7b7;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.5,1046.3621 0,-2.9999"
+       id="path4172"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/funeral_directors.svg
===================================================================
--- /trunk/images/presets/shop/funeral_directors.svg	(revision 10565)
+++ /trunk/images/presets/shop/funeral_directors.svg	(revision 10565)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="256.07199"
+   height="469.72971"
+   id="svg3804"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 3">
+  <defs
+     id="defs3806" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="71.607432"
+     inkscape:cy="137.722"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3809">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-303.39257,-200.35447)">
+    <polygon
+       points="418.036,148.533 354.019,551.617 225.982,551.617 161.964,148.533 225.982,37.65 354.019,37.65 "
+       id="polygon24"
+       style="fill:#8c5a26;fill-opacity:1"
+       transform="matrix(0.99999999,0,0,0.9139297,141.42857,165.94502)" />
+    <g
+       style="fill:#8c5a26;fill-opacity:1"
+       id="g3779"
+       transform="matrix(0.99999999,0,0,1.1933524,141.42857,123.35707)">
+      <g
+         id="g3783"
+         transform="matrix(1.356333,0,0,1.239353,-103.33701,-48.708368)">
+        <line
+           stroke-miterlimit="10"
+           x1="290"
+           y1="130.5"
+           x2="290"
+           y2="276.5"
+           id="line26"
+           style="fill:#8c5a26;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-miterlimit:10" />
+        <line
+           stroke-miterlimit="10"
+           x1="244"
+           y1="178.5"
+           x2="336"
+           y2="178.5"
+           id="line28"
+           style="fill:#8c5a26;fill-opacity:1;stroke:#000000;stroke-width:20;stroke-linecap:round;stroke-miterlimit:10" />
+      </g>
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/shop/groceries/coffee.svg
===================================================================
--- /trunk/images/presets/shop/groceries/coffee.svg	(revision 10565)
+++ /trunk/images/presets/shop/groceries/coffee.svg	(revision 10565)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="266.52423"
+   height="205.57681"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="coffee2.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994948"
+     inkscape:cx="305.99405"
+     inkscape:cy="-18.294276"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-160.43655,-316.06227)">
+    <path
+       d="m 420.05104,354.5316 c 0.7668,1.88867 1.41254,3.81917 1.93829,5.82231 11.21672,42.73418 -37.88157,95.04943 -109.66306,116.83446 -69.96881,21.23479 -135.65534,5.62648 -149.31657,-34.7531 0.0102,0.89792 0.0204,1.77564 0.0631,2.67329 14.1037,52.83142 65.60441,87.41561 140.65699,73.40214 75.05191,-14.00912 118.60766,-61.92749 122.72028,-116.85622 1.32812,-17.74991 0.35555,-33.8411 -6.39736,-47.12163 z"
+       style="color:#000000;fill:#330000"
+       id="path20021"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+    <path
+       d="m 423.70128,363.48491 c 11.29074,42.73349 -38.13076,95.03528 -110.38553,116.82024 -72.25477,21.78494 -139.98196,4.80294 -151.27252,-37.92986 -11.29074,-42.73349 38.13076,-95.03528 110.38553,-116.82023 72.25477,-21.78494 139.98196,-4.80294 151.27252,37.92985 z"
+       style="color:#000000;fill:#5c2610"
+       id="path20019"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+    <path
+       d="m 377.63541,328.25908 c -7.44343,19.80662 -12.73283,35.52156 -30.16735,44.15221 -18.9608,9.38604 -40.077,11.70809 -60.57358,14.17658 -29.53757,3.55738 -61.1518,4.18621 -87.09795,21.09704 -16.44504,10.71781 -22.2285,39.50377 -18.14438,53.52666 2.91718,-10.28354 17.15559,-26.98878 28.60713,-34.94377 12.49463,-8.67994 27.98889,-10.45827 42.56289,-11.84728 30.89012,-2.94465 63.23797,-1.42666 92.0453,-15.74976 14.11932,-7.02035 25.41816,-17.94927 32.11847,-32.11787 5.06348,-10.70765 6.65186,-27.15264 0.65137,-38.29309 z"
+       id="path20038"
+       inkscape:connector-curvature="0"
+       style="fill:#330000;fill-rule:evenodd"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+    <path
+       d="m 377.63541,327.80961 c -7.44343,19.80661 -12.74437,35.52445 -30.17889,44.15437 -18.9608,9.38606 -40.07292,11.71317 -60.56951,14.18238 -29.53756,3.55738 -61.15315,4.18114 -87.09794,21.09199 -16.44505,10.71779 -22.21697,39.51028 -18.13285,53.5339 0.0143,-0.0507 0.0278,-0.10765 0.0421,-0.15854 -0.87363,-15.50037 5.48043,-38.14955 19.53222,-47.48486 26.21354,-17.41497 58.15013,-18.06309 87.99376,-21.72631 20.70629,-2.54221 42.02947,-4.92379 61.18437,-14.58981 16.9011,-8.52842 22.51489,-23.82651 29.58507,-43.06694 -0.5964,-2.08795 -1.35941,-4.08892 -2.3541,-5.93568 z"
+       id="path20042"
+       inkscape:connector-curvature="0"
+       style="fill:#973f1a;fill-opacity:1;fill-rule:evenodd"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+    <path
+       d="m 424.39439,366.40644 c -2.46363,40.83191 -50.80441,85.53797 -117.80685,105.54687 -49.12679,14.67317 -96.25971,12.49322 -126.69717,-2.89985 27.08357,22.06776 78.98808,27.66083 133.46331,11.23687 C 383.974,458.99827 432.76215,408.57299 424.3944,366.40644 z"
+       style="color:#000000;fill:#973f1b;fill-opacity:1"
+       id="path20047"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+    <path
+       d="m 210.8911,467.46579 c -6.22525,-7.41561 -4.92421,-21.93582 1.8268,-29.0136 17.31914,-18.15806 49.9975,-5.41246 74.88902,-8.99456 19.50237,-2.80705 53.30185,-14.5311 58.30147,-9.78913 8.28971,7.86219 -30.16803,36.64887 -50.89332,46.86066 -11.42033,5.62719 -24.90849,6.19731 -37.61757,6.53151 -15.63203,0.41104 -36.56363,6.24727 -46.50382,-5.59415 z"
+       id="path20052"
+       inkscape:connector-curvature="0"
+       style="fill:#773215;fill-opacity:1"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+    <path
+       d="m 348.86065,333.45704 c 6.354,6.99434 5.30107,20.78241 -1.33076,27.54555 -17.01308,17.35046 -49.91946,5.48164 -74.7533,9.05331 -19.45961,2.79848 -53.06907,14.15772 -58.15081,9.6927 -8.42679,-7.40329 29.5491,-34.98654 50.10609,-44.82062 11.32735,-5.41886 24.81009,-6.05312 37.51713,-6.45801 15.62931,-0.49804 36.46726,-6.181 46.61308,4.98743 z"
+       id="path20054"
+       inkscape:connector-curvature="0"
+       style="fill:#773215;fill-opacity:1"
+       inkscape:export-xdpi="5.4028859"
+       inkscape:export-ydpi="5.4028859" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/groceries/tea.svg
===================================================================
--- /trunk/images/presets/shop/groceries/tea.svg	(revision 10565)
+++ /trunk/images/presets/shop/groceries/tea.svg	(revision 10565)
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="15.98718"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="teabag icon.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="5.5112528"
+     inkscape:cy="8.7749291"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-370px"
+       originy="-419px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-370,-617.375)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 377,622.36218 2,-2 5,0 2,2 0,11 -9,0 z"
+       id="path2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       style="fill:#cccccc;fill-opacity:1;stroke:none"
+       d="m 378,632.36218 0,-9 2,-2 3,0 2,2 0,9 z"
+       id="path4221"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       style="fill:none;stroke:#4f4f4f;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 379.4917,621.85388 1,1 2,0 1,-1"
+       id="path4223"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 381.5,621.86218 0,-3 -1,-1 -6,0 -2,2 0,4 0,0"
+       id="path4382"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <rect
+       style="fill:#008000;fill-opacity:1;stroke:none"
+       id="rect4227"
+       width="5"
+       height="5.0000086"
+       x="370"
+       y="624.36218"
+       ry="1"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(1,-1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-1"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(1,0)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-7"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-1,0)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-4"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(2,-1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-0"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(3,-1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-9"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(3,0)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-48"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(2,0)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-8"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(2,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-2"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(1,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-45"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(0,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-5"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-1,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-17"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-2,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-11"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(3,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-52"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-2,0)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(4,0)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-14"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(4,1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-23"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-2,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-8"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-1,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-9"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(0,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-2"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(1,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-7"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(2,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-95"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(3,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-4"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(4,2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-3"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(0,-1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-34"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(-1,-1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-1"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(1,-2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-13"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(3,-2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-87"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(2,-2)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-42"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+    <path
+       transform="translate(4,-1)"
+       sodipodi:type="arc"
+       style="fill:#75750b;fill-opacity:1;stroke:none"
+       id="path4229-76-77"
+       sodipodi:cx="380.5"
+       sodipodi:cy="629.86218"
+       sodipodi:rx="0.5"
+       sodipodi:ry="0.5"
+       d="m 381,629.86218 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z"
+       inkscape:export-xdpi="89"
+       inkscape:export-ydpi="89" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/hifi.svg
===================================================================
--- /trunk/images/presets/shop/hifi.svg	(revision 10565)
+++ /trunk/images/presets/shop/hifi.svg	(revision 10565)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="hifi5.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="3.614034"
+     inkscape:cy="11.157564"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#a05a2c;fill-opacity:1;stroke:#000000;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4309"
+       width="11.000002"
+       height="14.999961"
+       x="0.49999943"
+       y="1036.8621"
+       ry="1.5000397" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4311"
+       cx="6.0000005"
+       cy="1046.3621"
+       rx="4.0000005"
+       ry="4.0000105" />
+    <ellipse
+       cy="1046.3621"
+       cx="6.0000005"
+       id="circle4313"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       rx="1.1428109"
+       ry="1.1428138" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4311-0"
+       cx="6.0000005"
+       cy="1039.3621"
+       rx="2.0000005"
+       ry="2.0000002" />
+    <circle
+       cy="1039.3621"
+       cx="6.0000005"
+       id="circle4313-4"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       r="0.57140547" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/houseware.svg
===================================================================
--- /trunk/images/presets/shop/houseware.svg	(revision 10565)
+++ /trunk/images/presets/shop/houseware.svg	(revision 10565)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4149"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shop__houseware8.svg">
+  <defs
+     id="defs4151" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="7.1507864"
+     inkscape:cy="6.430812"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="false"
+     inkscape:snap-page="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4697" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4154">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1"
+       id="rect4352"
+       width="16"
+       height="16"
+       x="0"
+       y="1036.3622"
+       ry="2.0000174" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#da0092;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 7.5,1037.3613 c -1.9270768,0 -3.5,1.5729 -3.5,3.5 0,1.9271 1.5729232,3.5 3.5,3.5 1.9270768,0 3.5,-1.5729 3.5,-3.5 0,-1.9271 -1.5729232,-3.5 -3.5,-3.5 z"
+       id="path4144"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssss" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 7.5007686,1039.148 0,1.7135 1.5383171,0.7158"
+       id="path4146"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#da0092;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 12.492188,1037.3173 A 0.50004994,0.50004994 0 0 0 12,1037.8231 l 0,7.5391 -1,0 -1,6 5,0 -1,-6 -1,0 0,-7.5391 a 0.50004994,0.50004994 0 0 0 -0.507812,-0.5058 z"
+       id="path4167"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#da0092;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 1,1044.3722 1,1.99 -1,5.0022 4,0 -1,-5.0022 0.5022826,-1 0.4977174,0 0,2 1,0 0,-3 z"
+       id="path4340"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/interior_decoration.svg
===================================================================
--- /trunk/images/presets/shop/interior_decoration.svg	(revision 10565)
+++ /trunk/images/presets/shop/interior_decoration.svg	(revision 10565)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="577.45197"
+   height="577.45203"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="interior_decoration.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="128.7269"
+     inkscape:cy="325.22028"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3868"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-43.206071px"
+       originy="-214.13132px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-43.206071,-260.77882)">
+    <g
+       id="Layer_2"
+       transform="matrix(1.0017469,0,0,1.0000008,41.499094,259.07437)"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-xdpi="2.49807"
+       inkscape:export-ydpi="2.49807">
+      <g
+         id="g1327"
+         style="fill:#ffffff;fill-opacity:1;stroke:none">
+        <path
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           inkscape:connector-curvature="0"
+           id="path1329"
+           d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.895,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.315 62.229,-62.229 V 66.804 c 0,-42.601 -20.923,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" />
+      </g>
+    </g>
+    <g
+       style="display:none"
+       id="svg2-1"
+       sodipodi:version="0.32"
+       inkscape:version="0.46"
+       sodipodi:docbase="s:\Data\FacilityIcons"
+       sodipodi:docname="amenity_atm.svg"
+       inkscape:output_extension="org.inkscape.output.svg.inkscape"
+       display="none"
+       transform="translate(41.502071,259.07482)">
+      <sodipodi:namedview
+         id="base-7"
+         bordercolor="#666666"
+         pagecolor="#ffffff"
+         inkscape:zoom="1.3034483"
+         inkscape:cx="285.84646"
+         inkscape:cy="302.63451"
+         showgrid="false"
+         guidetolerance="10.0"
+         gridtolerance="10.0"
+         objecttolerance="10.0"
+         borderopacity="1.0"
+         inkscape:window-height="1005"
+         inkscape:pageshadow="2"
+         inkscape:pageopacity="0.0"
+         inkscape:window-width="1280"
+         inkscape:window-x="0"
+         inkscape:window-y="0"
+         inkscape:current-layer="svg2" />
+      <defs
+         display="inline"
+         id="defs2992">
+        <inkscape:perspective
+           id="perspective2441"
+           sodipodi:type="inkscape:persp3d"
+           inkscape:vp_x="0 : 290 : 1"
+           inkscape:vp_y="0 : 1000 : 0"
+           inkscape:vp_z="580 : 290 : 1"
+           inkscape:persp3d-origin="290 : 193.33333 : 1" />
+      </defs>
+      <path
+         style="opacity:0.75;fill:#ffffff;stroke:#ffffff;stroke-width:35.84500122;stroke-linecap:round;stroke-linejoin:round;display:inline"
+         inkscape:connector-curvature="0"
+         id="rect3241"
+         sodipodi:nodetypes="ccccccccc"
+         display="inline"
+         enable-background="new    "
+         d="m 103.979,82.413 v 62.924 h 112.403 c 7.778,-20.622 12.715,-34.171 13.042,-36.067 l 190.991,-1.647 14.588,37.714 h 69.613 V 82.413 H 103.979 z" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:20;stroke-linejoin:round;display:inline"
+         inkscape:connector-curvature="0"
+         id="path2443"
+         sodipodi:nodetypes="ccccccc"
+         display="inline"
+         d="m 227.906,158.094 -40.375,0.375 C 185.928,167.765 65.218,517.094 65.218,517.094 l 403.813,-3.406 -15.594,-40.313 -333.094,2.844 c 10e-4,0 75.095,-232.387 107.563,-318.125 z" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:20;stroke-linejoin:round;display:inline"
+         inkscape:connector-curvature="0"
+         id="path3243"
+         sodipodi:nodetypes="ccccc"
+         display="inline"
+         d="m 242.694,117.588 c -1.603,9.296 -122.338,358.618 -122.338,358.618 l 403.838,-3.412 -122.542,-356.725 -158.958,1.519 z" />
+      <path
+         style="opacity:0.1;fill:#ffffff;stroke:#ffffff;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;display:inline"
+         inkscape:connector-curvature="0"
+         id="path3163"
+         sodipodi:nodetypes="ccccc"
+         display="inline"
+         enable-background="new    "
+         d="m 242.694,117.588 c -1.603,9.296 -122.338,358.618 -122.338,358.618 l 403.838,-3.412 -122.542,-356.725 -158.958,1.519 z" />
+      <path
+         style="opacity:0.1;fill:#ffffff;stroke:#ffffff;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;display:inline"
+         inkscape:connector-curvature="0"
+         id="path3165"
+         sodipodi:nodetypes="ccccccc"
+         display="inline"
+         enable-background="new    "
+         d="m 227.906,158.094 -40.375,0.375 C 185.928,167.765 65.218,517.094 65.218,517.094 l 403.813,-3.406 -15.594,-40.313 -333.094,2.844 c 10e-4,0 75.095,-232.387 107.563,-318.125 z" />
+      <g
+         style="display:inline"
+         id="g4372"
+         transform="translate(-130.0802,122.26983)"
+         display="inline" />
+      <g
+         style="display:inline"
+         id="g4998"
+         transform="translate(-133.14896,123.86039)"
+         display="inline">
+        <g
+           id="g5004">
+          <path
+             style="fill:#ffffff"
+             inkscape:connector-curvature="0"
+             id="text2413"
+             d="m 465.402,153.84 c 0.229,0.097 1.086,0.291 2.572,0.581 23.434,3.872 41.037,10.938 52.811,21.199 11.773,10.26 17.661,23.715 17.661,40.364 0,17.036 -6.459,31.798 -19.376,44.285 -12.917,12.487 -30.807,19.263 -53.669,20.327 v 26.426 h -18.347 v -26.135 c -23.32,-2.227 -41.209,-8.64 -53.669,-19.238 -12.46,-10.6 -19.49,-25.434 -21.09,-44.504 l 30.864,-4.646 c 2.4,14.326 7.259,25.36 14.575,33.104 7.315,7.744 17.089,12.148 29.321,13.213 V 175.62 c -23.205,-4.26 -40.581,-11.374 -52.126,-21.344 -11.545,-9.97 -17.318,-22.795 -17.318,-38.477 0,-15.584 5.716,-28.966 17.147,-40.146 11.431,-11.18 28.863,-17.641 52.297,-19.384 V 43.782 h 18.347 v 12.487 c 19.433,1.646 34.75,6.873 45.953,15.681 11.202,8.809 18.232,21.15 21.091,37.025 l -32.064,3.92 c -1.829,-9.873 -5.659,-17.689 -11.488,-23.449 -5.83,-5.759 -13.66,-9.462 -23.491,-11.107 v 75.501 z m -18.347,-3.194 V 78.048 c -12.46,1.839 -22.006,6.074 -28.635,12.705 -6.63,6.631 -9.945,14.302 -9.945,23.014 0,9.971 3.429,17.835 10.288,23.595 6.859,5.758 16.289,10.187 28.292,13.284 l 0,0 z m 18.347,108.171 c 12.003,-1.549 21.891,-5.977 29.664,-13.285 7.772,-7.309 11.659,-16.528 11.659,-27.66 0,-9.776 -2.943,-17.641 -8.83,-23.594 -5.888,-5.953 -16.719,-11.012 -32.493,-15.174 v 79.713 z" />
+        </g>
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:30;stroke-linecap:round;stroke-linejoin:round"
+           inkscape:connector-curvature="0"
+           id="path4370"
+           sodipodi:nodetypes="cc"
+           d="M 455.376,43.427 V 308.47" />
+      </g>
+    </g>
+    <polygon
+       style="fill:#0066ff"
+       points="57.166,279.626 97.878,125.442 206.176,125.442 249.896,279.626 "
+       id="polygon3008"
+       transform="matrix(0.97903483,0,0,1.0576771,60.700564,227.59602)"
+       inkscape:export-xdpi="2.49807"
+       inkscape:export-ydpi="2.49807" />
+    <rect
+       style="fill:#0066ff"
+       x="194.83911"
+       y="494.229"
+       width="32.347313"
+       height="289.26938"
+       id="rect3010"
+       inkscape:export-xdpi="2.49807"
+       inkscape:export-ydpi="2.49807" />
+    <path
+       style="fill:#0066ff"
+       inkscape:connector-curvature="0"
+       d="m 311.84154,794.1746 c 0,5.89761 -44.24227,10.6762 -98.80881,10.6762 -54.56488,0 -98.80716,-4.77859 -98.80716,-10.6762 0,-5.8976 44.24228,-10.67619 98.80716,-10.67619 54.56654,0 98.80881,4.77753 98.80881,10.67619 z"
+       id="path3012"
+       inkscape:export-xdpi="2.49807"
+       inkscape:export-ydpi="2.49807" />
+    <g
+       id="g3014"
+       transform="matrix(0.93837554,0,0,0.88379798,76.599274,280.78345)"
+       style="fill:#8e3900;fill-opacity:1"
+       inkscape:export-xdpi="2.49807"
+       inkscape:export-ydpi="2.49807">
+      <polygon
+         id="polygon3016"
+         points="307.59,304.929 347.187,261.638 347.187,111.886 307.59,68.593 "
+         style="fill:#8e3900;fill-opacity:1" />
+      <polygon
+         id="polygon3018"
+         points="531.824,65.115 312.54,65.115 350.953,107.113 493.411,107.113 "
+         style="fill:#8e3900;fill-opacity:1" />
+      <polygon
+         id="polygon3020"
+         points="531.929,308.521 493.515,266.523 350.849,266.523 312.436,308.521 "
+         style="fill:#8e3900;fill-opacity:1" />
+      <polygon
+         id="polygon3022"
+         points="537.079,68.26 497.482,111.553 497.482,261.972 537.079,305.264 "
+         style="fill:#8e3900;fill-opacity:1" />
+    </g>
+    <path
+       id="path3024"
+       d="m 547.76931,627.02952 0.78659,-0.77959 H 372.75132 l 0.78659,0.77959 34.78756,34.47766 8.52803,8.45207 c 0,0 -79.14226,72.88438 -21.14488,119.37073 11.97284,9.59688 25.2337,15.22281 38.73863,18.122 8.7274,1.87291 17.55509,2.60579 26.20636,2.52556 8.65128,0.079 17.48017,-0.65265 26.20636,-2.52556 13.50494,-2.89919 26.76459,-8.52512 38.73863,-18.122 57.99739,-46.48516 -21.14488,-119.37073 -21.14488,-119.37073 l 8.52803,-8.45207 34.78756,-34.47766 z"
+       inkscape:connector-curvature="0"
+       style="fill:#677821"
+       inkscape:export-xdpi="2.49807"
+       inkscape:export-ydpi="2.49807" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/medical_supply.svg
===================================================================
--- /trunk/images/presets/shop/medical_supply.svg	(revision 10565)
+++ /trunk/images/presets/shop/medical_supply.svg	(revision 10565)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg6468"
+   sodipodi:docname="01.svg"
+   viewBox="0 0 152.92334 167.08995"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs23" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     pagecolor="#ffffff"
+     inkscape:window-height="988"
+     inkscape:window-maximized="1"
+     inkscape:zoom="1.979899"
+     inkscape:window-x="-8"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="30.696583"
+     inkscape:cy="57.254658"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-230.68626,-140.30165)">
+    <g
+       id="g3018"
+       transform="matrix(1.1504598,0,0,0.99998798,-37.904711,3.7907454)">
+      <path
+         id="path11-4-4"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsccccccc"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:0.02663;stroke-miterlimit:10"
+         d="m 295.86,136.6 c -2.1037,0.0666 -3.9109,0.24295 -5.4688,0.5625 -3.0358,0.61248 -4.2449,1.6881 -5.6562,3.3125 -1.3848,1.5978 -2.1584,3.6403 -2.5312,6.25 0.86612,1.0264 0.27734,1.7542 6.7749,3.3858 1.0652,-1.4646 2.9222,-2.9597 5.3188,-3.3858 2.4766,-0.47934 5.7566,-0.61929 9.9375,-0.40625 1.2516,-1.8108 1.7177,-3.4335 1.5312,-5.0312 -0.15978,-1.6244 -1.0677,-3.0886 -2.7188,-4.5 -2.7029,-0.18641 -5.0838,-0.25407 -7.1875,-0.1875 z" />
+      <path
+         id="path35-5-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccscccc"
+         style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.029743;stroke-miterlimit:10"
+         d="m 291.28,145.44 c 0.80097,-0.96645 1.0573,-1.85 0.76893,-2.9822 -0.25631,-1.1045 -1.0573,-2.3471 -2.4029,-3.6172 -1.4417,0.60748 -2.6913,1.3254 -3.6204,2.4575 -0.96117,0.99405 -1.5699,2.7889 -2.0825,3.8934 -0.38447,1.1045 -0.67281,1.9329 -0.60874,2.5956 0.76894,0.46941 1.3777,1.0769 1.9544,1.9329 0.5767,0.85598 1.1214,1.8224 1.5058,3.1202 0.19222,-2.5956 -0.43066,-0.57227 0.27419,-1.7872 0.83301,-1.2702 2.8336,-5.7234 4.2112,-5.6129 z" />
+    </g>
+    <path
+       id="path49-5"
+       style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.02856303;stroke-miterlimit:10"
+       sodipodi:nodetypes="cccccscccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 262.3859,193.02037 -10.76382,17.53179 c 0,0 -5.21307,6.17713 -6.77551,11.31686 -1.53265,5.08624 -3.52409,11.98286 -3.95298,19.86476 -0.36763,7.93631 0.85781,19.83877 1.89941,26.97668 1.22454,6.89622 3.12487,10.81087 4.87116,14.61982 1.74628,3.80726 3.37004,6.09813 5.36137,8.09461 2.17598,1.89137 4.74864,2.82266 6.77069,3.40856 1.93093,0.45269 3.36992,0.37279 4.90176,-0.1332 1.65436,-0.5325 3.27893,-1.41128 4.87208,-2.74277 l 9.16031,0.61249 c -1.34799,1.97058 -3.2466,3.78056 -5.36137,5.32514 -2.14538,1.59768 -4.62692,3.14226 -7.56715,4.02175 -2.91136,0.74559 -6.28128,1.91728 -9.77293,0.63909 -3.43125,-1.41138 -7.41402,-4.66084 -10.75335,-8.70779 -3.2474,-4.10095 -6.22007,-8.89349 -8.54757,-15.71181 -2.23649,-7.00352 -4.22863,-16.6958 -4.65752,-25.4837 -0.27573,-8.84099 1.40931,-19.67876 2.69599,-26.97667 1.37859,-7.32231 3.55469,-12.22186 5.36218,-16.5638 1.93012,-4.34055 3.61428,-7.08342 5.88138,-9.34689 2.29862,-2.31607 7.57083,-4.94364 10.42006,-5.60943 l 5.95593,-1.13639 z" />
+    <g
+       id="g6431"
+       transform="matrix(1.1504598,0,0,0.99998798,-737.67433,-832.4473)">
+      <path
+         id="path47-0-8-2"
+         d="m 874.02,1078.6 c 0,5.2616 -2.3039,9.5238 -5.1838,9.5238 -2.8415,0 -5.1454,-4.2622 -5.1454,-9.5238 0,-5.2606 2.3039,-9.5228 5.1454,-9.5228 2.8799,0 5.1838,4.2622 5.1838,9.5228 z"
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.038398;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path47-6-1"
+         d="m 872.43,1077.9 c 0,3.649 -1.5978,6.6049 -3.595,6.6049 -1.9706,0 -3.5684,-2.9559 -3.5684,-6.6049 0,-3.6483 1.5978,-6.6042 3.5684,-6.6042 1.9972,0 3.595,2.9559 3.595,6.6042 z"
+         style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.02663;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path45-8-2-2"
+         d="m 884.03,1073.3 c 0.0607,11.133 -0.63662,25.628 -4.8286,38.409 -3.9663,13.759 -14.287,18.432 -22.196,0.4703 -4.8128,-22.449 -6.6817,-36.161 -0.49824,-57.782 4.6922,-13.588 11.934,-15.805 17.27,-12.32 2.8848,5.4393 6.9068,8.8085 10.254,31.222 z m 5.5912,-29.99 c 2.573,5.9868 4.5946,12.981 5.6054,20.003 1.0414,6.8533 1.164,13.456 0.49008,21.205 -0.55134,7.778 -1.7459,17.402 -4.1657,24.982 -2.4811,7.5255 -6.2179,15.191 -10.506,19.863 -4.1351,4.5321 -9.1741,6.2636 -13.891,6.0957 -4.6558,-0.2797 -8.554,-3.218 -12.873,-8.8123 -4.2882,-5.763 -8.0183,-16.314 -10.53,-26.33 -2.3892,-10.126 -2.2904,-24.454 -1.4021,-35.784 1.072,-11.442 4.0507,-21.895 8.5533,-29.756 3.3012,-5.0833 8.8928,-10.598 14.529,-11.856 5.7585,-1.1749 10.713,1.2552 14.879,4.9759 4.1657,3.6928 6.8306,9.3719 9.3116,15.415 z"
+         sodipodi:nodetypes="cccccccccccccccccccc"
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.029273;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path45-4-0"
+         d="m 882.26,1054.2 c 1.5712,4.9531 2.3434,9.134 2.7162,15.712 0.37282,6.5775 0.23967,16.244 -0.39944,23.248 -0.47933,6.8438 -1.0386,12.516 -2.9026,17.842 -1.8641,5.326 -5.1662,11.211 -8.1487,13.768 -2.876,2.4225 -5.9917,2.7421 -9.0274,0.8514 -2.9559,-2.0231 -6.3378,-5.7513 -8.7079,-12.729 -2.2103,-7.1634 -4.6602,-19.2 -4.8732,-29.319 -0.13315,-10.226 1.225,-22.662 3.7814,-30.731 2.6896,-8.0688 8.0422,-14.753 11.637,-16.883 3.595,-2.1304 6.8704,1.4113 9.5068,4.4738 2.7428,3.0897 4.8466,8.7352 6.4177,13.768 z m 5.6188,-8.7878 c 2.2369,5.6988 3.9944,12.356 4.8732,19.04 0.90541,6.5236 1.0119,12.808 0.42607,20.185 -0.47933,7.4037 -1.5179,16.564 -3.6216,23.78 -2.157,7.1634 -5.4058,14.46 -9.134,18.907 -3.595,4.314 -8.415,7.1641 -12.516,7.0043 -4.0477,-0.2663 -8.0954,-3.0631 -11.85,-8.3883 -3.7282,-5.4857 -8.0688,-14.327 -10.252,-23.861 -2.0771,-9.6392 -3.089,-22.316 -2.3168,-33.101 0.93203,-10.892 3.3021,-23.726 7.2166,-31.209 3.9678,-7.4829 11.025,-11.77 15.925,-12.969 5.0064,-1.1184 9.5334,2.3967 13.155,5.9384 3.6216,3.5151 5.9384,8.9209 8.0954,14.673 z"
+         style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.02663;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       id="path11-4"
+       style="fill-rule:evenodd;stroke:#000000;stroke-width:0.02856303;stroke-miterlimit:10"
+       sodipodi:nodetypes="ccsccccccccccc"
+       inkscape:connector-curvature="0"
+       d="m 358.9555,144.08096 c -2.42022,0.0666 -4.49933,0.24295 -6.29163,0.56249 -3.49257,0.61247 -4.88359,1.68808 -6.50723,3.31246 -1.59316,1.59778 -2.48316,3.64026 -2.91205,6.24993 -18.58683,2.12037 -41.67771,4.00235 -56.70501,-4.19835 2.245,65.13521 7.85879,74.6071 -42.17241,105.91872 8.0806,0.14466 59.59727,8.4454 73.26934,6.61062 48.26984,-15.16281 32.70872,-50.21239 32.33022,-99.95679 0.24509,-2.87597 0.60277,-4.70435 1.79759,-6.06243 1.22547,-1.46458 2.63548,-1.88638 5.39278,-2.31247 2.84923,-0.47934 6.62274,-0.61929 11.4327,-0.40625 1.43991,-1.81078 1.97614,-3.43346 1.76158,-5.03114 -0.18382,-1.62438 -1.22834,-3.08856 -3.12787,-4.49994 -3.10958,-0.18641 -5.84871,-0.25407 -8.26893,-0.1875 z" />
+    <path
+       id="path35-5"
+       style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.031902;stroke-miterlimit:10"
+       inkscape:connector-curvature="0"
+       d="m 353.6864,152.92085 c 0.92148,-0.96644 1.21638,-1.84998 0.88462,-2.98216 -0.29488,-1.10449 -1.21638,-2.34707 -2.76444,-3.61716 -1.65862,0.60747 -3.09623,1.32539 -4.16513,2.45747 -1.10578,0.99404 -1.8061,2.78887 -2.39583,3.89336 -0.44232,1.10448 -0.77404,1.93287 -0.70033,2.59556 0.88463,0.46941 1.58499,1.07689 2.24846,1.93288 0.66347,0.85597 1.29012,1.82238 1.73236,3.12016 0.22114,-2.59557 0.73718,-4.50074 1.54806,-5.71573 0.95834,-1.27018 2.02723,-1.79478 3.61221,-1.68438 z" />
+    <g
+       id="g6437"
+       transform="matrix(1.1504598,0,0,0.99998798,-737.67433,-830.44733)">
+      <path
+         id="path47-0-9"
+         d="m 956.47,1083.6 c 0,5.2617 -2.3039,9.5239 -5.1838,9.5239 -2.8415,0 -5.1454,-4.2622 -5.1454,-9.5239 0,-5.2606 2.3039,-9.5228 5.1454,-9.5228 2.8799,0 5.1838,4.2622 5.1838,9.5228 z"
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.038398;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path47-3"
+         d="m 954.88,1083 c 0,3.649 -1.5978,6.6049 -3.595,6.6049 -1.9706,0 -3.5684,-2.9559 -3.5684,-6.6049 0,-3.6483 1.5978,-6.6041 3.5684,-6.6041 1.9972,0 3.595,2.9558 3.595,6.6041 z"
+         style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.02663;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path45-8-7"
+         d="m 962.48,1073.1 c 0.0607,11.133 -0.63662,26.89 -4.8286,39.672 -3.9663,13.759 -14.287,18.432 -22.196,0.4703 -4.8128,-22.449 -6.6817,-36.161 -0.49824,-57.782 4.6922,-13.588 11.934,-15.805 17.27,-12.32 2.8848,5.4393 7.1593,8.3034 10.254,29.96 z m 5.5912,-28.728 c 2.573,5.9868 4.5946,12.981 5.6054,20.003 1.0414,6.8533 1.164,13.456 0.49008,21.205 -0.55134,7.778 -1.7459,17.402 -4.1657,24.982 -2.4811,7.5254 -6.2179,15.191 -10.506,19.863 -4.1351,4.532 -9.6792,7.5262 -14.396,7.3584 -4.6558,-0.2798 -9.3116,-3.218 -13.63,-8.8124 -4.2882,-5.763 -8.031,-15.944 -10.543,-25.96 -2.3892,-10.126 -2.8388,-22.908 -1.9505,-34.238 1.072,-11.442 3.7981,-24.926 8.3008,-32.787 4.5639,-7.8612 10.717,-12.008 16.353,-13.267 5.7585,-1.175 10.966,2.5178 15.131,6.2386 4.1657,3.6928 6.8306,9.3718 9.3116,15.415 z"
+         sodipodi:nodetypes="cccccccccccccccccccc"
+         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.029273;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path45-0"
+         sodipodi:nodetypes="cscscccccsccccccccccccccccc"
+         d="m 960.71,1055.2 c 1.5712,4.9532 3.101,9.134 3.4738,15.712 0.37282,6.5776 0.23967,16.244 -0.39944,23.248 -0.47933,6.8438 -1.7962,12.516 -3.6602,17.842 -1.8641,5.3259 -5.1662,11.211 -8.1487,13.768 -2.876,2.4226 -5.9917,2.7421 -9.0274,0.8514 -2.9559,-2.0231 -6.3378,-5.7513 -8.7079,-12.729 -2.2103,-7.1633 -4.6602,-19.2 -4.8732,-29.319 -0.13315,-10.226 1.225,-22.662 3.7814,-30.731 2.6896,-8.0688 8.0422,-14.753 11.637,-16.883 3.595,-2.1304 6.8704,1.4114 9.5068,4.4738 2.7428,3.0898 4.8466,8.7352 6.4177,13.768 z m 5.6188,-8.7877 c 2.2369,5.6987 3.9944,12.356 4.8732,19.04 0.90541,6.5235 1.0119,12.808 0.42607,20.184 -0.47933,7.4038 -1.5179,16.564 -3.6216,23.78 -2.157,7.1633 -5.4058,14.46 -9.134,18.907 -3.595,4.314 -8.415,7.1641 -12.516,7.0043 -4.0477,-0.2663 -8.0954,-3.0631 -11.85,-8.3883 -3.7282,-5.4857 -8.0688,-14.327 -10.252,-23.861 -2.0771,-9.6392 -3.089,-22.316 -2.3168,-33.101 0.93203,-10.892 3.3021,-23.726 7.2166,-31.209 3.9678,-7.483 11.025,-11.77 15.925,-12.969 5.0064,-1.1184 9.5334,2.3967 13.155,5.9384 3.6216,3.5151 5.9384,8.921 8.0954,14.673 z"
+         style="fill:#c0c0c0;fill-rule:evenodd;stroke:#000000;stroke-width:0.02663;stroke-miterlimit:10"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2011-03-14T10:50:30</dc:date>
+        <dc:description>Simple wheelchair icon. Based on Gerald_G's &quot;Girl_in_wheelchair&quot;.</dc:description>
+        <dc:source>https://openclipart.org/detail/127375/plain-wheelchair-by-tulvur</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>tulvur</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Gerald G Girl in wheelchair</rdf:li>
+            <rdf:li>plain</rdf:li>
+            <rdf:li>simple</rdf:li>
+            <rdf:li>wheelchair</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/shop/music.svg
===================================================================
--- /trunk/images/presets/shop/music.svg	(revision 10565)
+++ /trunk/images/presets/shop/music.svg	(revision 10565)
@@ -0,0 +1,514 @@
+<?xml version="1.0"?>
+<svg
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    id="svg2"
+    viewBox="0 0 432.28 432.28"
+    version="1.1"
+  >
+  <defs
+      id="defs4"
+    >
+    <linearGradient
+        id="linearGradient4533"
+      >
+      <stop
+          id="stop4535"
+          stop-color="#8eff6d"
+          offset="0"
+      />
+      <stop
+          id="stop4537"
+          stop-color="#9af978"
+          stop-opacity="0"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <linearGradient
+        id="linearGradient3845"
+      >
+      <stop
+          id="stop3903"
+          stop-color="#525252"
+          stop-opacity=".63478"
+          offset="0"
+      />
+      <stop
+          id="stop3849"
+          stop-color="#ececec"
+          stop-opacity=".43478"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <filter
+        id="filter4282"
+        color-interpolation-filters="sRGB"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur4284"
+          stdDeviation="4.055"
+      />
+    </filter
+    >
+    <filter
+        id="filter4360"
+        color-interpolation-filters="sRGB"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur4362"
+          stdDeviation="1.7120313"
+      />
+    </filter
+    >
+    <filter
+        id="filter4492"
+        color-interpolation-filters="sRGB"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur4494"
+          stdDeviation="1.755396"
+      />
+    </filter
+    >
+    <filter
+        id="filter4549"
+        color-interpolation-filters="sRGB"
+      >
+      <feGaussianBlur
+          id="feGaussianBlur4551"
+          stdDeviation="1.8863557"
+      />
+    </filter
+    >
+    <radialGradient
+        id="radialGradient4668"
+        gradientUnits="userSpaceOnUse"
+        cy="323.14"
+        cx="239.83"
+        gradientTransform="matrix(.78775 .45481 -.34925 .60492 163.76 18.588)"
+        r="203.35"
+      >
+      <stop
+          id="stop4511"
+          stop-color="#ff70ff"
+          offset="0"
+      />
+      <stop
+          id="stop4513"
+          stop-color="#ff70ff"
+          stop-opacity="0"
+          offset="1"
+      />
+    </radialGradient
+    >
+    <radialGradient
+        id="radialGradient4698"
+        xlink:href="#linearGradient4533"
+        gradientUnits="userSpaceOnUse"
+        cy="320.81"
+        cx="240.29"
+        gradientTransform="matrix(1.3666 -.36617 .33705 1.2579 -193.58 2.6914)"
+        r="152.3"
+    />
+    <linearGradient
+        id="linearGradient4703"
+        x1="1058.5"
+        spreadMethod="reflect"
+        gradientUnits="userSpaceOnUse"
+        y1="319.44"
+        gradientTransform="translate(-1024.5 -2.566)"
+        x2="1265.8"
+        y2="319.44"
+      >
+      <stop
+          id="stop4306"
+          stop-color="#7eeebc"
+          stop-opacity=".81961"
+          offset="0"
+      />
+      <stop
+          id="stop3834"
+          stop-color="#fdffdc"
+          stop-opacity=".8"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <linearGradient
+        id="linearGradient4706"
+        x1="237.28"
+        xlink:href="#linearGradient3845"
+        spreadMethod="reflect"
+        gradientUnits="userSpaceOnUse"
+        y1="532.97"
+        gradientTransform="matrix(0 1 -1 0 559.35 79.59)"
+        x2="237.28"
+        y2="105.9"
+    />
+    <linearGradient
+        id="linearGradient4709"
+        x1="175.67"
+        xlink:href="#linearGradient3845"
+        spreadMethod="reflect"
+        gradientUnits="userSpaceOnUse"
+        y1="319.44"
+        gradientTransform="matrix(0 1 -1 0 559.35 79.59)"
+        x2="298.9"
+        y2="319.44"
+    />
+    <linearGradient
+        id="linearGradient4713"
+        x1="35.581"
+        xlink:href="#linearGradient4533"
+        gradientUnits="userSpaceOnUse"
+        y1="383.75"
+        gradientTransform="translate(2.629 -2.566)"
+        x2="182.33"
+        y2="383.75"
+    />
+    <radialGradient
+        id="radialGradient4718"
+        xlink:href="#linearGradient4533"
+        gradientUnits="userSpaceOnUse"
+        cy="319.44"
+        cx="238.03"
+        gradientTransform="matrix(1 0 0 1.8479 2.629 -273.43)"
+        r="115.58"
+    />
+    <linearGradient
+        id="linearGradient4721"
+        x1="18.104"
+        xlink:href="#linearGradient3845"
+        gradientUnits="userSpaceOnUse"
+        y1="319.44"
+        gradientTransform="translate(2.629 -2.566)"
+        x2="456.46"
+        y2="319.44"
+    />
+    <linearGradient
+        id="linearGradient4724"
+        x1="240.53"
+        xlink:href="#linearGradient3845"
+        gradientUnits="userSpaceOnUse"
+        y1="221.99"
+        gradientTransform="translate(2.629 -2.566)"
+        x2="236.75"
+        y2="363.9"
+    />
+    <radialGradient
+        id="radialGradient4728"
+        xlink:href="#linearGradient4533"
+        gradientUnits="userSpaceOnUse"
+        cy="315.98"
+        cx="239"
+        gradientTransform="matrix(1.3872 0 0 1.187 -93.096 -61.665)"
+        r="211.06"
+    />
+    <linearGradient
+        id="linearGradient4731"
+        x1="20.329"
+        xlink:href="#linearGradient3845"
+        spreadMethod="reflect"
+        gradientUnits="userSpaceOnUse"
+        y1="319.44"
+        gradientTransform="translate(2.629 -2.566)"
+        x2="235.78"
+        y2="319.44"
+    />
+    <linearGradient
+        id="linearGradient4740"
+        x1="293.55"
+        xlink:href="#linearGradient4533"
+        gradientUnits="userSpaceOnUse"
+        x2="446.11"
+        y1="252.62"
+        y2="252.62"
+    />
+  </defs
+  >
+  <g
+      id="layer1"
+      transform="translate(-24.688 -100.73)"
+    >
+    <path
+        id="path4185"
+        style="color:#000000"
+        fill="#a1ea7f"
+        d="m239.91 107.8c-115.46 0-209.06 93.602-209.06 209.06s93.602 209.06 209.06 209.06 209.06-93.602 209.06-209.06-93.602-209.06-209.06-209.06zm0 133.06c41.967 0 76 34.033 76 76s-34.033 76-76 76-76-34.033-76-76 34.033-76 76-76z"
+    />
+    <path
+        id="path2996"
+        style="color:#000000"
+        fill="url(#linearGradient4731)"
+        d="m452.51 316.87c0-117.42-95.181-212.6-212.6-212.6s-212.6 95.181-212.6 212.6 95.181 212.6 212.6 212.6 212.6-95.181 212.6-212.6zm-186.04 0c0 14.677-11.886 26.563-26.563 26.563s-26.563-11.886-26.563-26.563 11.886-26.594 26.563-26.594 26.563 11.917 26.563 26.594z"
+    />
+    <path
+        id="path4782"
+        filter="url(#filter4549)"
+        style="color:#000000"
+        fill="url(#radialGradient4728)"
+        d="m48.816 238.18c-7.2062 17.969-11.999 37.092-14.031 56.844l129.63 12.25c0.86437-7.0028 2.6856-13.787 5.3231-20.156l-120.92-48.93z"
+    />
+    <path
+        id="path4780"
+        filter="url(#filter4549)"
+        style="color:#000000"
+        fill="url(#radialGradient4728)"
+        d="m314.2 329.03c-0.81604 5.1711-2.1688 10.18-3.9692 15l120.92 48.906c4.8911-12.667 8.5699-25.846 10.954-39.438l-127.9-24.47z"
+    />
+    <path
+        id="path4504"
+        filter="url(#filter4549)"
+        style="color:#000000"
+        fill="url(#radialGradient4728)"
+        d="m185.4 370.53-87.785 97.75c7.0288 6.7806 14.521 13.046 22.4 18.75l73.354-109.28c-2.8239-2.2046-5.4705-4.6264-7.9692-7.2188z"
+    />
+    <path
+        id="path4368"
+        filter="url(#filter4282)"
+        style="color:#000000"
+        fill="url(#linearGradient4740)"
+        d="m413.47 209.9-110.19 66.938c3.606 5.6927 6.461 11.907 8.4375 18.5l124.66-33.06c-5.1777-18.664-12.962-36.275-22.906-52.375z"
+    />
+    <path
+        id="path3014"
+        style="color:#000000"
+        fill="url(#linearGradient4724)"
+        d="m239.91 288.2c-15.831 0-28.668 12.837-28.668 28.668s12.837 28.668 28.668 28.668 28.668-12.837 28.668-28.668-12.837-28.668-28.668-28.668zm0 0.82161c15.378 0 27.846 12.469 27.846 27.846 0 15.378-12.469 27.846-27.846 27.846-15.378 0-27.846-12.469-27.846-27.846 0-15.378 12.469-27.846 27.846-27.846z"
+    />
+    <path
+        id="path3016"
+        style="color:#000000"
+        fill="url(#linearGradient4721)"
+        d="m239.91 247.72c-38.186 0-69.15 30.963-69.15 69.15 0 38.186 30.963 69.15 69.15 69.15 38.186 0 69.15-30.963 69.15-69.15 0-38.186-30.963-69.15-69.15-69.15zm0 1.9818c37.093 0 67.168 30.075 67.168 67.168s-30.075 67.168-67.168 67.168-67.168-30.075-67.168-67.168 30.075-67.168 67.168-67.168z"
+    />
+    <path
+        id="path4790"
+        filter="url(#filter4282)"
+        style="color:#000000"
+        fill="url(#radialGradient4718)"
+        d="m239.94 113.03c-19.84 0-38.992 2.8383-57.125 8.125l38.406 123.16c5.9864-1.5406 12.252-2.375 18.719-2.375 14.537 0 28.134 4.115 39.625 11.281l66.938-110.12c-31.007-19.053-67.502-30.062-106.56-30.062z"
+    />
+    <path
+        id="path4342"
+        filter="url(#filter4282)"
+        style="color:#000000"
+        fill="url(#radialGradient4718)"
+        d="m278.63 381.06c-11.294 6.8203-24.535 10.75-38.688 10.75-13.96 0-27.027-3.8193-38.219-10.469l-66.906 110.19c30.697 18.519 66.661 29.188 105.12 29.188 36.011 0 69.86-9.362 99.219-25.75l-60.52-113.91z"
+    />
+    <path
+        id="path4370"
+        filter="url(#filter4282)"
+        style="color:#000000"
+        fill="#a9c386"
+        d="m104.5 164.56c-9.3517 8.3246-17.938 17.506-25.625 27.406l103.59 76.875c2.9537-3.5308 6.2027-6.7842 9.75-9.7188l-87.71-94.56z"
+    />
+    <path
+        id="path4800"
+        filter="url(#filter4492)"
+        style="color:#000000"
+        fill="url(#radialGradient4668)"
+        d="m344.75 499.72c11.895-6.6058 23.168-14.373 33.688-23.312l-84.59-101.6c-3.9312 3.4601-8.1775 6.4782-12.656 9.0312l63.562 115.88z"
+    />
+    <path
+        id="path4798"
+        filter="url(#filter4492)"
+        style="color:#000000"
+        fill="url(#radialGradient4668)"
+        d="m41.16 371.12 127.03-36.84c-0.80821-3.526-1.3496-7.104-1.6562-10.719l-130.97 18.625c1.1883 9.7737 3.0543 19.444 5.5938 28.938z"
+    />
+    <path
+        id="path4796"
+        filter="url(#filter4492)"
+        style="color:#000000"
+        fill="url(#radialGradient4668)"
+        d="m318.75 303.93 131.38-15.156c-1.7504-12.732-4.6513-25.283-8.6875-37.469l-126.38 39c1.6455 4.4243 2.8749 8.9755 3.6875 13.625z"
+    />
+    <path
+        id="path4366"
+        filter="url(#filter4282)"
+        style="color:#000000"
+        fill="url(#linearGradient4713)"
+        d="m168.94 340.84-121 44.562c4.526 12.681 10.268 24.745 17.094 36.125l110.19-66.9c-2.5379-4.3405-4.6481-8.9417-6.2812-13.781z"
+    />
+    <path
+        id="path3841"
+        style="color:#000000"
+        fill="url(#linearGradient4709)"
+        d="m239.91 378.49c34.025 0 61.614-27.589 61.614-61.614s-27.589-61.614-61.614-61.614-61.614 27.589-61.614 61.614 27.589 61.614 61.614 61.614zm0-1.7658c-33.05 0-59.848-26.798-59.848-59.848s26.798-59.848 59.848-59.848 59.848 26.798 59.848 59.848-26.798 59.848-59.848 59.848z"
+    />
+    <path
+        id="path3843"
+        style="color:#000000"
+        fill="url(#linearGradient4706)"
+        d="m179.59 316.87c0 33.311 27.01 60.321 60.321 60.321s60.321-27.01 60.321-60.321-27.01-60.321-60.321-60.321-60.321 27.01-60.321 60.321zm1.7288 0c0-32.357 26.236-58.592 58.592-58.592 32.357 0 58.592 26.236 58.592 58.592 0 32.357-26.236 58.592-58.592 58.592-32.357 0-58.592-26.236-58.592-58.592z"
+    />
+    <path
+        id="path4320"
+        filter="url(#filter4282)"
+        style="color:#000000"
+        fill="url(#linearGradient4703)"
+        d="m237.69 113.03c-38.464 0-74.428 10.669-105.12 29.188l66.906 110.19c11.192-6.6494 24.259-10.469 38.219-10.469 14.153 0 27.394 3.9297 38.688 10.75l60.531-113.91c-29.359-16.388-63.208-25.75-99.219-25.75zm39.625 267.5c-11.491 7.1662-25.088 11.281-39.625 11.281-6.4667 0-12.732-0.8344-18.719-2.375l-38.406 123.16c18.133 5.2867 37.285 8.125 57.125 8.125 39.061 0 75.556-11.009 106.56-30.062l-66.938-110.12z"
+    />
+    <path
+        id="path4808"
+        style="color:#000000"
+        d="m376.44 167.75-85.875 96.25c2.4944 2.4951 4.7804 5.1718 6.9062 8l98.594-83.219c-6.0447-7.4611-12.609-14.502-19.625-21.031z"
+        fill-opacity=".97401"
+        filter="url(#filter4282)"
+        fill="#97bd84"
+    />
+    <path
+        id="path4806"
+        style="color:#000000"
+        d="m58.941 218.72c-6.4078 11.62-11.688 23.882-15.75 36.719l122.53 40.156c1.4563-4.8957 3.4026-9.5702 5.7812-14l-112.56-62.875z"
+        fill-opacity=".97401"
+        filter="url(#filter4282)"
+        fill="#97bd84"
+    />
+    <path
+        id="path4804"
+        style="color:#000000"
+        d="m310.07 335.87c-1.7357 6.6608-4.3844 12.961-7.7812 18.781l112.56 62.906c9.353-16.45 16.503-34.348 21-53.188l-125.78-28.5z"
+        fill-opacity=".97401"
+        filter="url(#filter4282)"
+        fill="#97bd84"
+    />
+    <path
+        id="path4443"
+        style="color:#000000"
+        d="m181.85 367.03-100.72 80.59c8.0418 9.6148 16.946 18.489 26.594 26.469l84.219-97.688c-3.6516-2.8038-7.0138-5.9538-10.094-9.375z"
+        fill-opacity=".97401"
+        filter="url(#filter4282)"
+        fill="#97bd84"
+    />
+    <path
+        id="path3018"
+        style="color:#000000"
+        fill="#333"
+        d="m239.91 109.59c-114.47 0-207.28 92.814-207.28 207.28s92.814 207.28 207.28 207.28 207.28-92.814 207.28-207.28-92.814-207.28-207.28-207.28zm0 1.4062c113.69 0 205.88 92.188 205.88 205.88s-92.188 205.88-205.88 205.88-205.88-92.188-205.88-205.88 92.188-205.88 205.88-205.88z"
+    />
+    <path
+        id="path4776"
+        filter="url(#filter4360)"
+        style="color:#000000"
+        fill="url(#radialGradient4698)"
+        d="m391.1 180.59c-8.3246-9.3516-17.506-17.938-27.406-25.625l-76.875 103.59c3.5308 2.9537 6.7842 6.2027 9.7188 9.75l94.562-87.719z"
+    />
+    <path
+        id="path4774"
+        filter="url(#filter4360)"
+        style="color:#000000"
+        fill="url(#radialGradient4698)"
+        d="m345.76 489.56-66.938-110.19c-5.6927 3.606-11.907 6.461-18.5 8.4375l33.062 124.66c18.664-5.1777 36.275-12.962 52.375-22.906z"
+    />
+    <path
+        id="path4358"
+        filter="url(#filter4360)"
+        style="color:#000000"
+        fill="url(#radialGradient4698)"
+        d="m196.04 377.56c-2.9036-2.0218-5.6659-4.2229-8.25-6.625l-93.063 89.312c6.7802 6.7744 14.043 13.074 21.719 18.844l79.594-101.53z"
+    />
+    <path
+        id="path3005"
+        style="color:#000000"
+        fill="#4d4d4d"
+        d="m239.91 240.87c-41.967 0-76 34.033-76 76s34.033 76 76 76 76-34.033 76-76-34.033-76-76-76zm0 5.8887c38.715 0 70.111 31.396 70.111 70.111s-31.396 70.111-70.111 70.111-70.111-31.396-70.111-70.111 31.396-70.111 70.111-70.111z"
+    />
+  </g
+  >
+  <metadata
+    >
+    <rdf:RDF
+      >
+      <cc:Work
+        >
+        <dc:format
+          >image/svg+xml</dc:format
+        >
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        />
+        <cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        />
+        <dc:publisher
+          >
+          <cc:Agent
+              rdf:about="http://openclipart.org/"
+            >
+            <dc:title
+              >Openclipart</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:publisher
+        >
+        <dc:title
+          >CD-DVD, Compact disc</dc:title
+        >
+        <dc:date
+          >2013-06-14T15:31:08</dc:date
+        >
+        <dc:description
+          >CD-DVD, Compact disc</dc:description
+        >
+        <dc:source
+          >https://openclipart.org/detail/179327/cd-dvd-compact-disc-by-keistutis-179327</dc:source
+        >
+        <dc:creator
+          >
+          <cc:Agent
+            >
+            <dc:title
+              >Keistutis</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:creator
+        >
+        <dc:subject
+          >
+          <rdf:Bag
+            >
+            <rdf:li
+              >CD-DVD</rdf:li
+            >
+            <rdf:li
+              >Compact disc</rdf:li
+            >
+          </rdf:Bag
+          >
+        </dc:subject
+        >
+      </cc:Work
+      >
+      <cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        >
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        />
+      </cc:License
+      >
+    </rdf:RDF
+    >
+  </metadata
+  >
+</svg
+>
Index: /trunk/images/presets/shop/news.svg
===================================================================
--- /trunk/images/presets/shop/news.svg	(revision 10565)
+++ /trunk/images/presets/shop/news.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="m 1,1 0,13 12,0 0,-13 z m 1,1 10,0 0,11 -10,0 z m 1,1 0,2 8,0 0,-2 z M 3,6 3,6.5 6,6.5 6,6 z m 5,4 0,0.5 3,0 0,-0.5 z M 3,7 3,7.5 6,7.5 6,7 z m 5,4 0,0.5 3,0 0,-0.5 z M 3,8 3,8.5 6,8.5 6,8 z M 3,9 3,9.5 6,9.5 6,9 z m 5,-3 0,3 3,0 0,-3 z m -5,4 0,0.5 3,0 0,-0.5 z m 0,1 0,0.5 3,0 0,-0.5 z" id="news" style="fill:#ac39ac;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/shop/optician.svg
===================================================================
--- /trunk/images/presets/shop/optician.svg	(revision 10565)
+++ /trunk/images/presets/shop/optician.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 5,3 0,6 c 0,2 0.25,5 1.25,5 L 5,11 C 6,11 6.25,7.5 6.25,7.5 6.76702,7.25 7.23298,7.25 7.75,7.5 7.75,7.5 8,11 9,11 l 3.75,0 C 13.75,11 14,8 14,6 L 9,3 C 8.521411,2.7236864 8.12726,3.746123 9,4.25 L 12,6 2,6 5,4.25 C 5.922502,3.7173932 5.364967,2.789286 5,3 z m -3.75,4.25 3.75,0 -0.5,2.5 -2.75,0 z m 7.75,0 3.75,0 -0.5,2.5 -2.75,0 z" id="optician" style="fill:#800080;fill-opacity:1;stroke:none" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/shop/perfumery.svg
===================================================================
--- /trunk/images/presets/shop/perfumery.svg	(revision 10565)
+++ /trunk/images/presets/shop/perfumery.svg	(revision 10565)
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4149"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shop__perfumery6.svg">
+  <defs
+     id="defs4151" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="75.660426"
+     inkscape:cx="1.5527655"
+     inkscape:cy="12.545216"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="false"
+     inkscape:snap-page="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4697" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4154">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,1042.8622 5,0 c 0,0 4,1 4,3 0,2 -5,6 -5,6 l -3,0 c 0,0 -5,-4 -5,-6 0,-2 4,-3 4,-3 z"
+       id="path4144"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsccsc" />
+    <path
+       style="fill:#ac39ac;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 3,1047.3622 3.8942644,4.5815 3.0396509,-0.013 L 14,1047.3622 Z"
+       id="path4146"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.5000002,1042.3622 0,7"
+       id="path4148"
+       inkscape:connector-curvature="0" />
+    <rect
+       rx="0"
+       ry="1.7382812e-005"
+       y="1039.3622"
+       x="9"
+       height="1.0000174"
+       width="6"
+       id="rect4176"
+       style="opacity:1;fill:#ac39ac;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1" />
+    <ellipse
+       style="opacity:1;fill:#ac39ac;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1"
+       id="path4178"
+       cx="13.5"
+       cy="1039.8622"
+       rx="2.5"
+       ry="2.5000055" />
+    <rect
+       style="opacity:1;fill:#ac39ac;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.5;stroke-opacity:1"
+       id="rect4174"
+       width="3"
+       height="6.0000348"
+       x="7"
+       y="1037.3622"
+       ry="1.0000174"
+       rx="1.0000174" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2,1036.8622 -1,0"
+       id="path4180"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4188"
+       d="m 4,1037.8622 -1,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2,1041.8622 -1,0"
+       id="path4190"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4192"
+       d="m 1,1038.8622 -1,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,1039.8622 -1,0"
+       id="path4194"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4196"
+       d="m 3,1039.8622 -1,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ac39ac;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,1038.8622 -1,0"
+       id="path4147"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4149"
+       d="m 4,1040.8622 -1,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2,1038.8622 -1,0"
+       id="path4151"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4153"
+       d="m 4,1038.8622 -1,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 1,1040.8622 -1,0"
+       id="path4155"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4157"
+       d="m 3,1036.8622 -1,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/pet.svg
===================================================================
--- /trunk/images/presets/shop/pet.svg	(revision 10565)
+++ /trunk/images/presets/shop/pet.svg	(revision 10565)
@@ -0,0 +1,857 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="524.19867"
+   height="524.66309"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="pet.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.90509668"
+     inkscape:cx="176.31844"
+     inkscape:cy="226.81886"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective2466"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3333"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3401"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3464"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3581"
+       inkscape:persp3d-origin="225 : 150 : 1"
+       inkscape:vp_z="450 : 225 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 225 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4312"
+       inkscape:persp3d-origin="225 : 150 : 1"
+       inkscape:vp_z="450 : 225 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 225 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective8860"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective8887"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective4904" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       id="perspective4668" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective4471" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         ill="none"
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       id="perspective3452" />
+    <inkscape:perspective
+       id="perspective9479"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective9690"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective9819" />
+    <inkscape:perspective
+       id="perspective9817"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol9807">
+      <path
+         id="path9809"
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9811"
+         d="M 94,176 73,215"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         id="path9813"
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9815"
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective9805"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective9803"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective9801"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9799" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9797" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 225 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="450 : 225 : 1"
+       inkscape:persp3d-origin="225 : 150 : 1"
+       id="perspective9795" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 225 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="450 : 225 : 1"
+       inkscape:persp3d-origin="225 : 150 : 1"
+       id="perspective9793" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9791" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9789" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9787" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9785" />
+    <inkscape:perspective
+       id="perspective9783"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <defs
+       id="defs48974" />
+    <sodipodi:namedview
+       pagecolor="#ffffff"
+       inkscape:zoom="0.61399264"
+       inkscape:window-y="26"
+       inkscape:window-x="0"
+       inkscape:window-width="1012"
+       inkscape:window-height="739"
+       inkscape:pageshadow="2"
+       inkscape:pageopacity="0.0"
+       inkscape:cy="250.37448"
+       inkscape:cx="475.26707"
+       id="namedview4258"
+       borderopacity="1.0"
+       bordercolor="#666666" />
+    <inkscape:perspective
+       id="perspective11483"
+       inkscape:persp3d-origin="100 : 66.666667 : 1"
+       inkscape:vp_z="200 : 100 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 100 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient2936">
+      <stop
+         style="stop-color:#8acf6b;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2938" />
+      <stop
+         style="stop-color:#368912;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2940" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2952">
+      <stop
+         style="stop-color:#c0d50d;stop-opacity:1;"
+         offset="0"
+         id="stop2954" />
+      <stop
+         style="stop-color:#eef2cd;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2956" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective34"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective13933"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective13955"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2446" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 204.28572 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="405.71429 : 204.28572 : 1"
+       inkscape:persp3d-origin="202.85715 : 136.19048 : 1"
+       id="perspective5571" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 250 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="500 : 250 : 1"
+       inkscape:persp3d-origin="250 : 166.66667 : 1"
+       id="perspective5412" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective5233" />
+    <marker
+       inkscape:stockid="RazorWire"
+       id="RazorWire"
+       refX="0"
+       refY="0"
+       orient="auto">
+       style=&quot;overflow:visible&quot;&gt;
+      <path
+   id="path4286"
+   transform="scale(0.8,0.8)"
+   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
+   d="m 0.02272727,-0.74009011 0,1.4375 -7.78124997,2.31250001 18.4374997,0 -7.1874997,-2.31250001 0,-1.4375 7.2499997,-2.15624999 -18.4687497,0 7.74999997,2.15624999 z"
+   inkscape:connector-curvature="0" />
+</marker>
+    <marker
+       inkscape:stockid="DiamondS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="DiamondS"
+       style="overflow:visible">
+      <path
+         id="path4202"
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Sstart"
+       style="overflow:visible">
+      <path
+         id="path4146"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="StopS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="StopS"
+       style="overflow:visible">
+      <path
+         id="path4229"
+         d="M 0,5.65 0,-5.65"
+         style="fill:none;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto">
+      <g
+         id="g4298"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4300"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           d="M 3.8,0 C 3.8,0.44182781 3.4418278,0.80000001 3,0.80000001 2.5581722,0.80000001 2.2,0.44182781 2.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
+           sodipodi:cx="3"
+           sodipodi:cy="0"
+           sodipodi:rx="0.80000001"
+           sodipodi:ry="0.80000001" />
+        <circle
+           id="circle4302"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           d="M 7.3,0 C 7.3,0.44182781 6.9418278,0.80000001 6.5,0.80000001 6.0581722,0.80000001 5.7,0.44182781 5.7,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
+           sodipodi:cx="6.5"
+           sodipodi:cy="0"
+           sodipodi:rx="0.80000001"
+           sodipodi:ry="0.80000001" />
+        <circle
+           id="circle4304"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           d="M 10.8,0 C 10.8,0.44182781 10.441828,0.80000001 10,0.80000001 9.5581722,0.80000001 9.2,0.44182781 9.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.441828,0 0.8,0.3581722 0.8,0.80000001 z"
+           sodipodi:cx="10"
+           sodipodi:cy="0"
+           sodipodi:rx="0.80000001"
+           sodipodi:ry="0.80000001" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="CurveIn"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="CurveIn"
+       style="overflow:visible">
+      <path
+         id="path4238"
+         d="m 4.625493,-5.0456926 c -2.76,0 -5.00000002,2.24 -5.00000002,5.00000002 0,2.75999998 2.24000002,4.99999998 5.00000002,4.99999998"
+         style="fill:none;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="scale(0.6,0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path4220"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Send"
+       style="overflow:visible">
+      <path
+         id="path4149"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="SemiCircleOut"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="SemiCircleOut"
+       style="overflow:visible">
+      <path
+         id="path4235"
+         d="m -2.5,-0.80913858 c 0,2.75999998 -2.24,4.99999998 -5,4.99999998 l 0,-10 c 2.76,0 5,2.24 5,5.00000002 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path4131"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Sstart"
+       style="overflow:visible">
+      <path
+         id="path4128"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Tail"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Tail"
+       style="overflow:visible">
+      <g
+         id="g4152"
+         transform="scale(-1.2,-1.2)">
+        <path
+           id="path4154"
+           d="M -3.8048674,-3.9585227 0.54352094,0"
+           style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4156"
+           d="M -1.2866832,-3.9585227 3.0617053,0"
+           style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4158"
+           d="M 1.3053582,-3.9585227 5.6537466,0"
+           style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4160"
+           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
+           style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4162"
+           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
+           style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4164"
+           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
+           style="fill:none;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path4119"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutL"
+       style="overflow:visible">
+      <path
+         id="path4214"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mend"
+       style="overflow:visible">
+      <path
+         id="path4125"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path4137"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective14642" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       id="perspective14640" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective14638" />
+    <symbol
+       id="symbol14628"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 z"
+         id="path14630"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path14632"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 z"
+         id="path14634"
+         inkscape:connector-curvature="0" />
+      <path
+         ill="none"
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path14636"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       id="perspective14626" />
+    <inkscape:perspective
+       id="perspective14624"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective14775"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective14839"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2562"
+       inkscape:persp3d-origin="212.91061 : 133.01251 : 1"
+       inkscape:vp_z="425.82123 : 199.51877 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 199.51877 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="stroke:#757575;stroke-opacity:1;display:none"
+     transform="matrix(48.14969,0,0,48.14969,-1240.0161,-83.091265)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g9828"
+     inkscape:label="Layout"
+     style="stroke:#757575;stroke-opacity:1;display:none"
+     transform="matrix(48.14969,0,0,48.14969,-1900.314,71.750799)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect9830"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect9832"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g14695"
+     inkscape:label="Layout"
+     style="stroke:#757575;stroke-opacity:1;display:none"
+     transform="matrix(48.14969,0,0,48.14969,-1240.0161,-213.28869)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect14697"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect14699"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="layer1"
+     transform="matrix(1.0432444,0.619486,-0.619486,1.0432444,-327.07982,-964.07764)"
+     style="fill:#ac39ac;fill-opacity:1;stroke:none">
+    <path
+       id="path2078"
+       style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 922.96817,588.96089 c 24.0243,2.80534 52.37886,8.1762 65.0633,31.40835 9.26227,13.69502 17.32513,28.38401 28.87643,40.36617 20.4742,10.36026 40.8732,22.80183 55.5624,40.70359 18.4349,27.56507 12.8528,67.04874 -8.5754,91.25527 -23.9937,21.96745 -58.5285,32.94178 -90.50944,24.81452 -20.44108,-4.08663 -40.82293,-16.11271 -62.09074,-9.39446 -19.67342,5.52125 -39.19757,14.22038 -60.14891,11.8866 -19.91653,-0.67497 -37.78663,-10.41533 -54.54059,-20.2091 -19.53406,-12.53883 -31.7396,-35.21136 -30.41665,-58.50793 0.067,-34.97267 26.3604,-63.96641 55.97055,-79.31568 12.63694,-6.1417 25.90432,-12.81303 31.91156,-26.45203 8.58936,-15.73398 16.12353,-35.49722 35.20799,-40.86311 10.77032,-3.919 22.26986,-5.48983 33.6895,-5.69219 z"
+       sodipodi:nodetypes="cccccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2040"
+       style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 706.83161,545.9715 c 5.12977,-18.01457 19.67126,-34.6786 38.97729,-37.11684 13.80277,-1.78026 28.08593,1.72456 40.23749,8.24205 22.16066,14.75851 35.05953,39.74123 42.35302,64.6795 3.67599,11.92517 6.17666,24.67526 3.14767,37.03976 -2.7993,14.60207 -13.39057,26.97443 -27.02046,32.66676 -17.70364,10.64278 -41.17953,9.20349 -58.05972,-2.43004 -10.04038,-6.64991 -18.93779,-15.32943 -24.33797,-26.20917 -12.78899,-23.06312 -21.41515,-50.46696 -15.29732,-76.87202 z"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2071"
+       style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="translate(452.857,333.791)"
+       d="m 421.73586,81.462526 c 0,0 29.46428,0.178571 45.71428,37.857144 0,0 11.21308,24.43717 7.32143,61.96429 0,0 -0.60865,37.77966 -23.08454,53.18448 0,0 -30.55712,27.7792 -65.65992,-9.59645 0,0 -24.4962,-26.26396 -29.29442,-63.38707 0,0 -5.3033,-38.3858 18.43528,-61.36677 0,0 20.13932,-18.834196 46.56789,-18.655624 z"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2073"
+       style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       transform="translate(452.857,333.791)"
+       d="m 576.52455,89.717037 c 0,0 36.25,10.714283 32.32143,52.142853 0,0 2.05835,33.27693 -17.63963,63.58151 0,0 -19.95051,37.37564 -46.46702,41.41625 0,0 -29.29442,9.09137 -50.50762,-35.86042 0,0 -15.15229,-51.0127 8.33376,-85.35789 0,0 27.42112,-50.946446 73.95908,-35.922303 z"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path2075"
+       style="fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 1117.8,529.42866 c 17.0128,5.19957 29.0252,21.65542 30.538,39.14833 1.6415,15.71874 -2.0788,31.51923 -7.3703,46.23188 -8.6097,21.5116 -24.1266,40.31698 -43.7581,52.63552 -14.8357,8.09747 -33.3338,4.66111 -46.9133,-4.41714 -5.555,-2.66124 -8.9406,-7.70303 -11.333,-13.19597 -9.0423,-17.99186 -10.3113,-39.89227 -2.093,-58.41912 6.9469,-17.44643 15.4953,-35.25253 30.1471,-47.54014 11.1088,-10.0964 25.6272,-18.34264 41.1562,-16.72517 3.2906,0.33413 6.5337,1.11092 9.6264,2.28181 z"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/photo.svg
===================================================================
--- /trunk/images/presets/shop/photo.svg	(revision 10565)
+++ /trunk/images/presets/shop/photo.svg	(revision 10565)
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15.99997"
+   height="13.019"
+   id="svg3168"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3170">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4893"
+       id="linearGradient3119"
+       gradientUnits="userSpaceOnUse"
+       x1="289.29999"
+       y1="429.13"
+       x2="289.29999"
+       y2="420.67999" />
+    <linearGradient
+       id="linearGradient4893"
+       inkscape:collect="always">
+      <stop
+         id="stop4895"
+         style="stop-color:#729fcf"
+         offset="0" />
+      <stop
+         id="stop4897"
+         style="stop-color:#eeeeec"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2194"
+       id="linearGradient3130"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.58027148,0,0,0.79986757,-180.30929,695.4509)"
+       x1="329.03"
+       y1="434.63"
+       x2="329.03"
+       y2="433.06" />
+    <linearGradient
+       id="linearGradient2194"
+       inkscape:collect="always">
+      <stop
+         id="stop2196"
+         style="stop-color:#babdb6"
+         offset="0" />
+      <stop
+         id="stop2198"
+         style="stop-color:#eeeeec"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2204"
+       id="linearGradient3133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29251852,0,0,0.29251852,343.00012,452.99408)"
+       x1="225.75999"
+       y1="288.59"
+       x2="225.75999"
+       y2="309.35999" />
+    <linearGradient
+       id="linearGradient2204">
+      <stop
+         id="stop2206"
+         style="stop-color:#babdb6"
+         offset="0" />
+      <stop
+         id="stop2208"
+         style="stop-color:#7b7f76"
+         offset=".81098" />
+      <stop
+         id="stop2210"
+         style="stop-color:#50524e"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="309.35999"
+       x2="225.75999"
+       y1="288.59"
+       x1="225.75999"
+       gradientTransform="matrix(0.29251852,0,0,0.29251852,-48.17407,960.67675)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3166"
+       xlink:href="#linearGradient2204"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="375"
+     inkscape:cy="520.00002"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3173">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1039.3432)">
+    <path
+       id="path3943"
+       style="fill:url(#linearGradient3166)"
+       d="m 3.6371104,1040.0339 c -0.71368,0 -1.28923,0.5295 -1.3583,1.2316 -0.42591,0.1497 -0.72519,0.5411 -0.72519,1.013 v 8.311 c 0,0.5986 0.48346,1.082 1.08203,1.082 H 14.22727 c 0.59857,0 1.08204,-0.4834 1.08204,-1.082 v -8.311 c 0,-0.5986 -0.48347,-1.082 -1.08204,-1.082 H 6.7911404 c -0.1036,-0.6677 -0.64462,-1.1626 -1.33528,-1.1626 h -1.81875 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3859"
+       style="fill:url(#linearGradient3130)"
+       d="m 6.5033604,1041.5878 c -0.0345,0.9094 0.48347,1.508 1.10506,1.508 H 15.02153 v -0.5525 c 0,-0.4144 -0.34533,-0.7252 -0.79426,-0.7252 H 6.7911404 c -0.14964,0 -0.27627,-0.1036 -0.28778,-0.2303 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3857"
+       style="fill:#555753"
+       d="m 3.6371104,1039.3432 c -0.89786,0 -1.57701,0.6331 -1.85327,1.4504 -0.52951,0.2993 -0.92088999,0.8288 -0.92088999,1.4849 v 8.311 c 0,0.9669 0.80577999,1.7727 1.77269999,1.7727 H 14.22727 c 0.97844,0 1.7727,-0.8058 1.7727,-1.7727 v -8.311 c 0,-0.9784 -0.79426,-1.7727 -1.7727,-1.7727 H 7.1594904 c -0.34533,-0.6561 -0.92088,-1.1626 -1.70363,-1.1626 h -1.81875 z m 0,1.3813 h 1.81875 c 0.35684,0 0.59857,0.2302 0.64462,0.5756 0.0575,0.3338 0.34533,0.587 0.69066,0.5755 H 14.22727 c 0.23022,0 0.40289,0.1727 0.40289,0.4029 v 8.311 c 0,0.2302 -0.17267,0.3914 -0.40289,0.3914 H 2.6356504 c -0.23022,0 -0.39137,-0.1612 -0.39137,-0.3914 v -8.311 c 0,-0.1842 0.1036,-0.3108 0.26475,-0.3568 0.25324,-0.092 0.42591,-0.3223 0.46044,-0.5871 0.0345,-0.3568 0.29929,-0.6101 0.66764,-0.6101 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3869"
+       sodipodi:rx="1.125"
+       sodipodi:ry="1.125"
+       style="fill:#ef2929"
+       sodipodi:type="arc"
+       d="m 283.125,434.98718 c 0,0.62132 -0.50368,1.125 -1.125,1.125 -0.62132,0 -1.125,-0.50368 -1.125,-1.125 0,-0.62132 0.50368,-1.125 1.125,-1.125 0.62132,0 1.125,0.50368 1.125,1.125 z"
+       transform="matrix(1.1238458,0,0,1.1238458,-310.96764,554.79061)"
+       sodipodi:cy="434.98718"
+       sodipodi:cx="282" />
+    <path
+       id="path3843"
+       sodipodi:rx="6.25"
+       sodipodi:ry="6.25"
+       style="fill:url(#linearGradient3119);stroke:#555753;stroke-width:2.9467001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2.41420007"
+       sodipodi:type="arc"
+       d="m 295,425.11218 c 0,3.45178 -2.79822,6.25 -6.25,6.25 -3.45178,0 -6.25,-2.79822 -6.25,-6.25 0,-3.45178 2.79822,-6.25 6.25,-6.25 3.45178,0 6.25,2.79822 6.25,6.25 z"
+       transform="matrix(0.54181309,0,0,0.54181309,-146.31719,817.11107)"
+       sodipodi:cy="425.11218"
+       sodipodi:cx="288.75" />
+    <path
+       id="path3951"
+       sodipodi:nodetypes="ccccccsc"
+       style="fill:#555753"
+       d="M 0.41402041,1042.8886 H 3.5450304 c 0.59857,0 1.08203,0.495 1.08203,1.0935 -0.41439,1.6807 -0.34533,3.3728 0,5.0534 0,0.5986 -0.48346,1.082 -1.08203,1.082 H 0.41402041 c -0.79426,-0.8057 -0.0345,-2.2676 -0.046,-3.7065 -0.0115,-1.3583 -0.85182,-2.7051 0.046,-3.5224 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3871"
+       sodipodi:nodetypes="ccccccc"
+       style="fill:#babdb6"
+       d="m 0.05718041,1044.3505 c 0.0576,0.4144 0.19569,0.8863 0.28778,1.3698 H 2.8428504 c 0.48347,0 0.87484,-0.2647 0.87484,-0.6101 v -0.1496 c 0,-0.3453 -0.39137,-0.6101 -0.87484,-0.6101 H 0.05718041 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3873"
+       sodipodi:nodetypes="ccccccc"
+       style="fill:#babdb6"
+       d="m 0.35647041,1047.1707 c -0.0691,0.495 -0.19569,0.9554 -0.25325,1.3813 H 2.8658704 c 0.48347,0 0.87484,-0.2762 0.87484,-0.6101 v -0.1496 c 0,-0.3453 -0.39137,-0.6216 -0.87484,-0.6216 H 0.35647041 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/supermarket.svg
===================================================================
--- /trunk/images/presets/shop/supermarket.svg	(revision 10565)
+++ /trunk/images/presets/shop/supermarket.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 0,0 0,1 1,1 2,11 12,11 12,10 3,10 2.875,9 12,9 14,3 2.34375,3 2,0 z m 3,12 c -0.552285,0 -1,0.447715 -1,1 0,0.552285 0.447715,1 1,1 0.552285,0 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 z m 8,0 c -0.552285,0 -1,0.447715 -1,1 0,0.552285 0.447715,1 1,1 0.552285,0 1,-0.447715 1,-1 0,-0.552285 -0.447715,-1 -1,-1 z" id="supermarket" style="fill:#ac39ac;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/shop/tattoo.svg
===================================================================
--- /trunk/images/presets/shop/tattoo.svg	(revision 10565)
+++ /trunk/images/presets/shop/tattoo.svg	(revision 10565)
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="581.8125"
+   height="380.1875"
+   viewBox="0 0 581.8125 380.1875"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="06.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs19">
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview17"
+   showgrid="true"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="1.1508772"
+   inkscape:cx="249.56066"
+   inkscape:cy="184.73928"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg2"><inkscape:grid
+     type="xygrid"
+     id="grid3001"
+     empspacing="5"
+     visible="true"
+     enabled="true"
+     snapvisiblegridlinesonly="true"
+     originx="0.90625px"
+     originy="-99.90625px" /></sodipodi:namedview>
+
+<rect
+   style="fill:#ffccaa;fill-opacity:1;stroke:#e5e7e5;stroke-width:1.45502162;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="rect3003"
+   width="378.75961"
+   height="580.34497"
+   x="-379.47357"
+   y="0.73377991"
+   transform="matrix(0,-1,1,0,0,0)" /><g
+   id="Layer_2_1_"
+   style="fill:#000000"
+   transform="matrix(0,-1.130235,1.130235,0,-37.70721,519.16517)">
+	<g
+   id="g9"
+   style="fill:#000000">
+		<path
+   clip-rule="evenodd"
+   d="m 270.681,338.544 c 48.514,-21.003 92.012,-49.875 123.051,-89.62 14.844,-19.009 28.994,-42.481 36.986,-69.351 7.547,-25.367 10.215,-57.255 6.758,-86.42 -0.186,-1.568 0.609,-4.383 -1.424,-5.334 -8.576,42.141 -24.096,79.291 -46.232,106.691 -3.227,-87.322 -53,-137.918 -128.029,-154.702 -0.415,0.059 -0.387,0.563 -0.356,1.067 -0.217,0.02 -0.422,0.052 -0.355,0.356 31.414,15.679 58.166,38.176 76.105,68.638 17.434,29.602 27.641,72.926 19.916,118.784 -8.588,7.534 -19.117,15.023 -29.518,19.56 13.115,-47.739 -0.814,-97.49 -21.339,-127.674 C 284.596,88.7 252.249,66.012 213.067,52.967 c -5.189,6.593 -11.236,12.154 -16.358,18.849 -5.141,6.719 -9.587,14.088 -12.448,23.117 32.724,7.433 58.323,21.424 77.174,43.744 16.778,19.866 31.989,54.755 25.25,92.821 -5.719,32.307 -25.242,56.425 -49.078,71.839 -22.39,14.479 -54.855,23.105 -89.622,22.762 -2.432,-0.024 -5.904,-1.021 -6.401,0.711 101.204,30.753 179.738,85.756 223.697,173.196 6.373,12.674 10.852,26.472 16.715,40.187 0.676,-11.518 -1.941,-22.865 -4.268,-33.43 -16.677,-75.73 -54.922,-129.956 -107.047,-168.219 z"
+   id="path11"
+   style="fill:#000000;fill-rule:evenodd"
+   inkscape:connector-curvature="0" />
+		<path
+   clip-rule="evenodd"
+   d="m 448.144,256.392 c -34.807,41.824 -79.549,76.415 -132.652,100.29 -0.229,2.255 2.32,3.315 3.557,4.623 9.328,9.866 18.551,21.595 26.672,33.073 48.688,-33.349 81.818,-82.245 106.336,-139.765 0,-0.237 0,-0.475 0,-0.711 -1.909,-1.045 -3.194,1.628 -3.913,2.49 z"
+   id="path13"
+   style="fill:#000000;fill-rule:evenodd"
+   inkscape:connector-curvature="0" />
+		<path
+   clip-rule="evenodd"
+   d="m 193.49,285.037 c 36.541,0 66.164,-30.763 66.164,-68.711 0,-36.721 -27.739,-66.714 -62.644,-68.614 14.513,10.002 24.213,28.144 24.213,48.866 0,31.528 -22.453,57.086 -50.151,57.086 -18.345,0 -34.386,-11.215 -43.13,-27.948 4.411,33.505 32.073,59.321 65.548,59.321 z"
+   id="path15"
+   style="fill:#000000;fill-rule:evenodd"
+   inkscape:connector-curvature="0" />
+	</g>
+</g>
+</svg>
Index: /trunk/images/presets/shop/ticket.svg
===================================================================
--- /trunk/images/presets/shop/ticket.svg	(revision 10565)
+++ /trunk/images/presets/shop/ticket.svg	(revision 10565)
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="492.54626"
+   height="492.54675"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ticket2.svg">
+  <defs
+     id="defs4">
+	
+
+		
+		
+	</defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-309.51441"
+     inkscape:cy="245.84328"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1018"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-112.37155,-285.65871)">
+    <g
+       style="opacity:0.5;fill:#4d4d4d"
+       id="g2994"
+       transform="translate(68.644928,241.93196)">
+			
+				<rect
+   style="fill:#4d4d4d"
+   x="271.20801"
+   y="195.659"
+   transform="matrix(0.7071,0.7071,-0.7071,0.7071,262.6363,-186.1794)"
+   width="169.69901"
+   height="56.567001"
+   id="rect2996" />
+
+			
+				<rect
+   style="fill:#4d4d4d"
+   x="105.154"
+   y="361.71201"
+   transform="matrix(0.7071,0.7071,-0.7071,0.7071,331.4186,-20.126)"
+   width="169.69901"
+   height="56.567001"
+   id="rect2998" />
+
+			
+				<rect
+   style="fill:#4d4d4d"
+   x="189.99899"
+   y="234.015"
+   transform="matrix(0.7071,0.7071,-0.7071,0.7071,296.2747,-104.9703)"
+   width="169.69901"
+   height="142.271"
+   id="rect3000" />
+
+		</g>
+    <path
+       style="fill:#ac39ac;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       d="m 558.82393,499.78696 40.836,-40.835 c 7.011,-7.01 7.01,-18.376 0,-25.386 l -142.648,-142.649 c -7.012,-7.011 -18.377,-7.011 -25.388,0 l -40.836,40.835 1.6,1.6 -3.862,3.862 -1.6,-1.599 -269.297,269.296 c -7.01,7.011 -7.01,18.375 0.001,25.387 l 44.008,44.008 c 15.086,-15.086 39.547,-15.086 54.633,0 15.086,15.087 15.086,39.547 0,54.633 l 44.008,44.009 c 7.009,7.01 18.375,7.01 25.386,0 l 269.297,-269.296 -1.6,-1.599 3.864,-3.863 1.598,1.597 z m -41.159,-41.159 6.593,6.593 -3.862,3.863 -6.594,-6.593 3.863,-3.863 z m -13.187,-13.187 6.593,6.593 -3.862,3.863 -6.594,-6.593 3.863,-3.863 z m -13.188,-13.187 6.594,6.594 -3.862,3.863 -6.594,-6.593 3.862,-3.864 z m -13.186,-13.188 6.593,6.594 -3.862,3.863 -6.594,-6.594 3.863,-3.863 z m -13.188,-13.186 6.594,6.594 -3.862,3.863 -6.594,-6.594 3.862,-3.863 z m -13.186,-13.188 6.593,6.594 -3.862,3.863 -6.594,-6.593 3.863,-3.864 z m -13.188,-13.187 6.594,6.594 -3.862,3.862 -6.594,-6.593 3.862,-3.863 z m -13.186,-13.187 6.594,6.594 -3.863,3.863 -6.594,-6.594 3.863,-3.863 z m -23.644,-15.917 -6.594,-6.593 3.863,-3.863 6.593,6.594 -3.862,3.862 z m 10.456,2.73 6.594,6.594 -3.862,3.863 -6.594,-6.594 3.862,-3.863 z m -113.521,358.794 -119.995,-119.995 39.999,-39.999 119.994,119.996 -39.998,39.998 z m 54.543,-54.544 -119.995,-119.995 100.602,-100.601 119.996,119.995 -100.603,100.601 z m 111.511,-111.51 -119.996,-119.995 39.999,-39.999 119.995,119.995 -39.998,39.999 z m 68.881,-63.6 -6.594,-6.593 3.863,-3.863 6.593,6.593 -3.862,3.863 z m 13.188,13.187 -6.594,-6.594 3.862,-3.863 6.595,6.594 -3.863,3.863 z"
+       id="path3002" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/tobacco.svg
===================================================================
--- /trunk/images/presets/shop/tobacco.svg	(revision 10565)
+++ /trunk/images/presets/shop/tobacco.svg	(revision 10565)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 16 16"
+   height="100%"
+   width="100%">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-189.96206,-428.35103)"
+     style="display:inline"
+     id="layer1">
+    <path
+       id="path3349"
+       d="m 205.51409,437.19895 c -0.01,2.8e-4 -0.0193,0.002 -0.0293,0.004 -0.15985,0.04 -1.50565,0.0329 -2.05342,0.0834 -0.52679,0.0485 -1.49997,0.21273 -2.35915,0.61235 -0.85919,0.39962 -2.51623,1.29586 -3.68512,2.05514 -1.09532,0.71149 -1.88821,1.12895 -2.12799,1.1889 -0.23977,0.0599 -0.49949,0 -0.65934,-0.27974 -0.15984,-0.27973 -0.47959,-1.37878 -0.47959,-1.37878 -0.20364,-0.51375 -0.89912,-0.61936 -1.51853,-0.63934 -0.5795,-0.0187 -1.76968,0.20294 -1.90822,0.78921 -0.0851,0.36019 -0.29296,1.58577 -0.29962,2.23787 -0.006,0.63434 0.24785,1.21176 0.57937,1.59854 0.59943,0.69934 1.20623,0.8607 1.82826,0.87916 0.54766,0.0163 1.49863,-0.10997 2.3778,-0.66944 0.79013,-0.50281 5.01523,-3.73644 5.8944,-4.33586 0.87916,-0.59943 1.73017,-1.00575 2.19787,-1.11894 0.71973,-0.17418 2.37774,-0.13987 2.37774,-0.13987 0,0 -0.0588,0.0552 0.14106,0.0352 0.19981,-0.02 0.21493,-0.20915 0.0987,-0.43479 -0.12869,-0.24978 -0.23093,-0.49079 -0.37491,-0.48702 z m -13.0723,1.91366 c 0.6247,-1e-5 1.13109,0.1888 1.13096,0.42168 -3e-5,0.23283 -0.50638,0.42157 -1.13096,0.42156 -0.62454,-10e-6 -1.13081,-0.18874 -1.13084,-0.42156 -1.1e-4,-0.23287 0.50619,-0.42167 1.13084,-0.42168 z"
+       style="opacity:1;fill:#ac39ac;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path4217"
+       d="m 189.96878,432.88483 c 0.18005,-1.42838 2.55049,-3.14676 2.85356,-3.26589 0.61391,-0.70441 -1.05475,1.21586 -1.43685,1.80096 -0.57435,0.81025 -0.88645,1.84982 -0.22851,2.83507 0.52198,0.74825 1.72588,2.0939 0.90214,1.8228 -0.82374,-0.27109 -2.20502,-1.84963 -2.09034,-3.19294 z"
+       style="opacity:1;fill:#ac39ac;fill-opacity:1;stroke:none;stroke-opacity:1" />
+    <path
+       id="path4219"
+       d="m 192.49379,433.50891 c 0.80034,0.44313 1.56528,1.22871 1.88396,2.27397 0.31867,1.04527 -0.38448,1.71955 -1.00122,1.77039 0.93016,-1.59519 -0.0746,-2.19704 -0.94984,-3.3013 -0.21028,-0.4541 -0.15423,-0.54501 0.0671,-0.74306 z"
+       style="opacity:1;fill:#ac39ac;fill-opacity:1;stroke:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/shop/wine.svg
===================================================================
--- /trunk/images/presets/shop/wine.svg	(revision 10565)
+++ /trunk/images/presets/shop/wine.svg	(revision 10565)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+<svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns1="http://sozi.baierouge.fr" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" style="enable-background:new 0 0 115.301 213.549" sodipodi:docname="Bottiglia di vino pregiato.svg" xml:space="preserve" viewBox="0 0 115.301 213.549" sodipodi:version="0.32" version="1.0" inkscape:version="0.40+cvs" sodipodi:docbase="F:\openclip\svg3">
+<sodipodi:namedview id="base" bordercolor="#666666" inkscape:pageshadow="2" inkscape:window-width="640" pagecolor="#ffffff" inkscape:zoom="1.7700856" inkscape:window-x="22" borderopacity="1.0" inkscape:current-layer="Layer_1" inkscape:cx="57.650504" inkscape:cy="106.77450" inkscape:window-y="22" inkscape:window-height="540" inkscape:pageopacity="0.0"/>
+<g id="g3">
+	<path id="path5" style="fill:#004033" d="m5 211.61c11.05 2.07 23.26 2.045 34.444 1.188 3.036-0.232 6.068-0.386 9.101-0.674 2.379-0.226 5.315-0.275 7.106-2.065 1.747-1.747 1.149-5.769 1.149-8.057v-94.975c0-8.788 0.214-17.604-0.109-26.388-0.229-6.192-2.711-11.658-6.59-16.431-3.716-4.572-9.016-8.547-10.59-14.394-0.521-1.934-0.274-4.273-0.359-6.259-0.188-4.422-0.377-8.843-0.565-13.265-0.147-3.454-0.294-6.907-0.441-10.361-0.026-0.609-0.043-1.212-0.043-1.821 0-1.111 0.341-0.642 0.9-1.2 0.677-0.677 0.1-4.042 0.1-4.97 0-1.565 0.111-3.088-0.351-4.48-0.426-1.283-0.982-2.103-1.05-3.35-0.098-1.799-0.691-2.596-2.566-3.223-2.521-0.841-5.364-0.578-7.978-0.578-1.994 0-6.38-0.163-7.555 1.9-0.495 0.869-0.026 2.069-0.2 2.8-0.283 1.186-1.178 2.115-1.4 3.3-0.397 2.116 0.051 4.435-0.1 6.6-0.027 0.394-0.357 1.249-0.2 1.6 0.264 0.593 1.2 0.378 1.2 1 0 5.917-0.445 11.854-0.697 17.765-0.167 3.924-0.334 7.848-0.502 11.771-0.086 2.03-0.195 3.955-1.275 5.755-3.097 5.161-8.081 8.868-11.322 13.942-3.431 5.378-4.907 10.502-4.907 16.883v7.928 97.348 15.402c0 3.49 0.449 7.05 4.8 7.32"/>
+	<path id="path7" style="stroke:#000000;stroke-width:.4;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m5 211.61c11.05 2.07 23.26 2.045 34.444 1.188 3.036-0.232 6.068-0.386 9.101-0.674 2.379-0.226 5.315-0.275 7.106-2.065 1.747-1.747 1.149-5.769 1.149-8.057v-94.975c0-8.788 0.214-17.604-0.109-26.388-0.229-6.192-2.711-11.658-6.59-16.431-3.716-4.572-9.016-8.547-10.59-14.394-0.521-1.934-0.274-4.273-0.359-6.259-0.188-4.422-0.377-8.843-0.565-13.265-0.147-3.454-0.294-6.907-0.441-10.361-0.026-0.609-0.043-1.212-0.043-1.821 0-1.111 0.341-0.642 0.9-1.2 0.677-0.677 0.1-4.042 0.1-4.97 0-1.565 0.111-3.088-0.351-4.48-0.426-1.283-0.982-2.103-1.05-3.35-0.098-1.799-0.691-2.596-2.566-3.223-2.521-0.841-5.364-0.578-7.978-0.578-1.994 0-6.38-0.163-7.555 1.9-0.495 0.869-0.026 2.069-0.2 2.8-0.283 1.186-1.178 2.115-1.4 3.3-0.397 2.116 0.051 4.435-0.1 6.6-0.027 0.394-0.357 1.249-0.2 1.6 0.264 0.593 1.2 0.378 1.2 1 0 5.917-0.445 11.854-0.697 17.765-0.167 3.924-0.334 7.848-0.502 11.771-0.086 2.03-0.195 3.955-1.275 5.755-3.097 5.161-8.081 8.868-11.322 13.942-3.431 5.378-4.907 10.502-4.907 16.883v7.928 97.348 15.402c0 3.49 0.449 7.05 4.8 7.32"/>
+	<path id="path9" style="fill:#608F86" d="m3.3 82.413c1.035-0.027 2.067-0.134 3.101-0.2 0.499-0.032 2.784 0.121 3.1-0.2 0.44-0.446 0-3.395 0-4.074 0-1.166 0.314-2.364 0.491-3.514 0.694-4.503 3.413-8.609 5.959-12.271 2.635-3.79 4.871-6.976 5.082-11.66 0.256-5.693 0.512-11.387 0.768-17.081-0.591 0.034-3.157-0.197-3.5 0.2-0.253 0.293-0.068 1.799-0.082 2.166-0.129 3.392-0.258 6.783-0.386 10.175-0.083 2.173-0.236 3.849-0.801 5.947-0.558 2.071-2.757 4.169-4.17 5.695-3.464 3.741-6.667 7.445-9.415 11.746-2.71 4.242-2.966 9.43-3.146 14.271 0.038-1.18 2.309-0.919 2.999-1.2"/>
+	<path id="path11" style="fill:#001F17" d="m56.8 206.31c0.305 6.307-8.062 6.021-12.532 6.207-5.929 0.246-11.829 0.594-17.767 0.594-5.868 0-11.746-0.367-17.582-0.948-4.512-0.449-8.719-0.938-8.719-6.422v-85.437-35.788c0-0.666-0.241-1.807 0.585-1.958 2.841-0.517 5.69-0.726 8.57-0.9 6.269-0.379 12.572-0.448 18.852-0.448 5.799 0 11.62 0.075 17.41 0.426 3.044 0.184 6.141 0.367 9.15 0.869 1.551 0.258 2.033 0.452 2.033 1.846v34.106 86.995 0.87"/>
+	<path id="path13" style="stroke:#292929;stroke-width:.2;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m56.8 206.31c0.305 6.307-8.062 6.021-12.532 6.207-5.929 0.246-11.829 0.594-17.767 0.594-5.868 0-11.746-0.367-17.582-0.948-4.512-0.449-8.719-0.938-8.719-6.422v-85.437-35.788c0-0.666-0.241-1.807 0.585-1.958 2.841-0.517 5.69-0.726 8.57-0.9 6.269-0.379 12.572-0.448 18.852-0.448 5.799 0 11.62 0.075 17.41 0.426 3.044 0.184 6.141 0.367 9.15 0.869 1.551 0.258 2.033 0.452 2.033 1.846v34.106 86.995 0.87"/>
+	<path id="path15" style="fill:#FFFFFF" d="m43 68.013c1.098 11.516 1.223 23.416 0.988 34.979-0.016 0.756-0.019 8.904-0.395 8.928-3.045 0.197-5.979 0.362-8.938 1.152-0.622 0.166-2.357 1.413-2.856 1.341-0.843-0.121-0.399-2.254-0.399-3.224 0-2.735 0.051-5.49 0.118-8.225 0.192-7.824 0.461-15.903-0.649-23.67-0.252-1.763-0.369-3.586-0.369-5.367 0-0.925-0.277-2.005-0.1-2.915 0.086-0.44-0.274-1 0.285-1 0.618 0 1.211-0.033 1.827-0.084 1.778-0.148 3.551-0.724 5.287-1.116 1.564-0.348 3.897-0.279 5.201-0.795"/>
+	<path id="path17" style="stroke:#A6A6A6;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m43 68.013c1.098 11.516 1.223 23.416 0.988 34.979-0.016 0.756-0.019 8.904-0.395 8.928-3.045 0.197-5.979 0.362-8.938 1.152-0.622 0.166-2.357 1.413-2.856 1.341-0.843-0.121-0.399-2.254-0.399-3.224 0-2.735 0.051-5.49 0.118-8.225 0.192-7.824 0.461-15.903-0.649-23.67-0.252-1.763-0.369-3.586-0.369-5.367 0-0.925-0.277-2.005-0.1-2.915 0.086-0.44-0.274-1 0.285-1 0.618 0 1.211-0.033 1.827-0.084 3.542-0.295 6.885-1.957 10.487-1.815"/>
+	<path id="path19" style="fill:#C7D8C7" d="m31 81.513c-0.212-3.202-0.508-6.397-0.6-9.6-0.014-0.489-0.227-1.9 0.285-1.9 0.734 0 1.476-0.01 2.202-0.131 1.654-0.276 3.277-0.7 4.912-1.069 1.481-0.334 3.026-0.7 4.55-0.7 1.114 0 0.95 2.93 0.95 4.019 0 3.22 0.232 6.465 0.4 9.681-4.232-0.101-8.466-0.2-12.699-0.3"/>
+	<path id="path21" style="fill:#B8C2B8" d="m43.601 81.413c0.386 5.825 0.399 11.726 0.399 17.565 0 2.767-0.032 5.556-0.131 8.32-0.054 1.5-0.109 2.999-0.164 4.498-0.01 0.276-3.472 0.345-4.127 0.395-2.592 0.198-5.418 0.651-7.627 2.121-1.082 0.72-0.55-1.53-0.55-2.145 0-1.554 0.077-3.102 0.1-4.655 0.089-5.96 0.217-11.94 0.05-17.9-0.076-2.717 0.095-5.825-0.55-8.4 4.199 0.059 8.399 0.126 12.6 0.193"/>
+	<path id="path23" style="stroke:#608F86;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m30.3 75.613c4.688-1.101 9.227-2.405 14.101-2.1"/>
+	<path id="path25" style="stroke:#608F86;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m37.4 68.813c0.281 4.231 0.283 8.464 0.6 12.7"/>
+	<path id="path27" style="stroke:#336633;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m38 81.313c0.719 10.008 0.429 20.39-0.2 30.4"/>
+	<path id="path29" style="stroke:#608F86;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m30.9 80.712c4.852-1.04 8.946-2.466 14-2.2"/>
+	<path id="path31" style="stroke:#336633;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m30.8 85.712c2.282-0.342 4.593-0.837 6.741-1.696 2.252-0.9 4.999-0.616 7.36-0.503"/>
+	<path id="path33" style="fill:#404040" d="m38.8 35.913c-1.179-2.226-7.821-1.66-10.022-1.79-2.492-0.146-8.778-0.359-10.478 1.79 0.132-3.202 0.264-6.404 0.396-9.606 0.098-2.365 1-6.062 0.305-8.394-0.276-0.925-0.323-0.423-0.9-1-0.47-0.47-0.196-0.755-0.2-1.4-0.014-2.162-0.19-4.635 0.1-6.8 0.153-1.146 1.021-2.02 1.3-3.1 0.23-0.893 0.2-1.866 0.2-2.8 0-3.787 12.496-2.545 14.686-2.148 1.799 0.327 3.199 0.785 3.515 2.648 0.148 0.873-0.05 1.5 0.2 2.3 0.299 0.958 1.013 1.703 1.2 2.7 0.336 1.788 0.1 3.822 0.1 5.653 0 0.811 0.481 2.366-0.1 2.947-0.426 0.426-0.622 0.067-0.9 0.7-0.199 0.452 0.002 1.343 0.023 1.859 0.132 3.198 0.264 6.396 0.395 9.595 0.076 1.878 0.778 5.192 0.18 6.846"/>
+	<path id="path35" style="stroke:#333333;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m38.8 35.913c-1.179-2.226-7.821-1.66-10.022-1.79-2.492-0.146-8.778-0.359-10.478 1.79 0.132-3.202 0.264-6.404 0.396-9.606 0.098-2.365 1-6.062 0.305-8.394-0.276-0.925-0.323-0.423-0.9-1-0.47-0.47-0.196-0.755-0.2-1.4-0.014-2.162-0.19-4.635 0.1-6.8 0.153-1.146 1.021-2.02 1.3-3.1 0.23-0.893 0.2-1.866 0.2-2.8 0-3.787 12.496-2.545 14.686-2.148 1.799 0.327 3.199 0.785 3.515 2.648 0.148 0.873-0.05 1.5 0.2 2.3 0.299 0.958 1.013 1.703 1.2 2.7 0.336 1.788 0.1 3.822 0.1 5.653 0 0.811 0.481 2.366-0.1 2.947-0.426 0.426-0.622 0.067-0.9 0.7-0.199 0.452 0.002 1.343 0.023 1.859 0.132 3.198 0.264 6.396 0.395 9.595 0.076 1.878 0.778 5.192 0.18 6.846"/>
+	<path id="path37" style="stroke:#C7D8C7;stroke-width:.8;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m19.2 35.212c-0.162 4.795-0.324 9.591-0.486 14.386-0.139 4.107-3.858 7.537-6.447 10.342-2.65 2.871-5.781 6.018-7.508 9.562-2.124 4.359-3.078 8.197-3.56 13.011"/>
+		<line id="line39" style="stroke:#A6A6A6;stroke-width:.8;stroke-miterlimit:10;stroke-linecap:square;fill:none" y2="111.61" y1="82.513" x2="1.2" x1="1.2"/>
+	<path id="path41" style="fill:#CC7A00" d="m38.8 35.913c-1.179-2.226-7.821-1.66-10.022-1.79-2.492-0.146-8.778-0.359-10.478 1.79 0.132-3.202 0.264-6.404 0.396-9.606 0.098-2.365 1-6.062 0.305-8.394-0.276-0.925-0.323-0.423-0.9-1-0.47-0.47-0.196-0.755-0.2-1.4-0.014-2.162-0.19-4.635 0.1-6.8 0.153-1.146 1.021-2.02 1.3-3.1 0.23-0.893 0.2-1.866 0.2-2.8 0-3.787 12.496-2.545 14.686-2.148 1.799 0.327 3.199 0.785 3.515 2.648 0.148 0.873-0.05 1.5 0.2 2.3 0.299 0.958 1.013 1.703 1.2 2.7 0.336 1.788 0.1 3.822 0.1 5.653 0 0.811 0.481 2.366-0.1 2.947-0.426 0.426-0.622 0.067-0.9 0.7-0.199 0.452 0.002 1.343 0.023 1.859 0.132 3.198 0.264 6.396 0.395 9.595 0.076 1.878 0.778 5.192 0.18 6.846"/>
+	<path id="path43" style="stroke:#662900;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m38.8 35.913c-1.179-2.226-7.821-1.66-10.022-1.79-2.492-0.146-8.778-0.359-10.478 1.79 0.132-3.202 0.264-6.404 0.396-9.606 0.098-2.365 1-6.062 0.305-8.394-0.276-0.925-0.323-0.423-0.9-1-0.47-0.47-0.196-0.755-0.2-1.4-0.014-2.162-0.19-4.635 0.1-6.8 0.153-1.146 1.021-2.02 1.3-3.1 0.23-0.893 0.2-1.866 0.2-2.8 0-3.787 12.496-2.545 14.686-2.148 1.799 0.327 3.199 0.785 3.515 2.648 0.148 0.873-0.05 1.5 0.2 2.3 0.299 0.958 1.013 1.703 1.2 2.7 0.336 1.788 0.1 3.822 0.1 5.653 0 0.811 0.481 2.366-0.1 2.947-0.426 0.426-0.622 0.067-0.9 0.7-0.199 0.452 0.002 1.343 0.023 1.859 0.132 3.198 0.264 6.396 0.395 9.595 0.076 1.878 0.778 5.192 0.18 6.846"/>
+	<path id="path45" style="stroke:#662900;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m33.3 0.613c1.494 1.524 1.4 4.729 1.4 6.675 0 0.424 0.4 0.799 0.4 1.363v3.342c0 1.299 0.067 2.461-0.301 3.62-0.159 0.501-0.5 0.599-0.5 1.297v5.371 12.031"/>
+	<path id="path47" style="stroke:#FFE699;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m32.601 0.513c0.688 0.616 0.86 1.346 1 2.2 0.246 1.494 0.5 2.609 0.5 4.247 0 1.557 0.3 3.35 0.3 5.034 0 0.503 0.386 3.275-0.2 3.57-1.441 0.724-0.6 5.609-0.6 6.718v12.031"/>
+	<path id="path49" style="stroke:#FFE699;stroke-width:.8;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m19.2 35.113c0.261-5.993 0.7-12.001 0.7-18"/>
+	<path id="path51" style="stroke:#FFE699;stroke-width:.8;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m18.7 15.913c0.837-2.588-0.421-5.924 0.45-8.55 0.363-1.096 0.915-1.967 1.05-2.95 0.119-0.868 0.218-1.785 0.3-2.7"/>
+	<path id="path53" style="stroke:#662900;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m38.9 35.913c-1.761-2.2-7.486-1.635-10.123-1.79-2.491-0.146-8.777-0.359-10.477 1.79"/>
+	<path id="path55" style="fill:#99B399" d="m1.2 195.41v9.764c0 1.041 0.133 2.061 0.6 2.937-0.2-4.23-0.4-8.46-0.6-12.7"/>
+	<path id="path57" style="fill:#FFF9E6" d="m56.8 194.21c-1.234 1.89-6.354 1.704-8.375 1.982-2.735 0.378-5.556 0.537-8.313 0.669-5.986 0.287-11.961 0.358-17.952 0.224-6.184-0.141-12.394-0.465-18.488-1.571-1.531-0.278-3.471-0.202-3.471-2.027v-5.655-49.853-21.2-4.653c0-0.673 1.437-0.316 1.966-0.316h47.013 6.918c0.943 0 0.703 0.15 0.703 1.088v16.124c-0.001 21.63-0.001 43.93-0.001 65.2"/>
+	<path id="path59" style="stroke:#994D4D;stroke-width:.2;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m56.8 194.21c-1.234 1.89-6.354 1.704-8.375 1.982-2.735 0.378-5.556 0.537-8.313 0.669-5.986 0.287-11.961 0.358-17.952 0.224-6.184-0.141-12.394-0.465-18.488-1.571-1.531-0.278-3.471-0.202-3.471-2.027v-5.655-49.853-21.2-4.653c0-0.673 1.437-0.316 1.966-0.316h47.013 6.918c0.943 0 0.703 0.15 0.703 1.088v16.124 65.288"/>
+	<path id="path61" style="stroke:#662900;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m17.8 16.712c3.069-1.75 7.54-1.4 10.957-1.4 3.134 0 7.819-0.423 10.543 1.4"/>
+	<path id="path63" style="stroke:#662900;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m19.4 4.913c2.898-0.972 6.188-0.8 9.2-0.8 2.97 0 6.253-0.19 9.1 0.8"/>
+	<path id="path65" style="stroke:#333333;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m19.5 2.712c0.743-2.906 6.912-2.4 9.101-2.4"/>
+	<path id="path67" style="stroke:#333333;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m28.601 0.212c2.219 0.148 8.353-0.416 9.1 2.5"/>
+	<path id="path69" style="stroke:#737373;stroke-width:.2;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m30.9 81.212c4.261 0 8.545 0.403 12.8 0.3"/>
+	<path id="path71" style="stroke:#000000;stroke-width:.7;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m91.3 212.61c3.538 0.093 7.097 0.151 10.625-0.213 3.385-0.35 8.002-0.254 10.982-2.117 3.101-1.938-4.953-3.053-6.307-3.27-3.849-0.616-7.585-1.331-11.4-2.201 1.076-1.688-0.254-4.25-0.445-6.128-0.294-2.879-0.542-5.759-0.777-8.644-0.489-6.011-0.678-11.997-0.678-18.027 0-2.958 0.099-5.883 0.283-8.835 0.095-1.506 0.278-2.956 0.5-4.449 0.117-0.787 0.342-0.543 0.917-1.116 0.856-0.852 1.225-1.353 0.65-2.5-0.893-1.784 1.021-2.072 2.405-3.117 2.412-1.818 5.046-3.447 7.031-5.734 2.429-2.799 4.119-5.165 5.884-8.42 2.681-4.944 3.884-11.111 3.972-16.698 0.093-6.004-0.562-11.867-1.865-17.731-0.3-1.352-0.533-2.734-0.954-4.054-0.345-1.079-0.616-3.621-1.522-4.345-1.63-1.302-6.247-0.944-8.216-1.02-5.772-0.222-11.529-0.382-17.305-0.176-2.97 0.106-5.922 0.313-8.887 0.47-1.247 0.065-2.444 0.283-3.643 0.626-1.289 0.368-1.437 2.939-1.773 4.068-3.434 11.524-4.265 23.732-0.549 35.248 1.718 5.325 5.174 10.798 9.681 14.196 1.518 1.145 3.035 2.288 4.553 3.433 0.752 0.567 1.782 0.884 2.438 1.555 1.317 1.348-0.297 1.521-0.101 2.899 0.174 1.218 1.521 1.387 1.9 2.301 1.02 2.456 0.616 6.498 0.689 9.126 0.164 5.869-0.032 11.731-0.286 17.597-0.146 3.38-0.388 6.783-0.73 10.148-0.202 1.975-0.262 4.012-0.772 5.929-0.33 1.239-0.787 2.159-0.101 3.399-3.57 0.824-7.065 1.7-10.701 2.13-1.682 0.199-3.437 0.471-5.07 0.917-0.773 0.211-4.218 1.115-2.295 2.184 3.295 1.829 7.346 1.944 11.014 2.323 3.632 0.375 7.307 0.347 10.953 0.347"/>
+	<path id="path73" style="fill:#E6E6E6" d="m91.3 212.61c3.538 0.093 7.097 0.151 10.625-0.213 3.385-0.35 8.002-0.254 10.982-2.117 3.101-1.938-4.953-3.053-6.307-3.27-3.849-0.616-7.585-1.331-11.4-2.201 1.076-1.688-0.254-4.25-0.445-6.128-0.294-2.879-0.542-5.759-0.777-8.644-0.489-6.011-0.678-11.997-0.678-18.027 0-2.958 0.099-5.883 0.283-8.835 0.095-1.506 0.278-2.956 0.5-4.449 0.117-0.787 0.342-0.543 0.917-1.116 0.856-0.852 1.225-1.353 0.65-2.5-0.893-1.784 1.021-2.072 2.405-3.117 2.412-1.818 5.046-3.447 7.031-5.734 2.429-2.799 4.119-5.165 5.884-8.42 2.681-4.944 3.884-11.111 3.972-16.698 0.093-6.004-0.562-11.867-1.865-17.731-0.3-1.352-0.533-2.734-0.954-4.054-0.345-1.079-0.616-3.621-1.522-4.345-1.63-1.302-6.247-0.944-8.216-1.02-5.772-0.222-11.529-0.382-17.305-0.176-2.97 0.106-5.922 0.313-8.887 0.47-1.247 0.065-2.444 0.283-3.643 0.626-1.289 0.368-1.437 2.939-1.773 4.068-3.434 11.524-4.265 23.732-0.549 35.248 1.718 5.325 5.174 10.798 9.681 14.196 1.518 1.145 3.035 2.288 4.553 3.433 0.752 0.567 1.782 0.884 2.438 1.555 1.317 1.348-0.297 1.521-0.101 2.899 0.174 1.218 1.521 1.387 1.9 2.301 1.02 2.456 0.616 6.498 0.689 9.126 0.164 5.869-0.032 11.731-0.286 17.597-0.146 3.38-0.388 6.783-0.73 10.148-0.202 1.975-0.262 4.012-0.772 5.929-0.33 1.239-0.787 2.159-0.101 3.399-3.717 0.858-7.339 1.732-11.123 2.181-1.676 0.198-3.399 0.524-5.027 0.97-1.386 0.379-3.64 1.123-1.482 2.32 3.164 1.758 7.397 1.754 10.908 2.117 1.864 0.192 3.756 0.223 5.628 0.277 1.403 0.02 4.075 0.35 4.912-0.09"/>
+	<path id="path75" style="stroke:#BFBFBF;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m91.3 212.61c3.538 0.093 7.097 0.151 10.625-0.213 3.385-0.35 8.002-0.254 10.982-2.117 3.101-1.938-4.953-3.053-6.307-3.27-3.849-0.616-7.585-1.331-11.4-2.201 1.076-1.688-0.254-4.25-0.445-6.128-0.294-2.879-0.542-5.759-0.777-8.644-0.489-6.011-0.678-11.997-0.678-18.027 0-2.958 0.099-5.883 0.283-8.835 0.095-1.506 0.278-2.956 0.5-4.449 0.117-0.787 0.342-0.543 0.917-1.116 0.856-0.852 1.225-1.353 0.65-2.5-0.893-1.784 1.021-2.072 2.405-3.117 2.412-1.818 5.046-3.447 7.031-5.734 2.429-2.799 4.119-5.165 5.884-8.42 2.681-4.944 3.884-11.111 3.972-16.698 0.093-6.004-0.562-11.867-1.865-17.731-0.3-1.352-0.533-2.734-0.954-4.054-0.345-1.079-0.616-3.621-1.522-4.345-1.63-1.302-6.247-0.944-8.216-1.02-5.772-0.222-11.529-0.382-17.305-0.176-2.97 0.106-5.922 0.313-8.887 0.47-1.247 0.065-2.444 0.283-3.643 0.626-1.289 0.368-1.437 2.939-1.773 4.068-3.434 11.524-4.265 23.732-0.549 35.248 1.718 5.325 5.174 10.798 9.681 14.196 1.518 1.145 3.035 2.288 4.553 3.433 0.752 0.567 1.782 0.884 2.438 1.555 1.317 1.348-0.297 1.521-0.101 2.899 0.174 1.218 1.521 1.387 1.9 2.301 1.02 2.456 0.616 6.498 0.689 9.126 0.164 5.869-0.032 11.731-0.286 17.597-0.146 3.38-0.388 6.783-0.73 10.148-0.202 1.975-0.262 4.012-0.772 5.929-0.33 1.239-0.787 2.159-0.101 3.399-3.57 0.824-7.065 1.7-10.701 2.13-1.682 0.199-3.437 0.471-5.07 0.917-0.773 0.211-4.218 1.115-2.295 2.184 3.295 1.829 7.346 1.944 11.014 2.323 3.632 0.375 7.307 0.347 10.953 0.347"/>
+	<path id="path77" style="fill:#E6E0E6" d="m91.3 212.61c3.538 0.093 7.097 0.151 10.625-0.213 3.385-0.35 8.002-0.254 10.982-2.117 3.101-1.938-4.953-3.053-6.307-3.27-3.849-0.616-7.585-1.331-11.4-2.201 1.076-1.688-0.254-4.25-0.445-6.128-0.294-2.879-0.542-5.759-0.777-8.644-0.489-6.011-0.678-11.997-0.678-18.027 0-2.958 0.099-5.883 0.283-8.835 0.095-1.506 0.278-2.956 0.5-4.449 0.117-0.787 0.342-0.543 0.917-1.116 0.856-0.852 1.225-1.353 0.65-2.5-0.893-1.784 1.021-2.072 2.405-3.117 2.412-1.818 5.046-3.447 7.031-5.734 2.429-2.799 4.119-5.165 5.884-8.42 2.681-4.944 3.884-11.111 3.972-16.698 0.093-6.004-0.562-11.867-1.865-17.731-0.3-1.352-0.533-2.734-0.954-4.054-0.345-1.079-0.616-3.621-1.522-4.345-1.63-1.302-6.247-0.944-8.216-1.02-5.772-0.222-11.529-0.382-17.305-0.176-2.97 0.106-5.922 0.313-8.887 0.47-1.247 0.065-2.444 0.283-3.643 0.626-1.289 0.368-1.437 2.939-1.773 4.068-3.434 11.524-4.265 23.732-0.549 35.248 1.718 5.325 5.174 10.798 9.681 14.196 1.518 1.145 3.035 2.288 4.553 3.433 0.752 0.567 1.782 0.884 2.438 1.555 1.317 1.348-0.297 1.521-0.101 2.899 0.174 1.218 1.521 1.387 1.9 2.301 1.02 2.456 0.616 6.498 0.689 9.126 0.164 5.869-0.032 11.731-0.286 17.597-0.146 3.38-0.388 6.783-0.73 10.148-0.202 1.975-0.262 4.012-0.772 5.929-0.33 1.239-0.787 2.159-0.101 3.399-3.717 0.858-7.339 1.732-11.123 2.181-1.676 0.198-3.399 0.524-5.027 0.97-1.386 0.379-3.64 1.123-1.482 2.32 3.164 1.758 7.397 1.754 10.908 2.117 1.864 0.192 3.756 0.223 5.628 0.277 1.403 0.02 4.075 0.35 4.912-0.09"/>
+	<path id="path79" style="stroke:#BFB6BF;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m91.3 212.61c3.538 0.093 7.097 0.151 10.625-0.213 3.385-0.35 8.002-0.254 10.982-2.117 3.101-1.938-4.953-3.053-6.307-3.27-3.849-0.616-7.585-1.331-11.4-2.201 1.076-1.688-0.254-4.25-0.445-6.128-0.294-2.879-0.542-5.759-0.777-8.644-0.489-6.011-0.678-11.997-0.678-18.027 0-2.958 0.099-5.883 0.283-8.835 0.095-1.506 0.278-2.956 0.5-4.449 0.117-0.787 0.342-0.543 0.917-1.116 0.856-0.852 1.225-1.353 0.65-2.5-0.893-1.784 1.021-2.072 2.405-3.117 2.412-1.818 5.046-3.447 7.031-5.734 2.429-2.799 4.119-5.165 5.884-8.42 2.681-4.944 3.884-11.111 3.972-16.698 0.093-6.004-0.562-11.867-1.865-17.731-0.3-1.352-0.533-2.734-0.954-4.054-0.345-1.079-0.616-3.621-1.522-4.345-1.63-1.302-6.247-0.944-8.216-1.02-5.772-0.222-11.529-0.382-17.305-0.176-2.97 0.106-5.922 0.313-8.887 0.47-1.247 0.065-2.444 0.283-3.643 0.626-1.289 0.368-1.437 2.939-1.773 4.068-3.434 11.524-4.265 23.732-0.549 35.248 1.718 5.325 5.174 10.798 9.681 14.196 1.518 1.145 3.035 2.288 4.553 3.433 0.752 0.567 1.782 0.884 2.438 1.555 1.317 1.348-0.297 1.521-0.101 2.899 0.174 1.218 1.521 1.387 1.9 2.301 1.02 2.456 0.616 6.498 0.689 9.126 0.164 5.869-0.032 11.731-0.286 17.597-0.146 3.38-0.388 6.783-0.73 10.148-0.202 1.975-0.262 4.012-0.772 5.929-0.33 1.239-0.787 2.159-0.101 3.399-3.57 0.824-7.065 1.7-10.701 2.13-1.682 0.199-3.437 0.471-5.07 0.917-0.773 0.211-4.218 1.115-2.295 2.184 3.295 1.829 7.346 1.944 11.014 2.323 3.632 0.375 7.307 0.347 10.953 0.347"/>
+	<path id="path81" style="fill:#1A1A1A" d="m90 200.41c0.198 0.264 0 0.493 0.4 0.7-0.837 0.482-1.674 0.966-2.512 1.448-0.488 0.282-0.165 1.909-0.288 2.251-1.774-2.34 1.076-3.74 2.4-4.4"/>
+	<path id="path83" style="stroke:#1A1A1A;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m90 200.41c0.198 0.264 0 0.493 0.4 0.7-0.837 0.482-1.674 0.966-2.512 1.448-0.488 0.282-0.165 1.909-0.288 2.251-1.446-1.906 0.445-4.174 2.5-4.299"/>
+	<path id="path85" style="fill:#FFFFFF" d="m88 201.31c0.948-2.587 0.808-6.192 1.043-9.071 0.317-3.895 0.577-7.808 0.664-11.716 0.091-4.105 0.258-8.207 0.093-12.313-0.085-2.104-0.238-4.207-0.374-6.308-0.07-1.081 0-3.075-0.626-3.692 0.223 0.03 2.101 0.177 2.101 0.252 0 2.35 0.018 4.699 0 7.049-0.032 4.423-0.131 8.849-0.211 13.271-0.084 4.68-0.15 9.362-0.293 14.041-0.071 2.342-0.14 4.683-0.285 7.021-0.05 0.8-1.326 1.05-2.112 1.47"/>
+	<path id="path87" style="stroke:#A6A6A6;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m88 201.31c0.948-2.587 0.808-6.192 1.043-9.071 0.317-3.895 0.577-7.808 0.664-11.716 0.091-4.105 0.258-8.207 0.093-12.313-0.085-2.104-0.238-4.207-0.374-6.308-0.07-1.081 0-3.075-0.626-3.692 0.223 0.03 2.101 0.177 2.101 0.252 0 2.35 0.018 4.699 0 7.049-0.032 4.423-0.131 8.849-0.211 13.271-0.084 4.643-0.161 9.286-0.289 13.928-0.063 2.246-0.125 4.494-0.265 6.737-0.087 1.401-0.985 1.075-2.035 1.862"/>
+	<path id="path89" style="stroke:#4D4D4D;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m89.7 180.71c0.16-4.171 0.285-8.327 0.1-12.5-0.09-2.03-0.137-4.074-0.3-6.1-0.078-0.967-0.057-3.386-0.7-3.9"/>
+	<path id="path91" style="stroke:#000000;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m72.4 94.813c4.551-0.675 9.193-1 13.8-1"/>
+	<path id="path93" style="fill:#800066" d="m94.601 153.81c5.144-2.968 9.994-6.139 13.335-11.212 3.312-5.029 5.953-10.865 6.472-16.967 0.265-3.119 0.498-6.186 0.393-9.321-0.05-1.475-0.196-2.952-0.295-4.424-0.011-0.161-0.985-0.076-1.126-0.076h-21.422-22.146-1.402c-0.277 0-0.439 3.722-0.483 4.213-0.266 2.999 0.066 6.066 0.32 9.052 0.503 5.918 2.752 11.801 5.991 16.721 3.547 5.389 8.382 8.782 13.806 12.079 0.559 0.34 2.913-0.165 3.657-0.165 0.798 0.01 2.584 0.23 2.91 0.11"/>
+	<path id="path95" style="stroke:#999999;stroke-width:.2;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m110.8 95.212c-1.957 1.689-7.026 1.167-9.477 1.261-3.346 0.129-6.685 0.239-10.032 0.239-3.473 0-6.937-0.122-10.406-0.26-2.547-0.102-6.821 0.305-8.984-1.24"/>
+	<path id="path97" style="stroke:#FFFFFF;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m102.7 96.513c-5.981 0.527-11.92 0.312-17.9 0.2"/>
+	<path id="path99" style="stroke:#333333;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m90.3 96.613c-5.721 0-12.135 0.389-17.699-1.1"/>
+	<path id="path101" style="fill:#FFFFFF" d="m108.1 99.712c0.915 5.404 1.196 11.027 0.899 16.5-0.1 1.83 0.42 2.86-1.493 2.983-1.501 0.097-3.062 0.106-4.547 0.34-2.315 0.364-4.387 1.443-6.56 1.877 0.958-5.458-0.051-11.182-0.726-16.607-0.078-0.623-0.301-3.593 0.185-3.593 1.418 0 2.838-0.153 4.237-0.369 2.47-0.38 5.79-0.46 8-1.128"/>
+	<path id="path103" style="stroke:#A6A6A6;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m108.1 99.712c0.915 5.404 1.196 11.027 0.899 16.5-0.1 1.83 0.42 2.86-1.493 2.983-1.501 0.097-3.062 0.106-4.547 0.34-2.315 0.364-4.387 1.443-6.56 1.877 0.962-5.477-0.235-10.954-0.7-16.4-0.057-0.664-0.523-3.33-0.1-3.8 0.325-0.361 3.415-0.202 4.05-0.3 2.814-0.434 5.581-1.16 8.45-1.1"/>
+	<path id="path105" style="stroke:#4D4D4D;stroke-width:.6;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m68.8 124.71c0.905 6.622 2.942 12.709 7.101 18"/>
+	<path id="path107" style="fill:#E6B8DA" d="m69.101 113.91c2.173 0.1 2.3-0.064 2.3 2.167 0 1.515-0.101 3.021-0.101 4.537 0 3.072 0.195 6.042 0.5 9.097-2.719-0.883-2.657-4.963-2.773-7.281-0.075-1.47-0.027-2.94-0.027-4.4 0-1.28 0.438-2.98 0.101-4.13"/>
+	<path id="path109" style="fill:#CC8FB8" d="m70.4 113.91c1.483-0.29 1 2.056 1 3.037 0 1.371-0.101 2.739-0.101 4.112 0 2.921 0.211 5.746 0.5 8.65-1.61-1.902-1.451-5.069-1.574-7.407-0.145-2.79 0.111-5.6 0.175-8.39"/>
+	<path id="path111" style="stroke:#808080;stroke-width:.6;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m72.101 96.013c-1.516 4.841-2.335 9.816-3.2 14.8"/>
+	<path id="path113" style="stroke:#B3B3B3;stroke-width:.6;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m72.3 96.513c-1.438 4.849-2.473 9.884-3.1 14.9"/>
+	<path id="path115" style="fill:#FFFFFF" d="m69.5 105.11c-0.307 3.446-1.031 6.821-1.235 10.298-0.101 1.727-0.176 4.731 0.235 6.103 0-2.952-0.019-5.89 0.165-8.837 0.15-2.414 1.443-5.714 1.035-7.963-0.025 0.19-0.151 0.32-0.2 0.4"/>
+	<path id="path117" style="stroke:#B3B3B3;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m69.5 105.11c-0.307 3.446-1.031 6.821-1.235 10.298-0.101 1.727-0.176 4.731 0.235 6.103 0-2.952-0.019-5.89 0.165-8.837 0.15-2.414 1.443-5.714 1.035-7.963-0.065 0.125-0.048 0.271-0.1 0.4"/>
+	<path id="path119" style="stroke:#FFFFFF;stroke-width:.6;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m73.4 96.113c-1.096 4.755-1.7 9.713-1.7 14.6"/>
+		<line id="line121" style="stroke:#999999;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" y2="112.01" y1="112.01" x2="113.3" x1="109.1"/>
+	<path id="path123" style="fill:#FFFFFF" d="m111.9 100.21c2.105 6.738 2.6 13.876 2.6 20.9-1.193-0.821-0.503-4.543-0.64-6.176-0.23-2.772-0.264-5.687-0.902-8.401-0.575-2.451-2.399-6.424-1.658-8.823-0.09 0.907 0.64 2.011 0.6 2.503"/>
+	<path id="path125" style="stroke:#999999;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m111.9 100.21c2.105 6.738 2.6 13.876 2.6 20.9-1.193-0.821-0.503-4.543-0.64-6.176-0.23-2.772-0.264-5.687-0.902-8.401-0.575-2.451-2.399-6.424-1.658-8.823-0.093 0.946 0.51 1.706 0.7 2.6"/>
+	<path id="path127" style="stroke:#E6E6E6;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m96 107.01c4.339-0.896 8.209-2 12.7-2"/>
+	<path id="path129" style="fill:#E673CF" d="m109 111.71c0.297 1.555 0.169 3.541-0.025 5.108-0.063 0.495 0.152 1.927-0.175 2.292-0.325 0.364-2.558 0.161-3.1 0.199-1.883 0.134-3.743 0.271-5.571 0.76-1.285 0.343-2.477 1.038-3.729 1.341 0.578-3.087 0.324-6.48 0.1-9.601 4.169-0.03 8.329-0.06 12.499-0.1"/>
+	<path id="path131" style="stroke:#E6E6E6;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m102.5 100.41c0.272 3.788 0.046 7.645 0.7 11.399"/>
+	<path id="path133" style="fill:#CC8FB8" d="m72.5 131.71c2.246 4.828 4.498 8.96 8.5 12.6-2.833-4.2-5.667-8.4-8.5-12.6"/>
+	<path id="path135" style="fill:#CC8FB8" d="m83.4 149.41c-0.382-0.082-0.626-0.174-0.9 0.101 1.753 1.193 3.618 2.161 5.4 3.299-6.248-2.81-13.425-8.608-15.601-15.399 1.07 0.108 1.309 1.333 1.852 2.093 0.975 1.363 1.927 2.742 3 4.029 1.715 2.057 4.265 4.966 6.749 5.979-0.217 0.05-0.333-0.04-0.5-0.1"/>
+	<path id="path137" style="stroke:#E6E6E6;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m78.7 94.113c5.598 0 11.196-0.3 16.8-0.3"/>
+	<path id="path139" style="fill:#807380" d="m110.4 95.513c-0.665 0.269-1.384 0.31-2.101 0.4 1.115 0.197 0.958 0.295 1.4 1.2 0.553 1.13 0.95 2.544 1.8 3.5 0.38-1.166-0.151-2.706-0.448-3.893-0.338-1.35-0.574-1.07-1.651-0.808 0.3-0.108 1-0.398 1-0.396"/>
+	<path id="path141" style="stroke:#665766;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m110.4 95.513c-0.665 0.269-1.384 0.31-2.101 0.4 1.115 0.197 0.958 0.295 1.4 1.2 0.553 1.13 0.95 2.544 1.8 3.5 0.38-1.166-0.151-2.706-0.448-3.893-0.338-1.35-0.574-1.07-1.651-0.808 0.354-0.157 0.741-0.306 1.1-0.4"/>
+	<path id="path143" style="fill:#4D003D" d="m112.4 120.11c-2.04 11.986-6.65 24.283-18.994 28.661-1.36 0.482-5.711-0.552-6.456 0.938-0.235 0.471 0.742 1.657 1.05 1.9 0.845 0.669 2.833 0.952 3.877 0.89 3.048-0.18 5.729-0.729 8.497-2.03 1.071-0.505 2.171-1.979 3.078-2.79 1.093-0.978 2.162-1.994 3.086-3.134 3.678-4.543 5.503-9.882 6.168-15.648 0.367-3.185 0.557-6.274 0.656-9.48 0.011-0.318 0.188-2.16-0.362-2.207-0.65-0.05-0.63 2.55-0.61 2.9"/>
+	<path id="path145" style="fill:#CCCCCC" d="m95.9 151.51c-2.588 1.491-5.813 1.431-8.4 0 2.563 0.76 6.199 1.18 8.4 0"/>
+	<path id="path147" style="stroke:#CCCCCC;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m95.9 151.51c-2.588 1.491-5.813 1.431-8.4 0 2.563 0.76 6.199 1.18 8.4 0"/>
+	<path id="path149" style="stroke:#CCCCCC;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m79.101 114.31c0.12 4.127-1.216 10.255 0.899 14"/>
+	<path id="path151" style="stroke:#CCCCCC;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m80.4 130.81c0.284 1.136 0.518 2.306 0.899 3.4"/>
+	<path id="path153" style="stroke:#4D003D;stroke-width:1.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m69 123.01c0.571 0.591 1.602 1.06 2.4 1.199"/>
+	<path id="path155" style="stroke:#CCCCCC;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m93.3 157.11c0.112-0.832 0.061-1.946 0.5-2.7 0.841-1.442 3.682-2.461 5.158-3.352 4.014-2.423 7.447-5.963 9.942-9.898 5.737-9.048 5.961-19.081 5.3-29.45"/>
+	<path id="path157" style="stroke:#CCCCCC;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m68.601 111.61c-0.644 1.552-0.4 4.267-0.4 6.118 0 2.597 0.173 5.114 0.394 7.704 0.407 4.779 2.316 9.3 4.273 13.604 1.956 4.304 5.691 7.807 9.244 10.767 1.815 1.513 3.935 2.581 5.97 3.778 1.248 0.734 0.997 2.123 1.219 3.43"/>
+	<path id="path159" style="fill:#A69DA6" d="m91 158.11c1.191 0.05 3.807-0.456 3.8-2.1-0.007-1.604-2.523-2.096-3.699-2.101-1.263-0.005-3.663 0.459-3.7 2.101-0.039 1.67 2.721 2.18 3.599 2.1"/>
+	<path id="path161" style="fill:#4D3D4D" d="m94.5 157.31c1.661-1.446-0.702-4.168-2.3-3.199 0.471 0.44 1.081 0.901 1.3 1.699 0.175 0.64-0.473 2.14 1 1.5"/>
+	<path id="path163" style="fill:#FFFFFF" d="m94 157.41c-2.146 1.892-9.439-0.415-5.85-2.8 0.593-0.395 1.51-0.431 0.55 0.05-1.256 0.628-1.656 1.593-0.5 2.55 0.895 0.74 2.858 0.97 3.95 0.75 0.528-0.105 0.965-0.294 1.45-0.449 0.471-0.15 0.422-0.16 0.4-0.1"/>
+	<path id="path165" style="stroke:#FFFFFF;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m94 157.41c-2.146 1.892-9.439-0.415-5.85-2.8 0.737-0.49 1.019-0.58 0.649 0-0.481 0.757-2.337 1.299-0.8 2.449 1.039 0.778 2.624 1.047 3.9 0.951 0.71-0.054 1.976-0.677 2.1-0.5"/>
+	<path id="path167" style="stroke:#404040;stroke-width:.2;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m92.601 158.01c-1.17 0.394-2.821 0.281-4-0.201-1.19-0.487-2.424-2.034-0.9-2.899"/>
+	<path id="path169" style="fill:#808080" d="m93.8 158.01c-0.278 0.172-1.8 0.432-1.8 0.556v5.944c0 3.147-0.794 7.401 0 10.299 0.517-5.53 1.873-11.24 1.8-16.8"/>
+	<path id="path171" style="stroke:#808080;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m93.8 158.01c-0.278 0.172-1.8 0.432-1.8 0.556v5.944c0 3.147-0.794 7.401 0 10.299 0.516-5.511 1.809-11.164 1.8-16.699"/>
+	<path id="path173" style="fill:#4D3D4D" d="m93.7 158.11c-0.276 0.035-0.223 0.219-0.4 0.1-1.624 7.661-1.448 15.894-1.599 23.725-0.083 4.35-0.001 8.71-0.001 13.06 0 0.635-0.128 5.312 0.149 5.312 1.064 0 2.264 0.28 3.15 0.9-0.279-1.44-0.363-3.028-0.5-4.5-0.058-0.626 0.1-1.445-0.314-1.935-0.858-1.015-0.987-1.205-1.035-2.515-0.145-3.906-0.234-7.813-0.332-11.721-0.092-3.659-0.019-7.3-0.019-10.959 0-1.962 0.051-3.912 0.2-5.871 0.124-1.62 0.897-4.19 0.701-5.6"/>
+	<path id="path175" style="stroke:#999999;stroke-width:.4;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m95.5 155.51c0.562 1.587-1.061 1.694-1.7 2.6-0.819 1.16-0.741 4.17-0.8 5.6"/>
+	<path id="path177" style="fill:#261926" d="m91.3 205.61c0.725 0.149 4.882-0.079 3.801-0.801 3.856 0.891 7.612 1.579 11.5 2.201 1.819 0.291 6.507 0.469 7.3 2.399-2.207 2.052-7.212 1.889-10.086 2.195-4.146 0.442-8.256 0.499-12.414 0.505-4.015 0.006-7.997-0.022-12-0.45-3.005-0.32-8.294-0.108-10.601-2.25 0.794-1.931 5.481-2.108 7.301-2.399 3.888-0.622 7.644-1.311 11.5-2.201-1.104 0.75 3.375 0.99 3.704 0.81"/>
+	<path id="path179" style="stroke:#000000;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m112.2 210.21c-8.52 2.436-17.855 1.9-26.6 1.9"/>
+	<path id="path181" style="fill:#403040" d="m91.3 210.11c-3.56-0.118-7.854-0.006-11.199-1.4-2.477-1.032-1.015-1.943 0.803-2.361 2.232-0.513 4.465-1.026 6.697-1.539-1.105 0.735 3.114 0.903 3.8 0.9 0.685-0.003 4.801-0.166 3.7-0.9l6.696 1.539c1.816 0.418 3.281 1.328 0.804 2.361-1.595 0.665-3.905 0.98-5.616 1.108-1.596 0.12-4.206 0.73-5.684 0.29"/>
+	<path id="path183" style="fill:#BFBFBF" d="m79.3 208.31c2.367-0.833 4.733-1.667 7.101-2.5-0.844-0.847-4.639 0.789-5.882 1.108-0.565 0.145-1.864 0.161-1.918 0.792-0.03 0.35 0.641 0.6 0.699 0.6"/>
+	<path id="path185" style="stroke:#BFBFBF;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m79.3 208.31c2.367-0.833 4.733-1.667 7.101-2.5-0.808-0.811-4.215 0.681-5.396 0.983-0.752 0.193-3.779 0.744-1.704 1.617"/>
+	<path id="path187" style="fill:#404040" d="m94.7 201.41c0.335 0.641 1.275 3.3-0.101 3.3-0.721 0-1.703 0.086-2.049-0.6-0.389-0.77 0.749-1.469 0.749-2.35 0.001-1.15 0.463-0.82 1.401-0.35"/>
+	<path id="path189" style="stroke:#404040;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m94.7 201.41c0.335 0.641 1.275 3.3-0.101 3.3-0.721 0-1.703 0.086-2.049-0.6-0.389-0.77 0.749-1.469 0.749-2.35 0.001-1.15 0.463-0.82 1.401-0.35"/>
+	<path id="path191" style="stroke:#0D0D0D;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m93.601 201.21c0.442 0.79 0.24 2.143-0.2 2.9"/>
+	<path id="path193" style="fill:#FFFFFF" d="m89.7 201.01c-1.179 0.541-3.619 2.406-1.7 3.699-0.357-0.838-0.314-2.076 0.75-2.5 0.221-0.088 1.96-0.364 1.95-0.8-0.011-0.46-0.624-0.47-1-0.4"/>
+	<path id="path195" style="stroke:#FFFFFF;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m89.7 201.01c-1.179 0.541-3.619 2.406-1.7 3.699-0.357-0.838-0.314-2.076 0.75-2.5 0.221-0.088 1.96-0.364 1.95-0.8-0.011-0.46-0.624-0.47-1-0.4"/>
+	<path id="path197" style="fill:#8C8C8C" d="m95.601 205.21c-0.346 0.339-0.819 0.525-1.301 0.6 1.272 0.971 2.785 2.668 4.301 2.801 1.313 0.115 2.795-1.062 4.1-0.6-0.066 0.066-0.134 0.133-0.2 0.199 0.044 0.204 0.246 0.021 0.101 0.4 0.675-0.009 2.359-1.061 1.038-1.391-2.68-0.67-5.36-1.34-8.039-2.01"/>
+	<path id="path199" style="stroke:#1A1A1A;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m95.601 205.21c-0.346 0.339-0.819 0.525-1.301 0.6 1.272 0.971 2.785 2.668 4.301 2.801 1.313 0.115 2.795-1.062 4.1-0.6-0.066 0.066-0.134 0.133-0.2 0.199 0.044 0.204 0.246 0.021 0.101 0.4 0.691-0.009 1.792-0.576 1.399-1.301"/>
+		<line id="line201" style="stroke:#A6A6A6;stroke-width:.4;stroke-miterlimit:10;stroke-linecap:square;fill:none" y2="208.31" y1="205.81" x2="98.4" x1="95.101"/>
+	<path id="path203" style="fill:#0D0D0D" d="m104.1 207.71c-2.745-0.245-5.433-1.766-8-2.199 4.93 1.122 9.819 2.133 14.8 3v0.199c-2.41-0.48-4.49-0.58-6.8-1"/>
+	<path id="path205" style="stroke:#0D0D0D;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m104.1 207.71c-2.745-0.245-5.433-1.766-8-2.199 4.93 1.122 9.819 2.133 14.8 3v0.199c-2.353-0.471-4.477-0.471-6.7-1"/>
+	<path id="path207" style="fill:#736273" d="m78.5 207.41c-1.172-0.044-9.936 0.434-9.6 2 0.478 2.229 8.867-0.86 10.399-1-0.46-0.22-0.81-0.74-0.799-1"/>
+	<path id="path209" style="stroke:#000000;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m87.9 204.61c1.208 1.003 3.335 0.6 4.8 0.6"/>
+	<path id="path211" style="stroke:#E6E6E6;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m98.2 111.71c3.79-0.541 6.837-1.933 10.8-1.7"/>
+		<line id="line213" style="stroke:#4D4D4D;stroke-width:.3;stroke-miterlimit:10;stroke-linecap:square;fill:none" y2="112.01" y1="112.01" x2="109.1" x1="85.2"/>
+	<path id="path215" style="stroke:#4D4D4D;stroke-width:.1;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m68.8 209.41c1.69 2.642 7.9 2.565 10.65 2.851 3.945 0.407 7.899 0.449 11.861 0.449 3.805 0 7.617-0.003 11.406-0.395 2.981-0.309 9.271-0.161 11.183-2.905"/>
+	<path id="path217" style="stroke:#4D003D;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m103.1 111.71c0.318 2.702 0.055 5.21-0.2 7.9"/>
+	<path id="path219" style="stroke:#4D003D;stroke-width:.5;stroke-miterlimit:10;stroke-linecap:square;fill:none" d="m96.7 117.11c4.332-0.651 7.937-2.234 12.4-2"/>
+</g>
+<metadata><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><cc:license rdf:resource="http://creativecommons.org/licenses/publicdomain/"/><dc:publisher><cc:Agent rdf:about="http://openclipart.org/"><dc:title>Openclipart</dc:title></cc:Agent></dc:publisher><dc:title>Architetto -- Botiglia di vino</dc:title><dc:date>2009-04-20T20:21:02</dc:date><dc:description>Wine bottle by Francesco 'Architetto' Rollandin.</dc:description><dc:source>https://openclipart.org/detail/25195/architetto----botiglia-di-vino-by-anonymous-25195</dc:source><dc:creator><cc:Agent><dc:title>Anonymous</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>alcohol</rdf:li><rdf:li>beverage</rdf:li><rdf:li>bottle</rdf:li><rdf:li>color</rdf:li><rdf:li>drink</rdf:li><rdf:li>food</rdf:li><rdf:li>glass</rdf:li><rdf:li>golden</rdf:li><rdf:li>green</rdf:li><rdf:li>purple</rdf:li><rdf:li>wine</rdf:li></rdf:Bag></dc:subject></cc:Work><cc:License rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/><cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/><cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/></cc:License></rdf:RDF></metadata></svg>
Index: /trunk/images/presets/sightseeing/castle.svg
===================================================================
--- /trunk/images/presets/sightseeing/castle.svg	(revision 10565)
+++ /trunk/images/presets/sightseeing/castle.svg	(revision 10565)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="160"
+   height="90"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="castle.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="151.69799"
+     inkscape:cy="8.3599243"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="1.7382813e-005px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-962.3622)">
+    <path
+       style="fill:#784421;fill-opacity:1;stroke:none"
+       d="m 10,1052.3622 0,-65 -10,0 0,-25 10,0 0,10 10,0 0,-10 10,0 0,10 10,0 0,-10 10,0 0,25 -10,0 0,25 20,0 20,-30 20,30 20,0 0,-25 -10,0 0,-25 10,0 0,10 10,0 0,-10 10,0 0,10 10,0 0,-10 10,0 0,25 -10,0 0,65 z"
+       id="path3004"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       d="m 70,1052.3622 0,-20 10,-10 10,10 0,20 z"
+       id="path3774"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/sightseeing/museum.svg
===================================================================
--- /trunk/images/presets/sightseeing/museum.svg	(revision 10565)
+++ /trunk/images/presets/sightseeing/museum.svg	(revision 10565)
@@ -0,0 +1,14 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/><rect x="0" y="0" width="16" height="16" rx="2" ry="2" id="shield" style="fill:#ffffff;stroke:none;"/>
+  <path d="M 7,1 1,3 1,4 13,4 13,3 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 5,6 C 5.497372,6 6,6.5325904 6,7 L 6,11 4,11 4,7 C 4,6.4726661 4.502628,6 5,6 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 C 8,6.4726661 8.496636,6 9,6 z" id="museum" style="fill:#734a08;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/images/presets/sightseeing/peak_viewpoint.svg
===================================================================
--- /trunk/images/presets/sightseeing/peak_viewpoint.svg	(revision 10565)
+++ /trunk/images/presets/sightseeing/peak_viewpoint.svg	(revision 10565)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="peak.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.28"
+     inkscape:cx="94.350082"
+     inkscape:cy="243.59651"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="true"
+     showguides="true"
+     inkscape:snap-global="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="1272"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3149"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-0.125,2.75)">
+    <path
+       style="fill:#0000ff"
+       d="m 35.900874,206.12207 c -8.649727,-2.16859 -16.366887,-9.2973 -18.630387,-17.20979 -0.632225,-2.21005 -1.139636,-8.0335 -1.127583,-12.94098 0.01767,-7.19383 0.446324,-9.93263 2.212279,-14.13484 5.178759,-12.32326 16.599976,-17.33237 34.38021,-15.07846 12.513234,1.58623 86.404757,24.07795 89.515137,27.24737 3.51431,3.581 -1.84633,6.59816 -26.20561,14.74954 -19.292151,6.45576 -52.851825,15.99305 -61.263718,17.41048 -7.117731,1.19935 -13.986556,1.1836 -18.880328,-0.0433 l 0,0 z"
+       id="path3087"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0000ff"
+       d="M 162.98955,141.46689 C 151.40321,133.12032 101.3937,80.654453 95.249481,70.399579 85.531559,54.180095 85.669023,42.397355 95.700725,31.721527 105.13056,21.686201 117.52596,17.590864 127.64487,21.167433 c 8.47901,2.996939 16.76352,14.216259 21.67999,29.360232 2.08593,6.425158 14.22517,57.257145 18.50988,77.508445 3.25419,15.38069 2.14184,18.4641 -4.84519,13.43078 l 0,0 z"
+       id="path3089"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0000ff"
+       d="m 228.76979,142.78722 c -1.61917,-1.25992 -1.65539,-1.87962 -0.53726,-9.19318 3.27902,-21.4476 15.54902,-72.721527 20.85372,-87.14365 8.82669,-23.997457 23.29471,-32.199103 40.70748,-23.076285 19.78126,10.363711 23.63354,27.510966 10.8099,48.116983 -3.94533,6.339658 -27.39885,31.613452 -53.20312,57.332342 -15.21493,15.16458 -16.16877,15.87949 -18.63072,13.96379 z"
+       id="path3091"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0000ff"
+       d="m 333.97425,203.2081 c -16.10713,-3.65816 -77.37282,-23.11127 -79.49293,-25.24064 -3.82801,-3.84469 0.45142,-6.27045 26.48592,-15.01338 8.63099,-2.89845 24.60026,-7.74103 35.48727,-10.76127 16.67364,-4.62555 21.39093,-5.5624 29.91957,-5.94208 11.89525,-0.52955 17.10806,0.856 22.83032,6.06826 9.12349,8.31031 11.24108,28.37199 4.25491,40.31003 -6.60419,11.28531 -20.26268,14.94478 -39.48506,10.57908 z"
+       id="path3093"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#aa4400;fill-rule:evenodd;stroke:#000000;stroke-width:1.58364117px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 199.92412,110.62652 2.0903838,396.45845 398.24849,396.45629 z"
+       id="rect2985"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/social_facility/assisted_living.svg
===================================================================
--- /trunk/images/presets/social_facility/assisted_living.svg	(revision 10565)
+++ /trunk/images/presets/social_facility/assisted_living.svg	(revision 10565)
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="social_facility__assisted_living2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.9656382"
+     inkscape:cy="8.3053734"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="2.0000393" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 10.531465,1045.7896 c -0.5714731,0 -1.0311731,0.5365 -1.0311731,1.2025 l 0,0.6846 c -3.916e-4,0.013 -3.916e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.9628121,0.7514 0.9536851,0 l 0,-3.9584 0.491463,0 0,4.5316 3.059323,0 0,-4.5316 0.54149,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936448,0 z"
+       id="path3772-4-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccsscc" />
+    <path
+       sodipodi:nodetypes="csccccccccccccccsscc"
+       inkscape:connector-curvature="0"
+       id="path4266"
+       d="m 1.5627162,1045.7896 c -0.57147308,0 -1.03117258,0.5365 -1.03117258,1.2025 l 0,0.6846 c -3.92e-4,0.013 -3.92e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.96281148,0.7514 0.95368448,0 l 0,-3.9584 0.4914631,0 0,4.5316 3.059323,0 0,-4.5316 0.54149,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936448,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#006400;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.9999996,1041.8539 7.0000014,-4 7.000001,4"
+       id="path4209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4211-7"
+       cx="3.5312514"
+       cy="1044.0005"
+       rx="1.3232266"
+       ry="1.3232436" />
+    <ellipse
+       ry="1.3232436"
+       rx="1.3232266"
+       cy="1044.0005"
+       cx="12.5"
+       id="ellipse4298"
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#006400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.20000017;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 7.9913152,1040.7547 c -0.293773,0.01 -0.528274,0.2771 -0.524637,0.6074 l 0,11 1.066646,0 0,-11 c 0.0037,-0.3379 -0.241434,-0.6127 -0.542009,-0.6074 z"
+       id="path4211"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/social_facility/food_bank.svg
===================================================================
--- /trunk/images/presets/social_facility/food_bank.svg	(revision 10565)
+++ /trunk/images/presets/social_facility/food_bank.svg	(revision 10565)
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="social_facility__food_bank2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.0253283"
+     inkscape:cy="7.3051535"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="2.0000393" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#006400;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.9999997,1041.8565 7.0000013,-4 7.000001,4"
+       id="path4209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:#3771c8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 7.9999984,1044.669 c 0.897468,0 0.8974694,-0.6038 1.7949372,-0.6038 1.7949364,0 2.6924044,0.9182 2.6924044,2.7547 0,3.6728 -2.320796,5.5092 -3.2182646,5.5092 -0.8974676,0 -0.3716088,-0.4632 -1.2690767,-0.4632 -0.8974679,0 -0.4627556,0.4632 -1.3602235,0.4632 -0.897468,0 -3.1271158,-1.8364 -3.1271136,-5.5092 1.2e-6,-1.8365 0.8974658,-2.7547 2.692402,-2.7547 0.8974681,0 0.8974669,0.6038 1.7949348,0.6038 z"
+       id="path4211"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+    <path
+       style="fill:#3771c8;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 7.5872564,1044.0956 c 0,0 -0.071797,-2.8153 2.6206066,-3.7335 -0.0718,2.6939 -2.6206066,3.7335 -2.6206066,3.7335"
+       id="path4213"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/social_facility/group_home.svg
===================================================================
--- /trunk/images/presets/social_facility/group_home.svg	(revision 10565)
+++ /trunk/images/presets/social_facility/group_home.svg	(revision 10565)
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="social_facility__group_home4.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.9656382"
+     inkscape:cy="8.3053734"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="2.0000393" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 10.531465,1045.7896 c -0.5714731,0 -1.0311731,0.5365 -1.0311731,1.2025 l 0,0.6846 c -3.916e-4,0.013 -3.916e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.9628121,0.7514 0.9536851,0 l 0,-3.9584 0.491463,0 0,4.5316 3.059323,0 0,-4.5316 0.54149,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936448,0 z"
+       id="path3772-4-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccsscc" />
+    <path
+       sodipodi:nodetypes="csccccccccccccccsscc"
+       inkscape:connector-curvature="0"
+       id="path4266"
+       d="m 1.5627162,1045.7896 c -0.57147308,0 -1.03117258,0.5365 -1.03117258,1.2025 l 0,0.6846 c -3.92e-4,0.013 -3.92e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.96281148,0.7514 0.95368448,0 l 0,-3.9584 0.4914631,0 0,4.5316 3.059323,0 0,-4.5316 0.54149,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.936448,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#006400;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.9999996,1041.8539 7.0000014,-4 7.000001,4"
+       id="path4209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4211-7"
+       cx="3.5312514"
+       cy="1044.0005"
+       rx="1.3232266"
+       ry="1.3232436" />
+    <ellipse
+       ry="1.3232436"
+       rx="1.3232266"
+       cy="1044.0005"
+       cx="12.5"
+       id="ellipse4298"
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/social_facility/nursing_home.svg
===================================================================
--- /trunk/images/presets/social_facility/nursing_home.svg	(revision 10565)
+++ /trunk/images/presets/social_facility/nursing_home.svg	(revision 10565)
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="amenity__nursing_home2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-14.253592"
+     inkscape:cy="0.82680268"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302-4"
+       width="16.000004"
+       height="16.000004"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       ry="2.0000398" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#006400;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.99999993,1041.8539 7.00000297,-4 7.0000021,4"
+       id="path4209-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 2.3191549,1045.7896 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.92e-4,0.013 -3.92e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,4.5316 3.059324,0 0,-4.5316 0.541491,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032026,-1.2024 l -3.936449,0 z"
+       id="path3772-4-3-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccsscc" />
+    <ellipse
+       ry="1.3232441"
+       rx="1.323227"
+       cy="1044.0004"
+       cx="4.2876902"
+       id="ellipse4298-7"
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 11.692867,1045.876 c -0.571473,0 -0.626766,0.1653 -0.945235,0.4837 l -2.5653285,3.0191 c -0.4785,0.5705 0.3208816,1.1982 0.8152486,0.5988 l 1.8547409,-2.0629 0,4.5316 2.573188,0 0,-6.5703 z"
+       id="path3772-4-3-5-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <ellipse
+       ry="1.3232443"
+       rx="1.3232273"
+       cy="1044.269"
+       cx="12.102254"
+       id="ellipse4298-0-0"
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:#3771c8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.325657,1040.7157 0,2.4962 3.387938,0 0,-1 -1.981068,-0.017 z"
+       id="path4224-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/social_facility/outreach.svg
===================================================================
--- /trunk/images/presets/social_facility/outreach.svg	(revision 10565)
+++ /trunk/images/presets/social_facility/outreach.svg	(revision 10565)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="social_facility__outreach.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="21.032665"
+     inkscape:cx="10.173775"
+     inkscape:cy="7.1426501"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="2.0000393" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+       d="m 6.0314662,1040.5085 c -0.571473,0 -1.031173,0.5365 -1.031173,1.2025 l 0,0.6846 c -3.92e-4,0.013 -3.92e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.962812,0.7514 0.953685,0 l 0,-3.9584 0.491463,0 0,4.5316 3.059322,0 0,-4.5316 0.5414898,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.0320248,-1.2024 l -3.936447,0 z"
+       id="path3772-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccsscc" />
+    <path
+       style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd"
+       inkscape:connector-curvature="0"
+       id="path4358"
+       d="m 11.97686,1049.6284 c -4.022971,0.9453 -7.3800062,-1.5272 -7.9768598,-4.5436 3.5301755,-0.4888 5.1686099,3.3454 7.9768598,4.5436 z"
+       sodipodi:nodetypes="ccc" />
+    <ellipse
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4211"
+       cx="8.000001"
+       cy="1038.6854"
+       rx="1.3232263"
+       ry="1.3232434" />
+    <path
+       d="m 7.4293712,1049.3137 c -2.8678269,0.5504 -4.1366914,-2.7034 -6.1092282,-3.8915 2.8903702,-0.5473 4.0231699,2.7961 6.1092282,3.8915 z"
+       id="path13"
+       inkscape:connector-curvature="0"
+       style="clip-rule:evenodd;fill-rule:evenodd;fill:#008000;fill-opacity:1" />
+    <path
+       d="m 10.085452,1049.3137 c -2.8130786,0.7556 -4.0135081,-2.3039 -5.5778506,-3.632 2.4684889,-0.3908 3.6141705,2.6742 5.5778506,3.632 z"
+       id="path15"
+       inkscape:connector-curvature="0"
+       style="clip-rule:evenodd;fill-rule:evenodd;fill:#008000;fill-opacity:1" />
+    <path
+       d="m 16.000003,1047.6442 0,4.7179 c -4.267926,-0.5583 -7.0105355,0.5619 -9.985443,-0.5853 -2.5852309,-0.9971 -3.7992879,-2.4057 -5.5754397,-4.1298 -0.67010537,-0.6505 -0.47054745,-1.0383 -0.0812025,-1.2438 1.0797932,-0.5699 3.1328208,2.9899 5.7430103,3.6889 2.9950355,0.8029 4.3147829,-0.6661 8.2888399,-0.089 -0.309083,-2.6632 -4.025586,-0.026 -4.025586,-2.0598 0,-1.5727 4.851385,-0.7379 5.635821,-0.2991 z"
+       id="path17"
+       inkscape:connector-curvature="0"
+       style="clip-rule:evenodd;fill-rule:evenodd;fill:#008000;fill-opacity:1"
+       sodipodi:nodetypes="cccssccsc" />
+  </g>
+</svg>
Index: /trunk/images/presets/social_facility/shelter.svg
===================================================================
--- /trunk/images/presets/social_facility/shelter.svg	(revision 10565)
+++ /trunk/images/presets/social_facility/shelter.svg	(revision 10565)
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="social_facility__shelter.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-2.9926547"
+     inkscape:cy="7.2961663"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4302"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621"
+       ry="2.0000393" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#006400;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0.9999996,1041.8539 7.0000014,-4 7.000001,4"
+       id="path4209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:45;marker:none;enable-background:accumulate"
+       d="m 6.0314654,1045.7896 c -0.5714732,0 -1.0311733,0.5365 -1.0311733,1.2025 l 0,0.6846 c -3.916e-4,0.013 -3.916e-4,0.026 0,0.039 l 0,0.1148 0,3.9584 c -0.0091,0.7514 0.9628123,0.7514 0.9536853,0 l 0,-3.9584 0.4914631,0 0,4.5316 3.0593235,0 0,-4.5316 0.54149,0 0,3.9584 c -0.0092,0.7514 0.962855,0.7514 0.953685,0 l 0,-4.0735 0,-0.7235 c 0,-0.6658 -0.460553,-1.2024 -1.032025,-1.2024 l -3.9364486,0 z"
+       id="path3772-4-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccccccccccccccsscc" />
+    <ellipse
+       ry="1.3232439"
+       rx="1.3232268"
+       cy="1044.0004"
+       cx="8.000001"
+       id="ellipse4298"
+       style="opacity:1;fill:#3771c8;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/sport/billiards.svg
===================================================================
--- /trunk/images/presets/sport/billiards.svg	(revision 10565)
+++ /trunk/images/presets/sport/billiards.svg	(revision 10565)
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+    xmlns:ns1="http://sozi.baierouge.fr"
+    xmlns:cc="http://creativecommons.org/ns#"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    id="svg2"
+    sodipodi:docname="8ball.svg"
+    viewBox="0 0 598.14 598.14"
+    version="1.1"
+    inkscape:version="0.48.2 r9819"
+  >
+  <defs
+      id="defs4"
+    >
+    <linearGradient
+        id="linearGradient3787"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop3789"
+          style="stop-color:#ffffff"
+          offset="0"
+      />
+      <stop
+          id="stop3791"
+          style="stop-color:#ffffff;stop-opacity:0"
+          offset="1"
+      />
+    </linearGradient
+    >
+    <radialGradient
+        id="radialGradient3779"
+        gradientUnits="userSpaceOnUse"
+        cy="511.2"
+        cx="223.33"
+        gradientTransform="matrix(-2.4818 1.7063 -2.3828 -3.4659 2035.2 1825.9)"
+        r="299.07"
+        inkscape:collect="always"
+      >
+      <stop
+          id="stop3775"
+          style="stop-color:#502d16"
+          offset="0"
+      />
+      <stop
+          id="stop3777"
+          style="stop-color:#000000"
+          offset="1"
+      />
+    </radialGradient
+    >
+    <linearGradient
+        id="linearGradient3793"
+        y2="520.93"
+        xlink:href="#linearGradient3787"
+        gradientUnits="userSpaceOnUse"
+        x2="397.14"
+        y1="-436.21"
+        x1="71.429"
+        inkscape:collect="always"
+    />
+    <linearGradient
+        id="linearGradient3797"
+        y2="113.74"
+        xlink:href="#linearGradient3787"
+        gradientUnits="userSpaceOnUse"
+        x2="278.92"
+        y1="706.45"
+        x1="439.7"
+        inkscape:collect="always"
+    />
+  </defs
+  >
+  <sodipodi:namedview
+      id="base"
+      bordercolor="#666666"
+      inkscape:pageshadow="2"
+      inkscape:window-y="0"
+      fit-margin-left="0"
+      pagecolor="#ffffff"
+      fit-margin-top="0"
+      inkscape:window-maximized="0"
+      inkscape:zoom="0.35"
+      inkscape:window-x="0"
+      inkscape:window-height="942"
+      showgrid="false"
+      borderopacity="1.0"
+      inkscape:current-layer="layer1"
+      inkscape:cx="256.92857"
+      inkscape:cy="274.78575"
+      fit-margin-right="0"
+      fit-margin-bottom="0"
+      inkscape:window-width="1680"
+      inkscape:pageopacity="0.0"
+      inkscape:document-units="px"
+  />
+  <g
+      id="layer1"
+      inkscape:label="Layer 1"
+      inkscape:groupmode="layer"
+      transform="translate(-68.071 -209.01)"
+    >
+    <path
+        id="path2985"
+        sodipodi:rx="298.57144"
+        sodipodi:ry="298.57144"
+        style="fill-rule:evenodd;stroke:#000000;stroke-width:1px;fill:url(#radialGradient3779)"
+        sodipodi:type="arc"
+        d="m677.14 539.51c0 164.9-133.67 298.57-298.57 298.57s-298.57-133.68-298.57-298.57c0-164.9 133.67-298.58 298.57-298.58s298.57 133.67 298.57 298.57z"
+        transform="translate(-11.429 -31.429)"
+        sodipodi:cy="539.50507"
+        sodipodi:cx="378.57144"
+    />
+    <path
+        id="path2991"
+        sodipodi:rx="182.85715"
+        sodipodi:ry="182.85715"
+        style="fill:url(#linearGradient3797)"
+        sodipodi:type="arc"
+        d="m625.71 678.08a182.86 182.86 0 1 1 -365.71 0 182.86 182.86 0 1 1 365.71 0z"
+        transform="matrix(.90625 0 0 .90625 2.0893 -66.43)"
+        sodipodi:cy="678.07648"
+        sodipodi:cx="442.85715"
+    />
+    <text
+        id="text2993"
+        style="font-size:217.54px;font-family:Sans;letter-spacing:0px;line-height:125%;word-spacing:0px;fill:#000000"
+        xml:space="preserve"
+        y="636.99103"
+        x="334.27731"
+        sodipodi:linespacing="125%"
+      >
+      <tspan
+          id="tspan2995"
+          sodipodi:role="line"
+          x="334.27731"
+          y="636.99103"
+        >8</tspan
+      >
+    </text
+    >
+    <path
+        id="path3784"
+        sodipodi:nodetypes="sssss"
+        style="fill-rule:evenodd;stroke-width:0;fill:url(#linearGradient3793)"
+        inkscape:connector-curvature="0"
+        d="m633.13 402.75c0 94.1-128.91 107.53-263.19 107.53s-271.64-13.426-271.64-107.53c0-94.1 134.57-193.24 268.84-193.24 134.28 0 265.98 99.14 265.98 193.24z"
+    />
+  </g
+  >
+  <metadata
+    >
+    <rdf:RDF
+      >
+      <cc:Work
+        >
+        <dc:format
+          >image/svg+xml</dc:format
+        >
+        <dc:type
+            rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+        />
+        <cc:license
+            rdf:resource="http://creativecommons.org/licenses/publicdomain/"
+        />
+        <dc:publisher
+          >
+          <cc:Agent
+              rdf:about="http://openclipart.org/"
+            >
+            <dc:title
+              >Openclipart</dc:title
+            >
+          </cc:Agent
+          >
+        </dc:publisher
+        >
+      </cc:Work
+      >
+      <cc:License
+          rdf:about="http://creativecommons.org/licenses/publicdomain/"
+        >
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Reproduction"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#Distribution"
+        />
+        <cc:permits
+            rdf:resource="http://creativecommons.org/ns#DerivativeWorks"
+        />
+      </cc:License
+      >
+    </rdf:RDF
+    >
+  </metadata
+  >
+</svg
+>
Index: /trunk/images/presets/sport/canoe.svg
===================================================================
--- /trunk/images/presets/sport/canoe.svg	(revision 10565)
+++ /trunk/images/presets/sport/canoe.svg	(revision 10565)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="471.17099"
+   height="413.276"
+   viewBox="0 0 471.17099 413.276"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="21097.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs19">
+	
+
+		
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview17"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="0.57543862"
+   inkscape:cx="240.62476"
+   inkscape:cy="156.25044"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg2" />
+
+<circle
+   cx="215.743"
+   cy="127.07"
+   r="43.708"
+   id="circle11"
+   sodipodi:cx="215.743"
+   sodipodi:cy="127.07"
+   sodipodi:rx="43.708"
+   sodipodi:ry="43.708"
+   style="fill:#501616"
+   transform="translate(-54.414,-83.362)" /><path
+   d="m 29.006,320.026 c 9.039,-4.176 19.279,-6.637 29.863,-6.637 10.583,0 20.823,2.46 29.806,6.637 8.867,3.947 18.764,6.235 29.119,6.235 10.297,0 20.194,-2.288 29.005,-6.235 8.981,-4.176 19.222,-6.637 29.862,-6.637 10.64,0 20.767,2.46 29.863,6.637 8.753,3.947 18.707,6.235 29.005,6.235 10.297,0 20.251,-2.288 29.004,-6.235 9.097,-4.176 19.279,-6.637 29.921,-6.637 10.641,0 20.767,2.46 29.806,6.637 8.867,3.947 18.764,6.235 29.062,6.235 10.355,0 20.194,-2.288 29.063,-6.235 8.981,-4.176 19.222,-6.637 29.806,-6.637 9.096,0 17.906,1.717 25.915,4.863 12.986,-14.188 20.996,-33.066 20.996,-53.719 0,-44.051 -35.642,-79.692 -79.635,-79.692 l -8.925,0.973 c -9.782,39.703 -49.485,41.42 -49.485,41.42 l -181.809,-0.058 -15.218,-8.925 36.671,-61.499 40.104,23.169 c 24.027,15.562 36.556,-6.235 36.556,-6.235 l 40.218,-65.561 C 295.085,79.635 257.957,56.809 240.622,85.413 L 212.476,131.408 145.542,94.394 C 99.146,68.536 79.523,111.385 79.523,111.385 l -52.577,90.047 c -8.924,18.707 -0.973,26.773 -0.973,26.773 L 0,228.148 v 98.17 h 0.114 c 10.243,0.001 20.082,-2.345 28.892,-6.292 z"
+   id="path13"
+   inkscape:connector-curvature="0"
+   style="fill:#501616" /><path
+   d="m 442.224,363.504 c -9.097,-4.177 -19.223,-6.637 -29.92,-6.637 -10.584,0 -20.824,2.46 -29.806,6.637 -8.867,3.947 -18.707,6.293 -29.063,6.293 -10.298,0 -20.194,-2.346 -29.062,-6.293 -9.039,-4.177 -19.165,-6.637 -29.806,-6.637 -10.641,0 -20.824,2.46 -29.92,6.637 -8.753,3.947 -18.708,6.293 -29.005,6.293 -10.298,0 -20.252,-2.346 -29.005,-6.293 -9.097,-4.177 -19.223,-6.637 -29.863,-6.637 -10.64,0 -20.881,2.46 -29.862,6.637 -8.811,3.947 -18.707,6.293 -29.005,6.293 -10.354,0 -20.252,-2.346 -29.119,-6.293 -8.981,-4.177 -19.223,-6.637 -29.806,-6.637 -10.584,0 -20.824,2.46 -29.863,6.637 -8.81,3.947 -18.707,6.293 -29.005,6.293 v 43.479 c 10.298,0 20.195,-2.288 29.005,-6.236 9.039,-4.176 19.279,-6.636 29.863,-6.636 10.583,0 20.824,2.46 29.806,6.636 8.867,3.948 18.765,6.236 29.119,6.236 10.298,0 20.194,-2.288 29.005,-6.236 8.981,-4.176 19.165,-6.636 29.862,-6.636 10.584,0 20.767,2.46 29.863,6.636 8.753,3.948 18.707,6.236 29.005,6.236 10.297,0 20.252,-2.288 29.005,-6.236 9.096,-4.176 19.222,-6.636 29.92,-6.636 10.583,0 20.767,2.46 29.806,6.636 8.867,3.948 18.764,6.236 29.062,6.236 10.355,0 20.195,-2.288 29.063,-6.236 8.981,-4.176 19.165,-6.636 29.806,-6.636 10.641,0 20.823,2.46 29.92,6.636 8.753,3.948 18.65,6.236 28.947,6.236 v -43.479 c -10.297,0 -20.194,-2.346 -28.947,-6.293 z"
+   id="path15"
+   inkscape:connector-curvature="0"
+   style="fill:#0000ff" />
+</svg>
Index: /trunk/images/presets/sport/golf.svg
===================================================================
--- /trunk/images/presets/sport/golf.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf.svg	(revision 10565)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="479.32132"
+   height="510.47299"
+   viewBox="0 0 479.32132 510.47299"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="21011.svg"><metadata
+   id="metadata21"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs19">
+	
+
+		
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview17"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="0.8137931"
+   inkscape:cx="317.09017"
+   inkscape:cy="182.51276"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg2" />
+
+<polygon
+   points="83.081,58.995 83.081,46.44 50.339,46.44 50.339,534.896 83.081,534.896 83.081,185.056 244.864,119.197 "
+   id="polygon11"
+   style="fill:#ff0000"
+   transform="translate(-50.339,-34.763)" /><path
+   d="m 313.098,149.709 c 7.559,-7.174 11.338,-15.989 11.338,-26.446 0,-10.469 -3.779,-19.29 -11.338,-26.465 -7.559,-7.174 -16.572,-10.761 -27.041,-10.761 -10.457,0 -19.37,3.587 -26.739,10.761 -7.369,7.175 -11.054,15.996 -11.054,26.465 0,10.457 3.685,19.272 11.054,26.446 7.369,7.174 16.282,10.762 26.739,10.761 10.468,0 19.482,-3.587 27.041,-10.761 z"
+   id="path13"
+   inkscape:connector-curvature="0"
+   style="fill:#a05a2c" /><path
+   d="m 479.086,159.884 c -1.159,-5.039 -4.063,-9.304 -8.712,-12.793 L 247.11,0 226.759,29.648 c -5.039,6.979 -3.874,12.989 3.495,18.027 6.968,4.259 12.97,3.094 18.009,-3.495 l 11.64,-17.441 181.39,119.199 -148.245,26.739 c -5.43,1.159 -9.792,3.969 -13.086,8.428 -3.294,4.46 -4.167,9.209 -2.617,14.248 l 31.974,125.001 -104.65,156.407 c -1.939,3.478 -2.909,7.156 -2.909,11.036 0,6.199 2.229,11.527 6.689,15.987 4.459,4.459 9.788,6.688 15.986,6.689 8.138,-0.001 14.727,-3.874 19.765,-11.622 l 109.299,-164.552 5.82,22.677 -16.271,123.262 c -0.78,6.199 0.574,11.723 4.063,16.572 3.489,4.849 8.333,7.854 14.532,9.014 6.21,1.159 11.929,-0.101 17.157,-3.779 5.228,-3.678 8.233,-8.623 9.014,-14.833 l 16.857,-126.155 c 0.39,-4.27 0.006,-8.729 -1.153,-13.378 l -37.226,-148.264 97.109,-17.441 c 5.038,-0.769 9.107,-3.383 12.207,-7.843 3.099,-4.458 4.258,-9.207 3.478,-14.247 z"
+   id="path15"
+   inkscape:connector-curvature="0"
+   style="fill:#a05a2c" />
+</svg>
Index: /trunk/images/presets/sport/golf/bunker.svg
===================================================================
--- /trunk/images/presets/sport/golf/bunker.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/bunker.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="102"
+   height="102"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="pin.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="45.771857"
+     inkscape:cy="-60.692427"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-354.56025,-169.09633)">
+    <g
+       id="g3033"
+       transform="translate(353.12275,167.65883)">
+      <path
+         id="path3035"
+         d="m 22.429134,2.4448819 60.023622,0 c 11.055118,0 19.984254,8.9291341 19.984254,19.9842521 l 0,60.023622 c 0,11.055118 -8.929136,19.984254 -19.984254,19.984254 l -60.023622,0 c -11.055118,0 -19.9842521,-8.929136 -19.9842521,-19.984254 l 0,-60.023622 c 0,-11.055118 8.9291341,-19.9842521 19.9842521,-19.9842521 z"
+         style="fill:#a8fa8b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98425198px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3037"
+         d="M 98.43307,63.248031 C 96.590551,71.858267 78.838582,62.681102 68.031496,65.232283 58.96063,67.393701 66.366141,91.062992 54.744094,87.838582 40.96063,84.047244 39.791338,66.259842 32.562992,58.003937 26.433071,50.952756 13.181102,49.748031 9.9921259,41.988189 6.4133858,33.271653 12.401575,24.377953 22.216535,24.590551 c 16.334646,0.318898 19.346457,15.69685 32.456693,16.61811 37.133858,2.586614 47.125982,6.200788 43.759842,22.03937 z"
+         style="fill:#fae675;fill-opacity:1;fill-rule:nonzero;stroke:#037200;stroke-width:1.59448814px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/driving_range.svg
===================================================================
--- /trunk/images/presets/sport/golf/driving_range.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/driving_range.svg	(revision 10565)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16.000002"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="bunker.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="16.818484"
+     inkscape:cy="4.5807355"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3033"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-0.015255946px"
+       originy="-0.0083663458px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-354.57551,-255.08796)">
+    <g
+       id="g3033"
+       transform="translate(353.12275,167.65883)">
+      <path
+         id="path3035"
+         d="m 4.7439303,87.584796 9.4176517,0 c 1.734537,0 3.13551,1.400973 3.13551,3.135511 l 0,9.417653 c 0,1.73454 -1.400973,3.13551 -3.13551,3.13551 l -9.4176517,0 c -1.7345378,0 -3.1355107,-1.40097 -3.1355107,-3.13551 l 0,-9.417653 c 0,-1.734538 1.4009729,-3.135511 3.1355107,-3.135511 z"
+         style="fill:#2c9e06;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.31132731px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 6.1875,101.40625 c -2.0310146,-3.586912 -2.9025066,-7.40966 0,-12"
+         id="path2993"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+         transform="translate(1.4375,1.4375)" />
+      <path
+         transform="translate(-1.5625,3.4375)"
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867-7"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
+      <path
+         transform="translate(2.4375,5.4375)"
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867-7-6"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
+      <path
+         transform="translate(-1.5625,7.4375)"
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867-7-1"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
+      <path
+         transform="translate(3.4375,11.4375)"
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867-7-4"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
+      <path
+         transform="translate(4.4375,8.4375)"
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867-7-2"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
+      <path
+         transform="translate(4.4375,2.4375)"
+         sodipodi:type="arc"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="path3867-7-3"
+         sodipodi:cx="11"
+         sodipodi:cy="89"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 12,89 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/fairway.svg
===================================================================
--- /trunk/images/presets/sport/golf/fairway.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/fairway.svg	(revision 10565)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="104.88"
+   height="104.88"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="green.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-4">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-0" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="17.365857"
+     inkscape:cy="69.463743"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-382.96625,-296.3725)">
+    <rect
+       style="color:#000000;fill:#a8fa8b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5347-4);enable-background:accumulate"
+       id="rect5846"
+       width="100"
+       height="100"
+       x="385.40948"
+       y="298.81348"
+       ry="20"
+       rx="20"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\fairway.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <path
+       inkscape:export-ydpi="54.919907"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\fairway.png"
+       sodipodi:nodetypes="ssccss"
+       inkscape:connector-curvature="0"
+       id="path5848"
+       d="m 470.14991,314.36019 c 8.07203,14.09444 -28.59157,25.17714 -34.39798,29.99967 -7.16356,5.94972 9.33577,47.81689 -13.05094,46.60168 -28.97168,-10.24546 -10.04074,-31.82955 -11.4931,-57.11122 1.18769,-12.21842 11.56862,-18.10945 18.92119,-19.02394 7.66324,-0.95313 33.34638,-12.12033 40.02083,-0.46619 z"
+       style="color:#000000;fill:#2c9e06;fill-opacity:1;stroke:#037200;stroke-width:1.61988366;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/golf.svg
===================================================================
--- /trunk/images/presets/sport/golf/golf.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/golf.svg	(revision 10565)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="104.88"
+   height="104.88"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-66.84125"
+     inkscape:cy="-81.859683"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="463"
+     inkscape:window-height="453"
+     inkscape:window-x="150"
+     inkscape:window-y="150"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-441.84125,-345.6225)">
+    <rect
+       style="opacity:0.86386617;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.54900002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5622"
+       width="61.366768"
+       height="38.890873"
+       x="449.42041"
+       y="403.92032"
+       rx="20"
+       ry="20"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\golf.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <rect
+       style="color:#000000;fill:#2c9e06;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5347);enable-background:accumulate"
+       id="rect3007"
+       width="100"
+       height="100"
+       x="444.28571"
+       y="348.07648"
+       ry="20"
+       rx="20"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\golf.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.54068196;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5351"
+       sodipodi:cx="155.71428"
+       sodipodi:cy="207.71933"
+       sodipodi:rx="30.714285"
+       sodipodi:ry="10.357142"
+       d="m 186.42856,207.71933 c 0,5.72009 -13.75125,10.35714 -30.71428,10.35714 -16.96303,0 -30.71429,-4.63705 -30.71429,-10.35714 0,-5.72009 13.75126,-10.35714 30.71429,-10.35714 16.96303,0 30.71428,4.63705 30.71428,10.35714 z"
+       transform="matrix(0.88250467,0,0,0.84551904,349.48243,252.12946)"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\golf.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.52788104;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.54900002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5685);enable-background:accumulate"
+       id="path5627"
+       sodipodi:cx="66.038719"
+       sodipodi:cy="110.39494"
+       sodipodi:rx="11.995562"
+       sodipodi:ry="3.2829957"
+       d="m 78.034281,110.39494 c 0,1.81315 -5.370596,3.283 -11.995562,3.283 -6.624966,0 -11.995561,-1.46985 -11.995561,-3.283 0,-1.81315 5.370595,-3.28299 11.995561,-3.28299 6.624966,0 11.995562,1.46984 11.995562,3.28299 z"
+       transform="matrix(1.9338771,0,0,1.5693135,358.46983,254.64499)"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\golf.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#555555;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5353"
+       sodipodi:cx="70.714287"
+       sodipodi:cy="189.50504"
+       sodipodi:rx="13.571428"
+       sodipodi:ry="13.571428"
+       d="m 84.285715,189.50504 c 0,7.49529 -6.076135,13.57142 -13.571428,13.57142 -7.495293,0 -13.571428,-6.07613 -13.571428,-13.57142 0,-7.4953 6.076135,-13.57143 13.571428,-13.57143 7.495293,0 13.571428,6.07613 13.571428,13.57143 z"
+       transform="matrix(0.75728873,0,0,0.75728873,471.07502,266.88949)"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\golf.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <g
+       id="g5456"
+       transform="matrix(1.0720344,0,0,1.0720344,413.11861,307.28044)"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\golf.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 58.230403,46.766947 c -0.931851,0 -1.65788,1.006862 -1.65788,2.257538 l 0,61.553155 c 0,1.25068 0.726029,2.25754 1.65788,2.25754 0.93185,0 1.693153,-1.00686 1.693153,-2.25754 l 0,-41.411684 L 91.03525,57.066964 59.817734,48.283731 c -0.227923,-0.883475 -0.849617,-1.516784 -1.587331,-1.516784 z"
+         id="path5454"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5409"
+         d="m 57.802599,46.423856 c -0.931851,0 -1.657879,1.006862 -1.657879,2.257538 l 0,61.553186 c 0,1.25067 0.726028,2.25753 1.657879,2.25753 0.931851,0 1.693154,-1.00686 1.693154,-2.25753 l 0,-41.411715 L 90.607447,56.723873 59.38993,47.940639 c -0.227923,-0.883475 -0.849616,-1.516783 -1.587331,-1.516783 z"
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/green.svg
===================================================================
--- /trunk/images/presets/sport/golf/green.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/green.svg	(revision 10565)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="102"
+   height="102"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="lateral_water_hazard.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-4.7728035"
+     inkscape:cy="25.105933"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-405.10491,-254.89469)">
+    <g
+       id="g3119"
+       transform="translate(403.66741,253.45719)">
+      <path
+         id="path3121"
+         d="m 22.429134,2.4448819 60.023622,0 c 11.055118,0 19.984254,8.9291341 19.984254,19.9842521 l 0,60.023622 c 0,11.055118 -8.929136,19.984254 -19.984254,19.984254 l -60.023622,0 c -11.055118,0 -19.9842521,-8.929136 -19.9842521,-19.984254 l 0,-60.023622 c 0,-11.055118 8.9291341,-19.9842521 19.9842521,-19.9842521 z"
+         style="fill:#a8fa8b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98425198px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3123"
+         d="M 88.937008,67.429134 C 85.606299,75.57874 74.728346,94.464567 63.637795,95.066929 54.318897,95.562992 21.862205,72.070866 15.377953,61.901575 -0.21259842,37.38189 25.15748,14.846457 36.389764,15.980315 c 26.53937,2.728346 58.677165,36.496063 52.547244,51.448819 z"
+         style="fill:#2c9e06;fill-opacity:1;fill-rule:nonzero;stroke:#037200;stroke-width:1.41732287px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3125"
+         d="m 59.988189,10.771654 c -0.673229,0 -1.240158,0.744094 -1.240158,1.665354 l 0,45.389763 c 0,0.92126 0.566929,1.665355 1.240158,1.665355 0.673228,0 1.240157,-0.744095 1.240157,-1.665355 l 0,-30.543307 22.925197,-8.8937 -22.996063,-6.484252 c -0.177165,-0.637796 -0.637795,-1.133858 -1.169291,-1.133858 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.67322832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3127"
+         d="m 59.669291,10.523622 c -0.673228,0 -1.204724,0.744094 -1.204724,1.665354 l 0,45.389764 c 0,0.92126 0.531496,1.665354 1.204724,1.665354 0.673228,0 1.240158,-0.744094 1.240158,-1.665354 l 0,-30.543307 22.925196,-8.929134 -22.996063,-6.448819 c -0.177165,-0.673228 -0.637795,-1.133858 -1.169291,-1.133858 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.67322832px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/hole.svg
===================================================================
--- /trunk/images/presets/sport/golf/hole.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/hole.svg	(revision 10565)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="102"
+   height="102"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="bunker.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="34.145847"
+     inkscape:cy="-138.9954"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-366.18626,-90.793358)">
+    <g
+       id="g3050"
+       transform="translate(364.74876,89.355858)">
+      <path
+         id="path3052"
+         d="m 22.429134,2.4448819 60.023622,0 c 11.055118,0 19.984254,8.9291341 19.984254,19.9842521 l 0,60.023622 c 0,11.055118 -8.929136,19.984254 -19.984254,19.984254 l -60.023622,0 c -11.055118,0 -19.9842521,-8.929136 -19.9842521,-19.984254 l 0,-60.023622 c 0,-11.055118 8.9291341,-19.9842521 19.9842521,-19.9842521 z"
+         style="fill:#a8fa8b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98425198px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3054"
+         d="m 19.73622,58.96063 c 0,3.259842 -2.65748,5.917322 -5.917322,5.917322 -3.259843,0 -5.9173232,-2.65748 -5.9173232,-5.917322 0,-3.259843 2.6574802,-5.88189 5.9173232,-5.88189 3.259842,0 5.917322,2.622047 5.917322,5.88189 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#555555;stroke-width:0.85039371px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3056"
+         d="m 11.480315,67.818897 4.854331,0 0,16.547244 -2.515748,3.862205 -2.338583,-3.862205 z"
+         style="fill:#c5ad09;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3058"
+         d="m 9.7440944,64.594488 c 1.8779526,2.161417 1.3110236,1.523622 1.6653546,3.330709 0,0 0,0 0,0 l 0,16.511811 2.338582,3.897637 2.515748,-3.897637 0,-16.511811 0,0 c 0.354331,-1.700788 -0.106299,-1.133859 1.629922,-3.330709 l -8.1496066,0 z"
+         style="fill:none;stroke:#000000;stroke-width:0.35433072px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3060"
+         d="m 79.334645,9.6377952 c -0.46063,0 -0.850393,0.4960628 -0.850393,1.1338588 l 0,31.641732 c 0,0.637795 0.389763,1.133858 0.850393,1.133858 0.496063,0 0.885827,-0.496063 0.885827,-1.133858 l 0,-21.295276 15.980315,-6.200787 -16.051181,-4.5 C 80.043307,9.9566929 79.724409,9.6377952 79.334645,9.6377952 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46062991px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3062"
+         d="m 79.122047,9.4606299 c -0.46063,0 -0.850394,0.496063 -0.850394,1.1338581 l 0,31.641732 c 0,0.637796 0.389764,1.133859 0.850394,1.133859 0.496063,0 0.885827,-0.496063 0.885827,-1.133859 l 0,-21.295275 15.980315,-6.200788 -16.051181,-4.5 C 79.830708,9.7795275 79.511811,9.4606299 79.122047,9.4606299 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.46062991px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3064"
+         d="m 16.476378,87.944882 c 0,0 27.956693,-1.240158 32.88189,-9.56693 3.649606,-6.200787 -18.212599,-31.03937 -13.464567,-36.389763 7.122047,-8.007874 45.850393,5.633858 45.850393,5.633858"
+         style="fill:none;stroke:#000000;stroke-width:4.99606276px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:9.9921259, 9.9921259;stroke-dashoffset:0"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3066"
+         d="m 91.240157,74.232283 c -0.708661,3.295276 -7.511811,-0.212598 -11.65748,0.779528 -3.472441,0.81496 -0.637795,9.885826 -5.102362,8.681102 -5.279528,-1.488189 -5.740158,-8.291338 -8.503937,-11.444882 -2.338583,-2.728346 -7.405512,-3.153543 -8.64567,-6.165354 -1.381889,-3.330709 0.92126,-6.732284 4.677166,-6.661417 6.271653,0.141732 7.405512,6.023622 12.437008,6.377952 14.244094,0.992126 18.070866,2.374016 16.795275,8.433071 z"
+         style="fill:#fae675;fill-opacity:1;fill-rule:nonzero;stroke:#037200;stroke-width:0.60236222px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/lateral_water_hazard.svg
===================================================================
--- /trunk/images/presets/sport/golf/lateral_water_hazard.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/lateral_water_hazard.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="102"
+   height="102"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="water_hazard.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-18.400603"
+     inkscape:cy="-65.286567"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-418.73271,-164.50219)">
+    <g
+       id="g3102"
+       transform="translate(417.29521,163.06469)">
+      <path
+         id="path3104"
+         d="m 22.429134,2.4448819 60.023622,0 c 11.055118,0 19.984254,8.9291341 19.984254,19.9842521 l 0,60.023622 c 0,11.055118 -8.929136,19.984254 -19.984254,19.984254 l -60.023622,0 c -11.055118,0 -19.9842521,-8.929136 -19.9842521,-19.984254 l 0,-60.023622 c 0,-11.055118 8.9291341,-19.9842521 19.9842521,-19.9842521 z"
+         style="fill:#f74c42;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98425198px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3106"
+         d="M 82.488189,8.1850393 C 97.405511,9.531496 89.8937,52.830708 88.61811,66.11811 87.661417,76.748031 84.153543,86.881889 77.77559,92.374015 70.653543,98.503937 59.173228,101.23228 56.267716,91.877952 51.448819,76.251968 66.437008,58.818897 66.437008,45.673228 c 0,-11.65748 -0.03543,-38.9409446 16.051181,-37.4881887 z"
+         style="fill:#4c49f8;fill-opacity:1;fill-rule:nonzero;stroke:#037200;stroke-width:1.59448814px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/pin.svg
===================================================================
--- /trunk/images/presets/sport/golf/pin.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/pin.svg	(revision 10565)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="104.88"
+   height="104.88"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="golf.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="123.05779"
+     inkscape:cy="-95.52654"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-277.27432,-131.38222)">
+    <rect
+       inkscape:export-ydpi="54.919907"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\pin.png"
+       rx="20"
+       ry="20"
+       y="133.82222"
+       x="279.71432"
+       height="100"
+       width="100"
+       id="rect5790"
+       style="color:#000000;fill:#2c9e06;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5347-1);enable-background:accumulate" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#503700;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5792"
+       sodipodi:cx="262.89221"
+       sodipodi:cy="97.768028"
+       sodipodi:rx="28.031733"
+       sodipodi:ry="11.111678"
+       d="m 290.92394,97.768028 c 0,6.136812 -12.55023,11.111682 -28.03173,11.111682 -15.4815,0 -28.03173,-4.97487 -28.03173,-11.111682 0,-6.13681 12.55023,-11.111678 28.03173,-11.111678 15.4815,0 28.03173,4.974868 28.03173,11.111678 z"
+       transform="matrix(1.4514077,0,0,1.4514077,-50.247753,42.529045)"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\pin.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.15252054;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 364.793,193.48732 c -2.88887,2.80067 -13.81594,7.22002 -33.72239,7.22002 -19.90645,0 -29.72875,-4.76668 -34.07952,-7.7288 10.17698,-9.78482 20.35376,-13.26892 35.07698,-12.98505 16.51439,0.3184 25.99414,1.7677 32.72493,13.49383 z"
+       id="path5794"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscsc"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\pin.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/rough.svg
===================================================================
--- /trunk/images/presets/sport/golf/rough.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/rough.svg	(revision 10565)
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="102"
+   height="102"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="fairway.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-4">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-0" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="105.74495"
+     inkscape:cy="-29.042284"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-294.58716,-200.74647)">
+    <g
+       id="g3155"
+       transform="translate(293.14966,199.30897)">
+      <path
+         id="path3157"
+         d="m 22.429134,2.4448819 60.023622,0 c 11.055118,0 19.984254,8.9291341 19.984254,19.9842521 l 0,60.023622 c 0,11.055118 -8.929136,19.984254 -19.984254,19.984254 l -60.023622,0 c -11.055118,0 -19.9842521,-8.929136 -19.9842521,-19.984254 l 0,-60.023622 c 0,-11.055118 8.9291341,-19.9842521 19.9842521,-19.9842521 z"
+         style="fill:#a8fa8b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98425198px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3159"
+         d="m 50.066929,91.594488 -3.401575,0 0,-54.248031 1.771654,-12.68504 1.629921,12.68504 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3161"
+         d="M 47.303149,91.417322 43.901575,91.629921 40.358268,37.488189 41.31496,24.732283 43.759842,37.27559 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3163"
+         d="m 57.188976,91.346456 -3.401575,-0.177165 2.480315,-54.177165 2.374016,-12.57874 1.062992,12.755905 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3165"
+         d="m 54.602362,90.708661 -3.401575,0 0,-54.248031 1.771654,-12.68504 1.629921,12.68504 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3167"
+         d="m 42.271653,91.098425 -3.401574,0.212598 -3.543307,-54.106299 0.956692,-12.791338 2.444882,12.543307 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3169"
+         d="m 61.405512,90.921259 -3.401575,-0.177165 2.515748,-54.177165 2.338582,-12.57874 1.062993,12.720472 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3171"
+         d="M 64.169291,90.885826 60.767716,90.531496 66.11811,36.566929 69.129921,24.129921 69.484252,36.92126 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3173"
+         d="m 64.842519,73.842519 c 0,7.759843 -6.271653,14.031496 -14.031496,14.031496 -7.759842,0 -14.031496,-6.271653 -14.031496,-14.031496 0,-7.759842 6.271654,-14.031496 14.031496,-14.031496 7.759843,0 14.031496,6.271654 14.031496,14.031496 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#555555;stroke-width:2.05511808px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3175"
+         d="m 75.082677,91.098425 -3.437008,0 0.03543,-54.248031 1.736221,-12.68504 1.665354,12.68504 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3177"
+         d="M 72.318897,90.921259 68.917323,91.133858 65.374015,36.992126 66.295275,24.23622 68.77559,36.779527 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3179"
+         d="m 82.204724,90.850393 -3.437008,-0.177165 2.515748,-54.177165 2.338583,-12.57874 1.062992,12.720472 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3181"
+         d="m 79.582677,90.212598 -3.401575,0 0,-54.248031 1.771654,-12.68504 1.629921,12.68504 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3183"
+         d="M 67.287401,90.602362 63.885827,90.81496 60.342519,36.673228 61.263779,23.917323 63.744094,36.46063 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3185"
+         d="M 86.421259,90.389763 83.019685,90.248031 85.5,36.070866 l 2.374015,-12.57874 1.027559,12.720472 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3187"
+         d="M 89.149606,90.389763 85.748031,90.035433 91.098425,36.070866 94.110236,23.633858 94.5,36.389764 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3189"
+         d="m 24.094488,90.602362 -3.437008,0 0,-54.248031 1.771654,-12.68504 1.665354,12.68504 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3191"
+         d="m 21.295276,90.425196 -3.401575,0.212599 -3.543307,-54.141732 0.956693,-12.755906 2.444881,12.543307 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3193"
+         d="M 31.181102,90.35433 27.779527,90.177165 30.295275,36 32.633858,23.42126 33.69685,36.141732 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3195"
+         d="m 28.594488,89.716535 -3.401575,0 0,-54.248031 1.771654,-12.68504 1.629921,12.68504 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3197"
+         d="M 16.263779,90.106299 12.862205,90.318897 9.3188976,36.177165 10.275591,23.42126 12.720472,35.964567 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3199"
+         d="m 35.433071,89.8937 -3.437008,-0.141732 2.515748,-54.177165 2.338583,-12.57874 1.062992,12.720472 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3201"
+         d="m 38.161417,89.8937 -3.401575,-0.35433 5.350394,-53.964567 3.011811,-12.437008 0.389764,12.755906 z"
+         style="fill:#1f6d04;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/tee.svg
===================================================================
--- /trunk/images/presets/sport/golf/tee.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/tee.svg	(revision 10565)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="104.88"
+   height="104.88"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="rough.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-4">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5732"
+       id="linearGradient5766"
+       gradientUnits="userSpaceOnUse"
+       x1="135.73668"
+       y1="786.59497"
+       x2="135.85074"
+       y2="796.06512"
+       gradientTransform="matrix(1.1811017,0,0,1.1811017,28.593093,-46.764246)" />
+    <linearGradient
+       id="linearGradient5732">
+      <stop
+         style="stop-color:#594f03;stop-opacity:1"
+         offset="0"
+         id="stop5734" />
+      <stop
+         style="stop-color:#c5ad09;stop-opacity:1"
+         offset="1"
+         id="stop5736" />
+    </linearGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-9">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-4" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-112.54039"
+     inkscape:cy="-161.47375"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-512.8725,-65.435)">
+    <rect
+       style="color:#000000;fill:#a8fa8b;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5347-9);enable-background:accumulate"
+       id="rect5718"
+       width="100"
+       height="100"
+       x="515.30804"
+       y="67.888557"
+       ry="20"
+       rx="20"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\tee.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907" />
+    <path
+       inkscape:export-ydpi="54.919907"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\tee.png"
+       transform="matrix(1.0345505,0,0,1.0345505,492.44413,-104.28)"
+       d="m 84.285715,189.50504 c 0,7.49529 -6.076135,13.57142 -13.571428,13.57142 -7.495293,0 -13.571428,-6.07613 -13.571428,-13.57142 0,-7.4953 6.076135,-13.57143 13.571428,-13.57143 7.495293,0 13.571428,6.07613 13.571428,13.57143 z"
+       sodipodi:ry="13.571428"
+       sodipodi:rx="13.571428"
+       sodipodi:cy="189.50504"
+       sodipodi:cx="70.714287"
+       id="path5768"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#555555;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <g
+       id="g5748"
+       transform="matrix(1.1117036,0,0,1.1117036,427.01869,-645.74278)"
+       inkscape:export-filename="C:\Users\cdeiters\Desktop\golf\tee.png"
+       inkscape:export-xdpi="54.919907"
+       inkscape:export-ydpi="54.919907">
+      <g
+         id="g5760"
+         transform="matrix(0.76159434,0,0,0.76159434,-8.9997756,93.980999)">
+        <g
+           transform="translate(39.648487,-23.233509)"
+           id="g5744">
+          <path
+             style="color:#000000;fill:#c5ad09;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 129.29953,795.78345 13.63706,0 0,46.46702 -7.07107,10.85914 -6.56599,-10.85914 z"
+             id="rect5722"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccccc" />
+          <path
+             style="color:#000000;fill:url(#linearGradient5766);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 124.625,786.4375 c 5.37116,6.14247 3.70118,4.28544 4.6875,9.40625 l 13.625,0 c 1.01613,-4.79547 -0.26824,-3.18928 4.65625,-9.40625 z"
+             id="rect5725"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           id="path5750"
+           d="m 164.01319,763.44177 c 5.35831,6.12778 3.71616,4.29966 4.6875,9.375 0.002,0.0122 -0.002,0.019 0,0.0312 l 0,46.40625 6.5625,10.875 7.0625,-10.875 0,-46.40625 0,-0.0312 c 1.00219,-4.75171 -0.25595,-3.17355 4.65625,-9.375 l -22.96875,0 z"
+           style="color:#000000;fill:none;stroke:#000000;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/golf/water_hazard.svg
===================================================================
--- /trunk/images/presets/sport/golf/water_hazard.svg	(revision 10565)
+++ /trunk/images/presets/sport/golf/water_hazard.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="102"
+   height="102"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="hole.svg">
+  <defs
+     id="defs4">
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5685"
+       x="-0.22926316"
+       width="1.4585263"
+       y="-0.83769232"
+       height="2.6753848">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.2917836"
+         id="feGaussianBlur5687" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter5347-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.6"
+         id="feGaussianBlur5349-7" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="133.63662"
+     inkscape:cy="-48.602897"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="824"
+     inkscape:window-height="972"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-266.69549,-181.18586)">
+    <g
+       id="g3085"
+       transform="translate(265.25799,179.74836)">
+      <path
+         id="path3087"
+         d="m 22.429134,2.4448819 60.023622,0 c 11.055118,0 19.984254,8.9291341 19.984254,19.9842521 l 0,60.023622 c 0,11.055118 -8.929136,19.984254 -19.984254,19.984254 l -60.023622,0 c -11.055118,0 -19.9842521,-8.929136 -19.9842521,-19.984254 l 0,-60.023622 c 0,-11.055118 8.9291341,-19.9842521 19.9842521,-19.9842521 z"
+         style="fill:#f6ed31;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.98425198px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path3089"
+         d="M 93.437007,75.755905 C 87.484252,89.468504 48.720472,68.740157 36.496063,63.35433 26.751968,59.102362 18.177165,52.61811 14.988189,44.822834 c -3.57874,-8.681102 -2.586614,-20.444881 7.228346,-20.232283 16.334646,0.318898 28.169292,19.984252 40.641732,24.129921 11.090552,3.649607 37.027559,12.188977 30.57874,27.035433 z"
+         style="fill:#4c49f8;fill-opacity:1;fill-rule:nonzero;stroke:#037200;stroke-width:1.59448814px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/sport/miniature_golf.svg
===================================================================
--- /trunk/images/presets/sport/miniature_golf.svg	(revision 10565)
+++ /trunk/images/presets/sport/miniature_golf.svg	(revision 10565)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="518.44159"
+   height="510.47299"
+   viewBox="0 0 518.44158 510.47299"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="miniature_golf.svg"><metadata
+   id="metadata26"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs24">
+	
+
+		
+		
+	
+			
+			
+			
+		
+			
+		</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="678"
+   inkscape:window-height="453"
+   id="namedview22"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="0.28771931"
+   inkscape:cx="78.145868"
+   inkscape:cy="214.81131"
+   inkscape:window-x="662"
+   inkscape:window-y="359"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg2" />
+
+<path
+   style="opacity:1;fill:#c87137;fill-opacity:1"
+   id="path12"
+   d="m 57.79865,478.764 35.852,-235.576 28.108,-16.83 27.495,17.278 c 0,0 31.173,237.983 28.246,236.556 -2.927,-1.427 -119.116,0.714 -119.701,-1.428 l 0,0 z"
+   sodipodi:nodetypes="ccccsc"
+   inkscape:connector-curvature="0" /><path
+   style="fill:#502d16"
+   inkscape:connector-curvature="0"
+   id="path16"
+   d="m 243.12865,354.08 c -0.042,-1.88 -0.881,-3.652 -2.31,-4.875 l -96.155,-82.329 96.155,-82.328 c 1.428,-1.223 2.268,-2.996 2.31,-4.875 0.042,-1.879 -0.719,-3.688 -2.092,-4.972 l -32.625,-30.532 c -1.38,-1.292 -3.25,-1.927 -5.129,-1.755 -1.882,0.175 -3.599,1.148 -4.717,2.672 l -77,104.982 -77,-104.982 c -1.118,-1.524 -2.835,-2.497 -4.717,-2.672 -1.878,-0.172 -3.749,0.464 -5.129,1.755 L 2.0936501,174.701 c -1.37299999,1.285 -2.13299999,3.093 -2.09199999,4.972 0.041,1.879 0.881,3.652 2.30999999,4.875 L 98.46665,266.876 2.3116501,349.205 c -1.42799999,1.223 -2.26799999,2.995 -2.30999999,4.875 -0.042,1.879 0.719,3.688 2.09199999,4.972 L 34.71965,389.583 c 1.23,1.151 2.847,1.784 4.516,1.784 0.204,0 0.409,-0.01 0.613,-0.029 1.882,-0.175 3.599,-1.147 4.717,-2.672 l 77,-104.981 77,104.981 c 1.118,1.524 2.835,2.497 4.717,2.672 0.205,0.02 0.409,0.029 0.613,0.029 1.669,0 3.286,-0.633 4.516,-1.784 l 32.625,-30.531 c 1.373,-1.285 2.134,-3.093 2.092,-4.972 z m -125.753,-87.204 4.189,-4.052 4.188,4.052 -4.188,4.053 -4.189,-4.053 z" /><g
+   id="g3020"
+   style="fill:#550000"
+   transform="translate(-27.47535,-34.763)"><path
+     d="m 545.682,194.647 c -1.16,-5.038 -4.064,-9.303 -8.713,-12.793 L 313.705,34.763 293.353,64.412 c -5.039,6.979 -3.873,12.988 3.496,18.027 6.967,4.259 12.971,3.094 18.01,-3.495 L 326.498,61.502 507.889,180.701 359.643,207.44 c -5.43,1.16 -9.791,3.969 -13.086,8.429 -3.295,4.459 -4.166,9.209 -2.617,14.247 l 31.975,125.002 -104.65,156.407 c -1.939,3.478 -2.91,7.156 -2.91,11.036 0,6.198 2.23,11.527 6.689,15.987 4.459,4.459 9.787,6.688 15.986,6.688 8.139,0 14.727,-3.874 19.766,-11.622 l 109.299,-164.551 5.82,22.676 -16.271,123.263 c -0.781,6.198 0.574,11.723 4.064,16.572 3.488,4.85 8.332,7.854 14.531,9.014 6.211,1.159 11.93,-0.101 17.158,-3.779 5.228,-3.678 8.232,-8.623 9.014,-14.833 l 16.855,-126.155 c 0.391,-4.271 0.004,-8.729 -1.152,-13.378 L 432.887,234.18 529.996,216.739 c 5.039,-0.769 9.107,-3.383 12.207,-7.843 3.1,-4.459 4.258,-9.208 3.479,-14.249 z"
+     id="path18"
+     inkscape:connector-curvature="0"
+     style="fill:#550000" /><path
+     d="m 379.693,184.472 c 7.559,-7.174 11.338,-15.989 11.338,-26.446 0,-10.468 -3.779,-19.289 -11.338,-26.464 -7.561,-7.174 -16.572,-10.761 -27.041,-10.761 -10.457,0 -19.371,3.587 -26.74,10.761 -7.369,7.175 -11.053,15.996 -11.053,26.464 0,10.457 3.684,19.272 11.053,26.446 7.369,7.175 16.283,10.762 26.74,10.762 10.469,-0.001 19.481,-3.588 27.041,-10.762 z"
+     id="path20"
+     inkscape:connector-curvature="0"
+     style="fill:#550000" /></g>
+</svg>
Index: /trunk/images/presets/sport/raceway.svg
===================================================================
--- /trunk/images/presets/sport/raceway.svg	(revision 10565)
+++ /trunk/images/presets/sport/raceway.svg	(revision 10565)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="12"
+   viewBox="0 0 16 12"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_raceway3.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="6.7895181"
+     inkscape:cy="7.2392689"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1040.3621)">
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.9614873,1040.8667 c -4.6182911,0 -8.3085047,10.9954 -2.4085825,10.9954 l 8.0433382,0 c 6.032506,0 4.236777,-7.2875 0.206991,-7.2875 -4.0297858,0 -2.3062128,4.5253 -5.6649702,4.5253 -3.3587572,0 -3.2703685,-4.8523 -0.1767764,-4.8523 2.320194,0 2.5853591,-3.3809 -1e-7,-3.3809 z"
+       id="path4139"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss" />
+  </g>
+</svg>
Index: /trunk/images/presets/sport/roller_skating.svg
===================================================================
--- /trunk/images/presets/sport/roller_skating.svg	(revision 10565)
+++ /trunk/images/presets/sport/roller_skating.svg	(revision 10565)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="15.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="4.7761008"
+     inkscape:cy="1.8735611"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-621px"
+       originy="-1102px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-310.5,-485.36218)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#554400;fill-opacity:1;stroke:none"
+       id="path3757"
+       sodipodi:cx="314"
+       sodipodi:cy="499.36218"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 315,499.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="matrix(1.4,0,0,1.4,-127.6,-199.24488)" />
+    <path
+       style="fill:#800000;fill-opacity:1;stroke:none"
+       d="m 315,497.36218 7,0 c 4,0 4,-4 0,-4 l -1.5,0 c -0.5,0 -3.5,-2 -3.5,-3 l 0,-3 c 0,-2 -1,-2 -3,-2 -2,0 -3,0 -3,2 l 0,3 0,5 c 0,1 1,2 2,2 z"
+       id="path3791"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#554400;fill-opacity:1;stroke:none"
+       id="path3757-0"
+       sodipodi:cx="314"
+       sodipodi:cy="499.36218"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 315,499.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="matrix(1.4,0,0,1.4,-123.6,-199.24488)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#554400;fill-opacity:1;stroke:none"
+       id="path3757-1"
+       sodipodi:cx="314"
+       sodipodi:cy="499.36218"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 315,499.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="matrix(1.4,0,0,1.4,-119.6,-199.24489)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#554400;fill-opacity:1;stroke:none"
+       id="path3757-0-7"
+       sodipodi:cx="314"
+       sodipodi:cy="499.36218"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 315,499.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="matrix(1.4,0,0,1.4,-115.6,-199.24489)" />
+  </g>
+</svg>
Index: /trunk/images/presets/sport/running.svg
===================================================================
--- /trunk/images/presets/sport/running.svg	(revision 10565)
+++ /trunk/images/presets/sport/running.svg	(revision 10565)
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   sodipodi:docname="running-pictogram.svg"
+   viewBox="0 0 289.64 289.64"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%">
+  <defs
+     id="defs19" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="-8"
+     pagecolor="#ffffff"
+     inkscape:window-height="988"
+     inkscape:window-maximized="1"
+     inkscape:zoom="1.979899"
+     inkscape:window-x="-8"
+     showgrid="false"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="109.63379"
+     inkscape:cy="107.5452"
+     inkscape:window-width="1680"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px" />
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-152.32 -338.97)">
+    <rect
+       x="152.31735"
+       y="338.97083"
+       width="289.6449"
+       height="289.6449"
+       ry="15.000028"
+       rx="15.000028"
+       style="fill:#003366"
+       id="rect3708" />
+    <g
+       transform="matrix(0.69430089,0,0,0.74064812,64.470511,207.78538)"
+       style="fill:#eeeeee"
+       id="g3710">
+      <path
+         sodipodi:cx="245.21452"
+         sodipodi:cy="279.84802"
+         transform="translate(1.4286,-1.4286)"
+         d="m 276.27671,279.84802 c 0,17.15518 -13.90701,31.06219 -31.06219,31.06219 -17.15517,0 -31.06219,-13.90701 -31.06219,-31.06219 0,-17.15517 13.90702,-31.06219 31.06219,-31.06219 17.15518,0 31.06219,13.90702 31.06219,31.06219 z"
+         sodipodi:type="arc"
+         style="fill:#eeeeee"
+         sodipodi:ry="31.062191"
+         sodipodi:rx="31.062191"
+         id="path2908" />
+      <rect
+         x="-60.716"
+         y="407.51001"
+         width="59.051998"
+         height="132.33"
+         ry="8.4373999"
+         rx="8.4027004"
+         transform="matrix(0.68411441,-0.72937472,0.72937472,0.68411441,0,0)"
+         style="fill:#eeeeee"
+         id="rect2912" />
+      <rect
+         x="-128.07001"
+         y="363.82001"
+         width="26.429001"
+         height="80"
+         ry="8.4047003"
+         rx="8.4352999"
+         inkscape:transform-center-x="-22.142857"
+         transform="matrix(0.72671856,-0.68693532,0.68693532,0.72671856,0,0)"
+         style="fill:#eeeeee"
+         id="rect2914" />
+      <rect
+         x="-71.902"
+         y="-487.41"
+         width="26.811001"
+         height="81.237"
+         transform="matrix(-0.67101,0.74145,-0.74746,-0.6643,0,0)"
+         rx="8.3912001"
+         style="fill:#eeeeee"
+         ry="8.4502001"
+         id="rect2920" />
+      <rect
+         x="545.58002"
+         y="-22.955"
+         width="36.370998"
+         height="110.11"
+         transform="matrix(0.69576,0.71827,-0.69297,0.72097,0,0)"
+         rx="8.4087"
+         style="fill:#eeeeee"
+         ry="8.4066"
+         id="rect3694" />
+      <rect
+         x="-109.03"
+         y="410.64001"
+         width="57.143002"
+         height="28.570999"
+         ry="8.3058996"
+         rx="8.3058004"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+         style="fill:#eeeeee"
+         id="rect3698" />
+      <rect
+         x="0.22562"
+         y="406.76001"
+         width="49.285999"
+         height="30.714001"
+         ry="8.3875999"
+         rx="8.3467999"
+         transform="matrix(0.67947972,-0.73369429,0.73369429,0.67947972,0,0)"
+         style="fill:#eeeeee"
+         id="rect3700" />
+      <rect
+         x="-27.4"
+         y="590.71997"
+         width="35"
+         height="132.86"
+         ry="8.4245996"
+         rx="8.4145002"
+         transform="matrix(0.70049835,-0.71365403,0.71365403,0.70049835,0,0)"
+         style="fill:#eeeeee"
+         id="rect3702" />
+      <rect
+         x="-450.82999"
+         y="413.13"
+         width="30.714001"
+         height="72.857002"
+         ry="8.6969004"
+         rx="8.1672001"
+         transform="matrix(0.11734674,-0.993091,0.993091,0.11734674,0,0)"
+         style="fill:#eeeeee"
+         id="rect3704" />
+    </g>
+  </g>
+  <metadata
+     id="metadata17">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2010-08-04T12:55:11</dc:date>
+        <dc:description>Separate entries of sport pictogram from my set</dc:description>
+        <dc:source>https://openclipart.org/detail/77317/running-pictogram-by-shokunin</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>shokunin</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>box</rdf:li>
+            <rdf:li>boxing</rdf:li>
+            <rdf:li>fence</rdf:li>
+            <rdf:li>gym</rdf:li>
+            <rdf:li>gymnastics</rdf:li>
+            <rdf:li>jump</rdf:li>
+            <rdf:li>jumping</rdf:li>
+            <rdf:li>lifting</rdf:li>
+            <rdf:li>man</rdf:li>
+            <rdf:li>pictogram</rdf:li>
+            <rdf:li>run</rdf:li>
+            <rdf:li>running</rdf:li>
+            <rdf:li>silhouette</rdf:li>
+            <rdf:li>sports</rdf:li>
+            <rdf:li>sports2010</rdf:li>
+            <rdf:li>weight</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/images/presets/sport/scuba_diving.svg
===================================================================
--- /trunk/images/presets/sport/scuba_diving.svg	(revision 10565)
+++ /trunk/images/presets/sport/scuba_diving.svg	(revision 10565)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="83.101px"
+   viewBox="0 0 100 83.101"
+   enable-background="new 0 0 100 83.101"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="09.svg"><metadata
+   id="metadata17"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs15" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1680"
+   inkscape:window-height="988"
+   id="namedview13"
+   showgrid="true"
+   inkscape:zoom="5.6798355"
+   inkscape:cx="55.929345"
+   inkscape:cy="36.453152"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"><inkscape:grid
+     type="xygrid"
+     id="grid2994" /></sodipodi:namedview>
+<rect
+   style="fill:#556fc3;fill-opacity:1;stroke:none"
+   id="rect2996"
+   width="100"
+   height="82.924934"
+   x="0"
+   y="0.17606139"
+   transform="translate(-1.2485983e-6,0)" /><polygon
+   points="0,0 15.868,16.397 21.961,10.867 16.444,0.05 "
+   id="polygon3" />
+<path
+   d="m 66.831909,44.579594 c 3,0.834 6.223,-0.882 7.079,-3.962 0.822,-3.032 -0.929,-6.218 -3.951,-7.076 l -2.354,-0.662 -3.046,11.019 2.272,0.681 z"
+   id="path5"
+   inkscape:connector-curvature="0" />
+<path
+   d="m 67.977953,33.057901 -18.995,-5.412 c -1.249,-0.329 -2.503,0.429 -2.847,1.692 l -1.785,6.42 c -0.351,1.261 0.329,2.555 1.609,2.934 l 18.996,5.354 3.022,-10.988 z"
+   id="path7"
+   inkscape:connector-curvature="0" />
+<path
+   d="M72.687,51.773c-1.448-1.393-3.249-2.499-5.35-3.083l-23.028-6.515l0,0L30.16,16.802c-0.745-1.311-1.944-2.354-3.496-2.783  c-3.103-0.882-6.327,0.961-7.174,4.098c-0.423,1.489-0.223,3.009,0.448,4.295l17.701,31.38c0,0,1.448,2.353,5.095,3.563l32.178,9.12  l14.922,15.315c0.496,0.524,1.145,0.93,1.92,1.155c2.247,0.63,4.599-0.728,5.256-2.975c0.425-1.594-0.081-3.267-1.201-4.302  L72.687,51.773z"
+   id="path9" />
+<path
+   d="M 89.857,54.11 93.202,58.533 100,51.03 94.259,47.797 c 0.541,-4.067 -1.952,-8.005 -5.951,-9.146 -4.399,-1.236 -8.973,1.342 -10.196,5.79 -1.249,4.471 1.326,9.071 5.728,10.309 2.09,0.605 4.219,0.275 6.017,-0.64 z"
+   id="path11"
+   inkscape:connector-curvature="0" />
+</svg>
Index: /trunk/images/presets/transport/aerialway/pylon.svg
===================================================================
--- /trunk/images/presets/transport/aerialway/pylon.svg	(revision 10565)
+++ /trunk/images/presets/transport/aerialway/pylon.svg	(revision 10565)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="01.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="11.904794"
+     inkscape:cy="9.3808906"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-350px"
+       originy="-520px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-350,-516.36218)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2987"
+       width="16"
+       height="16"
+       x="350"
+       y="516.36218" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="2"
+       height="16"
+       x="357"
+       y="516.36218" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect2991"
+       width="16"
+       height="2"
+       x="350"
+       y="521.36218" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 355,521.36218 c -2,-3 -2,-3 -2,-3"
+       id="path2997"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect2999"
+       width="14"
+       height="1"
+       x="351"
+       y="517.36218" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 361,521.36218 c 2,-3 2,-3 2,-3"
+       id="path3769"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3827"
+       sodipodi:cx="363"
+       sodipodi:cy="523.36218"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 364,523.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="translate(0,1)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3829"
+       sodipodi:cx="353"
+       sodipodi:cy="523.36218"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="m 354,523.36218 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+       transform="translate(0,1)" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/bridge/bridge.svg
===================================================================
--- /trunk/images/presets/transport/bridge/bridge.svg	(revision 10565)
+++ /trunk/images/presets/transport/bridge/bridge.svg	(revision 10565)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="10"
+   viewBox="0 0 16 10"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="bridge.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="3.4117672"
+     inkscape:cy="6.5882769"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3621)">
+    <path
+       style="fill:#1a1a1a"
+       d="M 2.8610235e-6,-1 0,2.0000004 c 2.0000004,0 3.0000012,0.726562 3.0253922,3.0000003 l -6e-7,4.0000005 0.3300781,0 1.09375,0 0.5507812,0 6e-7,-4.0000005 c 4e-7,-2.2734383 0.9999996,-3.0000003 2.9999999,-3.0000003 2.0000006,0 3.0273456,0.726562 3.0273446,3.0000003 l 0,4.0000005 1.972656,0 0,-4.0000005 c 10e-7,-2.2734383 1.000001,-3.0000003 3.000001,-3.0000003 l 0,-3.0000004 z"
+       transform="translate(-4.7683724e-7,1043.3621)"
+       id="path3444-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccssscccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/bridge/bridge_movable.svg
===================================================================
--- /trunk/images/presets/transport/bridge/bridge_movable.svg	(revision 10565)
+++ /trunk/images/presets/transport/bridge/bridge_movable.svg	(revision 10565)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="bridge_movable.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="10.409927"
+     inkscape:cy="7.5038767"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-opacity:1"
+       id="rect4202-1"
+       width="6.1549902"
+       height="2.3634679"
+       x="-733.52594"
+       y="738.26666"
+       transform="matrix(0.70710695,-0.70710662,0.70710695,0.70710662,0,0)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#1a1a1a"
+       d="m -4.7683724e-7,1042.3621 0,3 C 2.0000005,1045.3621 3.0000005,1046.0887 3.0253915,1048.3621 l 0,4 0.330078,0 1.09375,0 0.550781,0 0,-4 0,-6 -5.00000097683724,0 z"
+       id="path3444-5-9" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#1a1a1a"
+       d="m 11.000003,1042.3621 0,5.5625 c 0.01005,0.1443 0.02734,0.2784 0.02734,0.4375 l 0,4 1.972662,0 0,-4 c 1e-6,-2.2734 1,-3 3,-3 l 0,-3 -5.000002,0 z"
+       id="path3444-5-1-4" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/bridge/bridge_outline.svg
===================================================================
--- /trunk/images/presets/transport/bridge/bridge_outline.svg	(revision 10565)
+++ /trunk/images/presets/transport/bridge/bridge_outline.svg	(revision 10565)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="10"
+   viewBox="0 0 16 10"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="bridge_outline.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="6.4280196"
+     inkscape:cy="6.5882769"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3621)">
+    <path
+       style="fill:none;stroke:#1a1a1a;stroke-width:0.92470521000000006;stroke-opacity:1"
+       d="m 0.46235529,1042.8244 -2.73e-6,2.7226 c 1.88441214,0 2.82661874,0.6595 2.85054234,2.7226 l -6e-7,3.6302 0.3110015,0 1.0305377,0 0.5189493,0 5e-7,-3.6302 c 5e-7,-2.0631 0.9422056,-2.7226 2.826618,-2.7226 1.8844119,0 2.8523817,0.6595 2.8523807,2.7226 l 0,3.6302 1.858649,0 0,-3.6302 c 10e-7,-2.0631 0.942207,-2.7226 2.826619,-2.7226 l 0,-2.7226 z"
+       id="path3444-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccssscccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/bridge/bridge_support.svg
===================================================================
--- /trunk/images/presets/transport/bridge/bridge_support.svg	(revision 10565)
+++ /trunk/images/presets/transport/bridge/bridge_support.svg	(revision 10565)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="10"
+   viewBox="0 0 16 10"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="bridge_support.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="0.4897073"
+     inkscape:cy="3.1150344"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="false"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3621)">
+    <path
+       style="fill:#ffffff;stroke:#1a1a1a;stroke-width:0.92470521000000006;stroke-opacity:1"
+       d="m 0.46235529,1042.8244 -2.73e-6,2.7226 c 1.88441214,0 2.82661874,0.6595 2.85054234,2.7226 l -6e-7,3.6302 0.3110015,0 1.0305377,0 0.5189493,0 5e-7,-3.6302 c 5e-7,-2.0631 0.9422056,-2.7226 2.826618,-2.7226 1.8844119,0 2.8523817,0.6595 2.8523807,2.7226 l 0,3.6302 1.858649,0 0,-3.6302 c 10e-7,-2.0631 0.942207,-2.7226 2.826619,-2.7226 l 0,-2.7226 z"
+       id="path3444-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccssscccccc" />
+    <path
+       style="fill:#1a1a1a;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -4.7683724e-7,1042.3621 16,1042.3621 l -0.0017,3.0173 -16.02038857,0 z"
+       id="path4135"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/bus.svg
===================================================================
--- /trunk/images/presets/transport/bus.svg	(revision 10565)
+++ /trunk/images/presets/transport/bus.svg	(revision 10565)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="32.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="3.3771185"
+     inkscape:cy="7.9507669"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.3636355,1037.3621 C 2.019072,1037.3621 1,1038.3665 1,1039.6954 l 0,8.1667 c 0,0.707 0.6047586,1.1667 1.1818178,1.1667 l 0,2.3333 c 4.8181822,0 5.8181822,0 10.6363652,0 l 0,-2.3333 c 0.561592,0 1.181817,-0.5156 1.181817,-1.1667 l 0,-8.1667 c 0,-1.3289 -1.019072,-2.3333 -2.363636,-2.3333 z"
+       id="rect4152-0-5"
+       sodipodi:nodetypes="sssccccssss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.9999977,1038.3625 c -1.137708,0 -2,0.8609 -2,2 l 0,7 c 0,0.606 0.511719,1 1,1 l 0,2 2.000001,0 1e-6,-2 5.0000013,0 0,2 2.000001,0 0,-2 c 0.475194,0 1,-0.4419 1,-1 l 0,-7 c 0,-1.1391 -0.862292,-2 -2.000001,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccccccccssss" />
+    <rect
+       rx="1.0000002"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.0000019"
+       height="4.0000224"
+       x="2.9999976"
+       y="-1043.3621"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="3.9999995"
+       cy="-1046.3621"
+       rx="1.0000002"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11.000001"
+       cy="-1046.3621"
+       rx="1"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/passage/arcade.svg
===================================================================
--- /trunk/images/presets/transport/passage/arcade.svg	(revision 10565)
+++ /trunk/images/presets/transport/passage/arcade.svg	(revision 10565)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="arcade.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="9.045637"
+     inkscape:cy="6.9125874"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       class="st8"
+       d="m 0,1036.3621 0,16.0039 1.6438348,0 0,-3.7261 c 0,-1.6438 0.9863009,-2.9589 2.7397278,-2.9589 1.6438348,0 2.7397247,1.3151 2.7397247,2.9589 l 0,3.7261 0,0 1.972605,0 0,0 0,-3.7261 c 0,-1.6438 0.9862977,-2.9589 2.7397217,-2.9589 1.753427,0 2.739727,1.3151 2.739727,2.9589 l 0,3.7261 0,0 1.424661,0 0,-16.0039 z"
+       id="path3444"
+       inkscape:connector-curvature="0"
+       style="fill:#666666"
+       sodipodi:nodetypes="cccsssccccsssccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/passage/colonnade.svg
===================================================================
--- /trunk/images/presets/transport/passage/colonnade.svg	(revision 10565)
+++ /trunk/images/presets/transport/passage/colonnade.svg	(revision 10565)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="colonnade.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="7.991866"
+     inkscape:cy="4.2183244"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <polygon
+       id="XMLID_161_"
+       class="st0"
+       points="247.3,396.1 247.3,509.6 267.4,509.6 267.4,396.1 344.8,396.1 344.8,509.6 365.4,509.6 365.4,396.1 365.4,293.5 257.3,293.5 149.3,293.5 149.3,396.1 149.3,509.6 169.9,509.6 169.9,396.1 "
+       transform="matrix(0.0740398,0,0,0.07403981,-11.054141,1014.6314)"
+       style="fill:#666666" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/passage/tunnel.svg
===================================================================
--- /trunk/images/presets/transport/passage/tunnel.svg	(revision 10565)
+++ /trunk/images/presets/transport/passage/tunnel.svg	(revision 10565)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tunnel.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="0.83719035"
+     inkscape:cy="8.2111891"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 15.996354,1046.6221 c 0,4.62 0,5.74 0,5.74 l -15.99635447683724,0 c 0,0 0,-3.64 0,-5.74 0,-4.62 3.52462037683724,-8.26 7.99817477683724,-8.26 4.4735567,0 8.1337397,3.64 7.9981797,8.26 z"
+       id="path3448" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/passage/tunnel_avalanche_protector.svg
===================================================================
--- /trunk/images/presets/transport/passage/tunnel_avalanche_protector.svg	(revision 10565)
+++ /trunk/images/presets/transport/passage/tunnel_avalanche_protector.svg	(revision 10565)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tunnel_avalanche_protector.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.7369706"
+     inkscape:cy="10.014283"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="false"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3452"
+       transform="matrix(1.4159294,0,0,1.4814815,-537.48678,315.32507)">
+      <polygon
+         points="381.1,497.5 379.6,497.5 379.6,486.7 390.9,491.5 390.9,497.5 389.5,497.5 "
+         id="polygon3454" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/passage/tunnel_building_passage.svg
===================================================================
--- /trunk/images/presets/transport/passage/tunnel_building_passage.svg	(revision 10565)
+++ /trunk/images/presets/transport/passage/tunnel_building_passage.svg	(revision 10565)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tunnel_building_passage.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="3.2705552"
+     inkscape:cy="7.8593061"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       class="st8"
+       d="m -1.321186e-6,1036.3621 0,16 5.371426221186,0 c 0,0 0,-3.6571 0,-4.3429 0,-1.4857 1.142858,-2.6285 2.6285701,-2.6285 1.4857124,0 2.62857,1.1428 2.62857,2.6285 0,1.4858 0,4.3429 0,4.3429 l 5.371437,0 0,-16 -16.000003321186,0 z"
+       id="path3450"
+       inkscape:connector-curvature="0"
+       style="fill:#666666" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/passage/tunnel_culvert.svg
===================================================================
--- /trunk/images/presets/transport/passage/tunnel_culvert.svg	(revision 10565)
+++ /trunk/images/presets/transport/passage/tunnel_culvert.svg	(revision 10565)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="10"
+   viewBox="0 0 16 10"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tunnel_culvert2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="5.5275207"
+     inkscape:cy="3.8462229"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1042.3621)">
+    <path
+       style="fill:#2090cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.977904,1044.1026 c 0,0 3.908012,-0.2715 5.269671,3.1837 1.325117,3.3624 1.752427,5.0758 1.752427,5.0758 l -3.6,0 c 0,0 -0.425476,-5.0588 -2.4430689,-5.0367 -1.199928,0.013 -0.9790291,-3.2228 -0.9790291,-3.2228 z"
+       id="path4141"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4139"
+       width="10.000002"
+       height="5.9999599"
+       x="-4.7683727e-007"
+       y="1042.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/platform.svg
===================================================================
--- /trunk/images/presets/transport/platform.svg	(revision 10565)
+++ /trunk/images/presets/transport/platform.svg	(revision 10565)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4163"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="24.svg">
+  <defs
+     id="defs4165" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="0.64342836"
+     inkscape:cy="7.857738"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4711"
+       originx="-364.99999"
+       originy="-370.00002" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4168">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-365,-666.36218)">
+    <rect
+       style="opacity:1;fill:#242424;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4725"
+       width="7.0000005"
+       height="2"
+       x="365"
+       y="680.36218" />
+    <rect
+       style="opacity:1;fill:#242424;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4727"
+       width="9.000001"
+       height="4"
+       x="372"
+       y="678.36218" />
+    <rect
+       style="opacity:1;fill:#734a08;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4729"
+       width="1.0000002"
+       height="12"
+       x="380"
+       y="666.36218" />
+    <rect
+       style="opacity:1;fill:#734a08;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4731"
+       width="6.0000005"
+       height="1"
+       x="374"
+       y="666.36218" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#734a08;fill-opacity:1"
+       d="m 375.27309,678.34987 c -0.16434,-0.0525 -0.29449,-0.1707 -0.33166,-0.30112 -0.0148,-0.052 -0.0219,-1.11512 -0.022,-3.30608 l -1.2e-4,-3.22947 -0.0832,0 -0.0832,0 0,1.21906 c 0,1.19507 -8.5e-4,1.22052 -0.043,1.29281 -0.0546,0.0936 -0.11603,0.1375 -0.23614,0.1688 -0.17758,0.0463 -0.37178,-0.0421 -0.44152,-0.20088 -0.0449,-0.10217 -0.042,-2.82715 0.003,-2.99607 0.10182,-0.38077 0.43146,-0.69271 0.81595,-0.77209 0.20254,-0.0418 2.07512,-0.0423 2.27705,-6.2e-4 0.2057,0.0425 0.38237,0.13855 0.5387,0.29296 0.16079,0.15881 0.23585,0.28765 0.29184,0.50092 0.039,0.14865 0.0412,0.22826 0.0412,1.5231 0,1.18364 -0.004,1.37624 -0.032,1.44092 -0.0431,0.10056 -0.0876,0.14578 -0.18655,0.19009 -0.16435,0.0735 -0.37323,0.0262 -0.4704,-0.10652 l -0.05,-0.0683 -0.006,-1.24211 -0.006,-1.2421 -0.0828,0 -0.0828,0 0,3.24533 c 0,3.5575 0.008,3.32129 -0.12079,3.45376 -0.10192,0.10465 -0.2059,0.14423 -0.37878,0.14423 -0.17288,0 -0.27684,-0.0396 -0.37878,-0.14423 -0.12654,-0.12989 -0.1208,-0.0292 -0.1208,-2.11532 l 0,-1.90691 -0.0832,0 -0.0832,0 0,1.90691 c 0,1.554 -0.005,1.91898 -0.0281,1.97216 -0.042,0.0975 -0.13316,0.19362 -0.22893,0.24122 -0.0923,0.0459 -0.30184,0.0672 -0.38842,0.0395 z m 0.46822,-8.35239 c -0.25164,-0.0876 -0.40716,-0.22253 -0.51725,-0.44888 -0.061,-0.12528 -0.0653,-0.14935 -0.0653,-0.35782 0,-0.21093 0.004,-0.23098 0.0673,-0.3567 0.31729,-0.62793 1.23335,-0.62947 1.55012,-0.003 0.0656,0.12979 0.0687,0.14615 0.0687,0.36944 0,0.21475 -0.005,0.24298 -0.0582,0.34908 -0.0898,0.17823 -0.22253,0.30819 -0.40378,0.39546 -0.14072,0.0678 -0.17645,0.0762 -0.34703,0.0819 -0.14313,0.005 -0.21596,-0.003 -0.2945,-0.0299 z"
+       id="path2558" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/abandoned_rail.svg
===================================================================
--- /trunk/images/presets/transport/railway/abandoned_rail.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/abandoned_rail.svg	(revision 10565)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_abandoned_rail.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="4.5472704"
+     inkscape:cy="5.4108116"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4142"
+       width="16"
+       height="16"
+       x="-4.7683722e-007"
+       y="1036.3621" />
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 2.9999998,1036.3621 -3.0000010248382,0 0,16 3.0000010248382,0 0,-1 -2.00000092,0 0,-2 2.00000092,0 0,-2 -2.00000092,0 0,-2 2.00000092,0 0,-2 -2.00000092,0 0,-2 2.00000092,0 0,-2 -2.00000092,0 0,-2 2.00000092,0 0,-1 z"
+       id="path4714"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#808080;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 13.000016,1036.3621 3,0 0,16 -3,0 0,-1 2,0 0,-2 -2,0 0,-2 2,0 0,-2 -2,0 0,-2 2,0 0,-2 -2,0 0,-2 2,0 0,-2 -2,0 0,-1 z"
+       id="path4714-4"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4731"
+       width="8.0000019"
+       height="1.0000002"
+       x="4.0000005"
+       y="1036.3621" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4733"
+       width="8.0000019"
+       height="2.0000005"
+       x="4.0000005"
+       y="1039.3621" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4735"
+       width="8.0000019"
+       height="2.0000005"
+       x="4.0000005"
+       y="1043.3621" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4737"
+       width="8.0000019"
+       height="2.0000005"
+       x="4.0000005"
+       y="1047.3621" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4739"
+       width="8.0000019"
+       height="1.0000002"
+       x="4.0000005"
+       y="1051.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/buffer_stop.svg
===================================================================
--- /trunk/images/presets/transport/railway/buffer_stop.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/buffer_stop.svg	(revision 10565)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_buffer_stop5.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="7.5984475"
+     inkscape:cy="6.3320926"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="false"
+     inkscape:snap-page="true"
+     inkscape:snap-others="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 6.5039062,0.25 -6.21484365,12.425781 0,1.070313 15.42773445,0.0039 0,-3.5 -5.966797,0 -0.015625,-4.5 4.015625,0 0,-5.5 z"
+       transform="translate(-4.7683724e-7,1038.3621)"
+       id="path4137"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="fill:#666666;fill-opacity:1"
+       d="m 7.0000024,1039.3621 -6.0000027,12 14.0000023,0 0,-2 -5.9999996,0 0,-10 z"
+       id="path3387-0-99-9-7-8-7-9-1-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#ff0000;fill-opacity:1"
+       d="m 11.000002,1039.3621 0,1 -1.9999996,0 0,2 1.9999996,0 0,1 2,0 0,-4 -2,0 z"
+       id="path3387-0-99-9-7-8-7-9-6-5-5-8"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/bus_guideway.svg
===================================================================
--- /trunk/images/presets/transport/railway/bus_guideway.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/bus_guideway.svg	(revision 10565)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_bus_guideway2.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="12.323558"
+     inkscape:cy="5.8860741"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 4.3769482,1036.3625 c -0.78527,0 -1.544061,0.1469 -2.154297,0.6055 -0.610236,0.4585 -0.972656,1.2418 -0.972656,2.1406 l 0,8.4414 -1.2499999683717,0 0,3.8125 14.9999997683717,0 0,-3.8125 -1.25,0 0,-8.4414 c 0,-0.864 -0.37599,-1.6288 -0.974609,-2.0937 -0.59862,-0.4649 -1.359988,-0.6524 -2.152344,-0.6524 l -6.2460938,0 z"
+       id="path4146"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.9999977,1037.3625 c -1.137708,0 -2,0.8609 -2,2 l 0,7 c 0,0.606 0.511719,1 1,1 l 0,2 2.000001,0 1e-6,-2 5.0000013,0 0,2 2.000001,0 0,-2 c 0.475194,0 1,-0.4419 1,-1 l 0,-7 c 0,-1.1391 -0.862292,-2 -2.000001,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccccccccssss" />
+    <rect
+       rx="1.0000002"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.0000019"
+       height="4.0000224"
+       x="2.9999976"
+       y="-1042.3621"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="3.9999995"
+       cy="-1045.3621"
+       rx="1.0000002"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11.000001"
+       cy="-1045.3621"
+       rx="1"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+    <rect
+       rx="7.8667814e-005"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4227"
+       width="15.000003"
+       height="2.0000002"
+       x="-4.7683727e-007"
+       y="-1052.3621"
+       ry="7.8667807e-005"
+       transform="scale(1,-1)" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4189"
+       width="2"
+       height="2"
+       x="-4.2915344e-006"
+       y="1048.3624"
+       rx="7.8667799e-005"
+       ry="7.8667799e-005" />
+    <rect
+       ry="7.8667799e-005"
+       rx="7.8667799e-005"
+       y="1048.3624"
+       x="12.999999"
+       height="2"
+       width="2"
+       id="rect4191"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/crossing.svg
===================================================================
--- /trunk/images/presets/transport/railway/crossing.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/crossing.svg	(revision 10565)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2997"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="23.svg">
+  <defs
+     id="defs2999" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.8807857"
+     inkscape:cy="6.3600165"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-660px"
+       originy="-320px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3002">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-660,-716.36218)">
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 3,5 10,6"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       transform="translate(660,716.36218)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 3,11 13,5"
+       id="path3020"
+       inkscape:connector-curvature="0"
+       transform="translate(660,716.36218)"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/disused_rail.svg
===================================================================
--- /trunk/images/presets/transport/railway/disused_rail.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/disused_rail.svg	(revision 10565)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14"
+   height="16"
+   viewBox="0 0 14 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rail_disused_rail4.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-10.624333"
+     inkscape:cy="10.208074"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-8-6"
+       d="M 0.11355783,1039.7608 -4.7683722e-7,1037.7641 13.876363,1036.9634 l 0.113558,1.9967 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-2-0-3"
+       d="M 0.22894344,1044.1643 -4.7683722e-7,1042.1777 13.775578,1040.5599 l 0.228943,1.9866 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-1-0-0"
+       d="M -4.7683722e-7,1047.078 0.08052553,1045.0797 l 13.91864147,0.5665 -0.08052,1.9983 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-5-0-3"
+       d="M -4.7683722e-7,1050.5158 0.23736271,1048.5302 l 13.76082629,1.6782 -0.237363,1.9856 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-9-7-8-7-9"
+       d="m 2.9999964,1052.3621 -1.000011,0 0,-16 1.000011,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-0-0-9-9-7-1"
+       d="m 12.000012,1052.3621 -1.000013,0 0,-16 1.000013,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/funicular.svg
===================================================================
--- /trunk/images/presets/transport/railway/funicular.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/funicular.svg	(revision 10565)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   preserveAspectRatio="none"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="30.svg">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs19" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview17"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="32"
+     inkscape:cx="16.276277"
+     inkscape:cy="9.4799627"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4154"
+       originx="7.924903e-010"
+       originy="1" />
+  </sodipodi:namedview>
+  <rect
+     style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.653;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     id="rect4170"
+     width="16"
+     height="16"
+     x="7.924903e-010"
+     y="0"
+     rx="0" />
+  <path
+     d="M 1,7.905 15,15 1,15"
+     id="slope"
+     inkscape:connector-curvature="0"
+     style="fill:#000000;stroke:none"
+     sodipodi:nodetypes="ccc" />
+  <circle
+     cx="6.3389673"
+     cy="8.4400024"
+     id="wheel"
+     r="1.9988337"
+     style="fill:#000000" />
+  <circle
+     cx="11.002911"
+     cy="10.772004"
+     id="circle6"
+     r="1.9988337"
+     style="fill:#000000" />
+  <rect
+     style="fill:#000000"
+     id="cab"
+     rx="0.37246045"
+     y="-0.95547646"
+     x="3.3541002"
+     height="7.2254004"
+     width="12.299652"
+     transform="matrix(0.89442763,0.44721272,0,1,0,0)" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1"
+     id="window"
+     rx="0.18623023"
+     y="0.42817301"
+     x="4.4721336"
+     height="2.8435221"
+     width="2.6150281"
+     transform="matrix(0.89442763,0.44721272,0,1,0,0)" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1"
+     id="rect12"
+     rx="0.18623023"
+     y="0.42468071"
+     x="8.2220221"
+     height="2.8470144"
+     width="2.5897598"
+     transform="matrix(0.89442763,0.44721272,0,1,0,0)" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1"
+     id="rect14"
+     rx="0.18623023"
+     y="0.45028329"
+     x="11.964101"
+     height="2.8214118"
+     width="2.5723002"
+     transform="matrix(0.89442763,0.44721272,0,1,0,0)" />
+  <path
+     inkscape:connector-curvature="0"
+     id="rope"
+     style="stroke:#000000;stroke-width:1.26600003;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+     d="M 0.2830851,5.2241778 7.2789999,8.722118" />
+</svg>
Index: /trunk/images/presets/transport/railway/level_crossing.svg
===================================================================
--- /trunk/images/presets/transport/railway/level_crossing.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/level_crossing.svg	(revision 10565)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="739.41339"
+   height="489.5358"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="10.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="976"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="0.59193281"
+     inkscape:cx="325.63184"
+     inkscape:cy="62.349857"
+     inkscape:window-x="-9"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g3026"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective13124"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g3026"
+     transform="translate(119.70668,-129.88811)">
+    <g
+       id="layer1"
+       transform="matrix(0,1,-1,0,624.65603,124.65599)">
+      <path
+         id="path1890"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 94.296621,210.11445 94.615669,164.77919 -94.15567,163.986 89.626,53.63626 64.82856,-111.17112 66.57569,111.26142 90.31697,-52.53732 -95.97746,-165.29774 96.18785,-166.13881 -90.40646,-52.16115 -65.75735,113.34204 -64.94244,-111.82073 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccc" />
+      <path
+         id="path1882"
+         style="fill:#c1121c;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="M 94.311338,211.92538 187.08494,159.21453 98.120108,4.9493054 5.7746385,58.534605 94.311338,211.92538 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1884"
+         style="fill:#c1121c;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 401.99432,744.3627 92.7736,-52.71085 -88.96483,-154.26522 -92.34547,53.5853 88.5367,153.39077 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1886"
+         style="fill:#c1121c;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 98.00572,744.36271 -92.7736,-52.71085 88.96483,-154.26522 92.34547,53.5853 -88.5367,153.39077 z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1888"
+         style="fill:#c1121c;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="M 405.4739,212.22565 312.7003,159.5148 401.66513,5.249578 494.0106,58.83488 405.4739,212.22565 z"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/light_rail.svg
===================================================================
--- /trunk/images/presets/transport/railway/light_rail.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/light_rail.svg	(revision 10565)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_light_rail3.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-1.4399174"
+     inkscape:cy="16.152512"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:snap-page="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4146"
+       d="m 4.376685,1037.1121 c -1.372083,0 -2.376687,0.5446 -2.376687,1.9962 l 2e-6,12.2538 11.000001,0 1e-6,-12.2538 c 0,-1.3422 -1.035853,-1.9962 -2.376687,-1.9962 z"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ssccsss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.999999,1037.3621 c -1.137708,0 -2.0000013,0.8609 -2.000001,2 l 1.8e-6,8 c 2e-7,1.232 0.7790292,2 2.0000002,2 l 7.000001,0 c 1.254116,0 2,-0.7238 2,-2 l 1e-6,-8 c 0,-1.1391 -0.862292,-2 -2.000001,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccssss" />
+    <rect
+       rx="1.0000002"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.0000019"
+       height="4.0000224"
+       x="2.9999995"
+       y="-1042.3618"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="4"
+       cy="-1046.3621"
+       rx="1.0000002"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11"
+       cy="-1046.3621"
+       rx="1"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4249-2"
+       width="15.000002"
+       height="2.0000422"
+       x="-6.2488175e-007"
+       y="1050.3622"
+       ry="5.5070162e-005"
+       rx="5.5070162e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/milestone.svg
===================================================================
--- /trunk/images/presets/transport/railway/milestone.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/milestone.svg	(revision 10565)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_millestone2.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.5852558"
+     inkscape:cy="9.3498488"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-page="false"
+     inkscape:snap-global="false"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+    <sodipodi:guide
+       position="11.000001,15.000001"
+       orientation="0,1"
+       id="guide4138" />
+    <sodipodi:guide
+       position="11.000001,15.000001"
+       orientation="1,0"
+       id="guide4140" />
+    <sodipodi:guide
+       position="1.0000001,4.0000003"
+       orientation="1,0"
+       id="guide4142" />
+    <sodipodi:guide
+       position="0,5.0000003"
+       orientation="0,1"
+       id="guide4144" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       y="1046.3621"
+       x="4.257813"
+       height="5.9999194"
+       width="3.484375"
+       id="rect4148"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <rect
+       y="1037.8621"
+       x="1.5000001"
+       height="9.000041"
+       width="9.000001"
+       id="rect4146"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.5000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffdd55;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4209"
+       width="9.000001"
+       height="9.000041"
+       x="1.5000001"
+       y="1037.8621" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4197"
+       width="2"
+       height="5.9999194"
+       x="5.0000005"
+       y="1046.3621" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 4.5071215,1039.8646 2.9940272,-0 -2.000115,4.9952"
+       id="path4199"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/monorail.svg
===================================================================
--- /trunk/images/presets/transport/railway/monorail.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/monorail.svg	(revision 10565)
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_monorail6.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="4.0837872"
+     inkscape:cy="4.9117397"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-page="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4146"
+       d="m 4.3766856,1037.1121 c -1.3720829,0 -2.3766858,0.5446 -2.3766858,1.9962 l 0,12.2538 11.0000012,0 0,-12.2538 c 0,-1.3422 -1.035853,-1.9962 -2.376686,-1.9962 z"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ssccsss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4,1037.3621 c -1.1377079,0 -2.0000002,0.8609 -2.0000002,2 l 0,10 3.0000003,0 0,-1 -1.0000001,0 0,-1 7.000001,0 0,1 -1,0 0,1 3,0 0,-10 c 0,-1.1391 -0.862292,-2 -2,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="ssccccccccccsss" />
+    <rect
+       rx="1.0000001"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.000001"
+       height="4.0000224"
+       x="2.9999998"
+       y="-1042.3621"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="4"
+       cy="-1045.3621"
+       rx="1.0000001"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11.000001"
+       cy="-1045.3621"
+       rx="0.99999994"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4227"
+       width="15.000002"
+       height="0.99995834"
+       x="4.7683722e-007"
+       y="-1052.3621"
+       ry="7.8667807e-005"
+       transform="scale(1,-1)"
+       rx="7.8667807e-005" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4229"
+       width="3.0000002"
+       height="3.0000858"
+       x="6.0000005"
+       y="-1051.3621"
+       ry="1.9666182e-005"
+       transform="scale(1,-1)"
+       rx="1.9666182e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/narrow_gauge_rail.svg
===================================================================
--- /trunk/images/presets/transport/railway/narrow_gauge_rail.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/narrow_gauge_rail.svg	(revision 10565)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rail_narrow_gauge_rail.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-5.9661994"
+     inkscape:cy="3.2276789"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-8-6"
+       d="m -1.1644349e-5,1039.3621 0,-2 9.000005644349,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-2-0-3"
+       d="m -5.2134385e-6,1043.3621 0,-2 8.9999992134385,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-1-0-0"
+       d="m -5.2134385e-6,1047.3621 0,-2 9.0000057134385,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-5-0-3"
+       d="m -5.2134385e-6,1051.3621 0,-2 9.0000057134385,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-9-7-8-7-9"
+       d="m 2.9999995,1052.3621 -1.0000104,0 0,-16 1.0000104,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-0-0-9-9-7-1"
+       d="m 7.0000004,1052.3621 -1.0000129,0 0,-16 1.0000129,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/preserved.svg
===================================================================
--- /trunk/images/presets/transport/railway/preserved.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/preserved.svg	(revision 10565)
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_preserved5.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="8.9071542"
+     inkscape:cy="6.8211658"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+    <sodipodi:guide
+       position="15.499999,10.498802"
+       orientation="1,0"
+       id="guide4190" />
+    <sodipodi:guide
+       position="1.4970777,12.169972"
+       orientation="1,0"
+       id="guide4192" />
+    <sodipodi:guide
+       position="0.20439807,13.843827"
+       orientation="1,0"
+       id="guide4194" />
+    <sodipodi:guide
+       position="0.21875001,12.748002"
+       orientation="0,1"
+       id="guide4151" />
+    <sodipodi:guide
+       position="5.7421879,10.109376"
+       orientation="1,0"
+       id="guide4153" />
+    <sodipodi:guide
+       position="6.8593754,8.7500011"
+       orientation="0,1"
+       id="guide4155" />
+    <sodipodi:guide
+       position="11.242188,9.8203137"
+       orientation="1,0"
+       id="guide4157" />
+    <sodipodi:guide
+       position="15.734376,10.257814"
+       orientation="1,0"
+       id="guide4159" />
+    <sodipodi:guide
+       position="15.273438,10.757814"
+       orientation="0,1"
+       id="guide4161" />
+    <sodipodi:guide
+       position="14.820313,3.2500018"
+       orientation="0,1"
+       id="guide4163" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 0.20439762,1039.6141 0,9.498 15.52997938,0 -2e-6,-7.5078 -4.492188,0 0,2.0078 -5.5000009,0 0,-3.998 z"
+       id="path4147"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g4156"
+       transform="translate(0.03314564,0)">
+      <ellipse
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="ellipse4143"
+         cx="-12.478067"
+         cy="1049.8617"
+         rx="1.4996274"
+         ry="1.4996264"
+         transform="scale(-1,1)" />
+      <ellipse
+         transform="scale(-1,1)"
+         ry="1.4996264"
+         rx="1.4996274"
+         cy="1049.8617"
+         cx="-12.478067"
+         id="path4158-5-4-8-4-1-8"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       transform="translate(-3.9664278,0)"
+       id="g4160">
+      <ellipse
+         transform="scale(-1,1)"
+         ry="1.4996264"
+         rx="1.4996274"
+         cy="1049.8617"
+         cx="-12.478067"
+         id="ellipse4162"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <ellipse
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="ellipse4164"
+         cx="-12.478067"
+         cy="1049.8617"
+         rx="1.4996274"
+         ry="1.4996264"
+         transform="scale(-1,1)" />
+    </g>
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 3.0955463,1036.3621 c 0.5125623,0.999 0.97181,1.8717 1.4610941,2.6379 0.3986952,0.6188 0.8550782,1.2542 1.3476563,1.7754 0.492578,0.5212 1.0129603,0.9506 1.6445312,1.0762 1.1305518,0.2247 2.1390799,0.091 2.9648441,-0.022 0.812643,-0.1109 1.362494,-0.4119 1.814453,-0.01 0.310345,0.276 0.138014,0.7906 0.138673,1.2382 l 2.281247,0.1645 c 0,0 0.04233,-0.5266 -0.01758,-1.1699 -0.05991,-0.6433 -0.194441,-1.4328 -0.707031,-2.0215 -0.805313,-0.9248 -1.987932,-1.3027 -2.814454,-1.7637 -0.41326,-0.2304 -0.728995,-0.4697 -0.90625,-0.7343 -0.177255,-0.2647 -0.260028,-0.6496 -0.164062,-1.1708 z"
+       id="path4168"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsccaccsccccc" />
+    <ellipse
+       transform="scale(-1,1)"
+       ry="1.9996098"
+       rx="2.0042806"
+       cy="1049.3617"
+       cx="-3.9876006"
+       id="ellipse4145"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4156-7-0-0-3-6"
+       width="16.000027"
+       height="0.99991846"
+       x="-16.000027"
+       y="1051.3621"
+       transform="scale(-1,1)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-rule:nonzero;stroke:none"
+       d="m 0.9999997,1048.3621 14.0000023,0 2.4e-5,-4.0001 0,-1.9978 -3,0 0,2 -7.0000013,-10e-5 0,-4 -4.000025,0 z"
+       id="path15-2-6-8-8-2-1"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.40000007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.249067,1043.1847 c 0,0 0.158276,-1.9488 -0.602595,-2.8226 -1.269906,-1.4584 -4.0495184,-1.5188 -4.0455229,-3.5343 l -5.6893134,-0.01 c 0,0 1.949201,4.1866 3.7348356,4.5415 2.0741968,0.4123 3.7537347,-0.4865 4.9062557,0 0.666404,0.3649 0.374995,1.8282 0.374995,1.8282 z"
+       id="path4206-1-9-2-8-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsccc" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4158-3-1-4-1-4-6-3"
+       cx="-3.9876006"
+       cy="1049.3617"
+       rx="2.0042806"
+       ry="1.9996098"
+       transform="scale(-1,1)" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4140"
+       width="2.0000241"
+       height="3.0001624"
+       x="-4.0000238"
+       y="1041.3619"
+       transform="scale(-1,1)" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/rail.svg
===================================================================
--- /trunk/images/presets/transport/railway/rail.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/rail.svg	(revision 10565)
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14"
+   height="16"
+   viewBox="0 0 14 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rail_rail.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-5.4137722"
+     inkscape:cy="3.2276789"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-8-6"
+       d="m -1.3273442e-5,1039.3621 0,-2 14.000015273442,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-2-0-3"
+       d="m -3.2734417e-6,1043.3621 0,-2 14.0000052734417,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-1-0-0"
+       d="m -3.2734417e-6,1047.3621 0,-2 14.0000152734417,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-5-0-3"
+       d="m -3.2734417e-6,1051.3621 0,-2 14.0000152734417,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-9-7-8-7-9"
+       d="m 2.9999978,1052.3621 -1.0000104,0 0,-16 1.0000104,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-0-0-9-9-7-1"
+       d="m 12.000013,1052.3621 -1.000013,0 0,-16 1.000013,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/signal.svg
===================================================================
--- /trunk/images/presets/transport/railway/signal.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/signal.svg	(revision 10565)
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   viewBox="0 0 12 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_signal2.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="8.7307477"
+     inkscape:cy="6.2317852"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-page="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       y="1049.3621"
+       x="4.2500005"
+       height="2.9999998"
+       width="3.5"
+       id="rect4148"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <rect
+       rx="0.99991709"
+       ry="0.99991709"
+       y="1037.3621"
+       x="0.9999997"
+       height="13.000003"
+       width="10.000001"
+       id="rect4146"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000018;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4197"
+       width="2"
+       height="2.9999998"
+       x="5.0000005"
+       y="1049.3621" />
+    <rect
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4158"
+       width="10.000001"
+       height="13.000003"
+       x="0.9999997"
+       y="1037.3621"
+       ry="0.99991709"
+       rx="0.99991709" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4160"
+       cx="6.0000005"
+       cy="1040.0652"
+       rx="1.7031251"
+       ry="1.7031109" />
+    <ellipse
+       ry="1.7031109"
+       rx="1.7031251"
+       cy="1043.8621"
+       cx="6.0000005"
+       id="ellipse4142"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <ellipse
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="ellipse4144"
+       cx="6.0000005"
+       cy="1047.6589"
+       rx="1.7031251"
+       ry="1.7031109" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/subway.svg
===================================================================
--- /trunk/images/presets/transport/railway/subway.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/subway.svg	(revision 10565)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_subway6.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-7" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="1.2546538"
+     inkscape:cy="10.827817"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4142"
+       width="13"
+       height="14"
+       x="0.99999952"
+       y="1037.3621" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -4.7683722e-7,1036.3621 0,16 1.00000011683722,0 0,-8 c 0,-3.96 2.86770086,-7 6.50195386,-7 3.6342575,0 6.6081755,3.04 6.4980475,7 l 0,8 1.000002,0 0,-16 z"
+       id="rect4270-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccssccccc" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4141"
+       width="13.000002"
+       height="1.000039"
+       x="0.99999964"
+       y="1051.3621" />
+    <path
+       sodipodi:nodetypes="sssssssss"
+       inkscape:connector-curvature="0"
+       id="path4149"
+       d="m 4.478082,1040.3621 c -1.0398063,0 -1.7546725,0.7148 -1.7546725,1.7547 l 0,6.4906 c 0,1.105 0.649877,1.7547 1.7546725,1.7547 l 6.043851,0 c 1.104774,0 1.754657,-0.6497 1.754657,-1.7547 l 0,-6.4906 c 0,-1.0399 -0.779858,-1.7547 -1.754657,-1.7547 z"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4151"
+       d="m 4.478082,1044.8715 6.043851,0 c 0.454919,0 0.844848,-0.3899 0.844848,-0.9101 l 0,-1.6895 c 0,-0.5198 -0.389929,-0.9098 -0.844848,-0.9098 l -6.043851,0 c -0.5199047,0 -0.9098309,0.39 -0.9098309,0.9098 l 0,1.6895 c 0,0.5202 0.3899262,0.9101 0.9098309,0.9101 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4153"
+       d="m 5.3229205,1047.8722 c 0,-0.455 -0.3899292,-0.845 -0.8448385,-0.845 -0.5199047,0 -0.9098309,0.39 -0.9098309,0.845 0,0.4547 0.3899262,0.8446 0.9098309,0.8446 0.4549093,0 0.8448385,-0.3899 0.8448385,-0.8446 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4155"
+       d="m 11.366781,1047.8722 c 0,-0.455 -0.389929,-0.845 -0.844848,-0.845 -0.454906,0 -0.8448352,0.39 -0.8448352,0.845 0,0.4547 0.3899292,0.8446 0.8448352,0.8446 0.454919,0 0.844848,-0.3899 0.844848,-0.8446 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/switch.svg
===================================================================
--- /trunk/images/presets/transport/railway/switch.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/switch.svg	(revision 10565)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="rail_railway_switch.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-11.517092"
+     inkscape:cy="4.0015607"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-8-3-7-6-5"
+       d="m -1.0476837e-5,1039.3621 0,-2 15.000015476837,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-2-0-9-3-7-8"
+       d="m -4.7683722e-7,1043.3621 0,-2 14.00000147683722,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-1-0-8-5-3-6"
+       d="m -4.7683722e-7,1047.3621 0,-2 13.00000147683722,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#c87137;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-7-4-2-9-2-5-0-5-8-3-4"
+       d="m -4.7683722e-7,1051.3621 0,-2 12.00000147683722,0 0,2 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-99-9-7-8-7-2-8-3-9"
+       d="m 3.0000019,1052.3621 -1.000011,0 0,-16 1.000011,0 z"
+       class="st5" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 5.9868759,1036.3621 c -3.703746,7.0026 -3.986328,15.2305 -3.986328,15.2305 l 1,0.035 c 0,0 0.323914,-8.4499 4.117188,-15.2656 l -1.13086,0 z"
+       id="path4812-4"
+       inkscape:connector-curvature="0" />
+    <path
+       class="st5"
+       d="m 10.000001,1052.3621 -1.0000113,0 0,-16 1.0000113,0 z"
+       id="path4143"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4145"
+       d="m 12.986875,1036.3621 c -3.7037463,7.0026 -3.9863283,15.2305 -3.9863283,15.2305 l 1.0000003,0.035 c 0,0 0.323914,-8.4499 4.117188,-15.2656 l -1.13086,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/tram.svg
===================================================================
--- /trunk/images/presets/transport/railway/tram.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/tram.svg	(revision 10565)
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_tram6.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="8.4551803"
+     inkscape:cy="9.3674229"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:snap-nodes="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3621)">
+    <rect
+       y="1039.3621"
+       x="0"
+       height="0.74999994"
+       width="16.000002"
+       id="rect4151"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 7.385014,1038.3621 -4.135014,2.55 0,1.5078 1.6835938,1.1914 -4.6835938,0 0,6.5 15.5,0 0,-6.5 -4.658203,0 1.685547,-1.1894 0,-1.5117 -4.1435845,-2.5481 z"
+       id="path4150"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <g
+       id="g4158"
+       transform="translate(1.0000002,4.0526009e-5)">
+      <circle
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle4142"
+         cx="2"
+         cy="1050.3621"
+         r="1" />
+      <circle
+         r="1"
+         cy="1050.3621"
+         cx="2"
+         id="path4139"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4170"
+       transform="translate(-1.0000004,4.0526009e-5)">
+      <circle
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle4144"
+         cx="14.000002"
+         cy="1050.3621"
+         r="1.0000001" />
+      <circle
+         r="1.0000001"
+         cy="1050.3621"
+         cx="14.000002"
+         id="path4139-6"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4162">
+      <circle
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle4146"
+         cx="6.000001"
+         cy="1050.3621"
+         r="1.0000001" />
+      <circle
+         r="1.0000001"
+         cy="1050.3621"
+         cx="6.000001"
+         id="path4139-67"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4166">
+      <circle
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="circle4148"
+         cx="10.000001"
+         cy="1050.3621"
+         r="1.0000001" />
+      <circle
+         r="1.0000001"
+         cy="1050.3621"
+         cx="10.000001"
+         id="path4139-4"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path12"
+       d="m 7.9999765,1038.8578 -3.9990404,2.4716 0,0.7032 3.2943677,2.3295 -6.29530391,0 2.1e-7,5 14.0000019,0 0,-5 -6.2720885,0 3.3003035,-2.3295 0,-0.7032 -4.0282162,-2.4716 z m 0,0.9769 3.1212235,1.8482 -3.1066352,2.1858 -3.0984311,-2.1858 z m -5.9999763,5.5274 2.0000003,0 0,3 -2.0000003,0 z m 3.0000001,0 2.5000003,0 0,1.624 -2.5000003,0 z m 3.507813,0 2.5179447,0 0,1.62 -2.5179447,0 z m 3.4921877,0 2.000001,0 0,3 -2.000001,0 z"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc" />
+    <rect
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4179"
+       width="16.000002"
+       height="1"
+       x="1.5543122e-015"
+       y="1038.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/railway/turntable.svg
===================================================================
--- /trunk/images/presets/transport/railway/turntable.svg	(revision 10565)
+++ /trunk/images/presets/transport/railway/turntable.svg	(revision 10565)
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="railway_turntable.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="10.029539"
+     inkscape:cy="5.9031046"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3621)">
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145-1"
+       cx="7.5000005"
+       cy="1044.8621"
+       rx="7"
+       ry="7.0000043" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4179-6-2"
+       width="9.0000029"
+       height="2.000001"
+       x="3"
+       y="1042.3621"
+       ry="7.776283e-005" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4179-0-6"
+       width="9.0000029"
+       height="2.000001"
+       x="3"
+       y="1045.3621"
+       ry="7.776283e-005" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4179-1-1"
+       width="9.0000029"
+       height="2.000001"
+       x="3"
+       y="1048.3621"
+       ry="7.776283e-005" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4179-7"
+       width="9.0000029"
+       height="2.0000005"
+       x="3"
+       y="1039.3621"
+       ry="7.7762816e-005" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4162-7"
+       width="1.0000013"
+       height="13.000041"
+       x="4.000001"
+       y="1038.3621"
+       ry="7.2208291e-005" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4162-3-8"
+       width="1.0000015"
+       height="13.000041"
+       x="10.000001"
+       y="1038.3621"
+       ry="7.2208291e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/share_taxi.svg
===================================================================
--- /trunk/images/presets/transport/share_taxi.svg	(revision 10565)
+++ /trunk/images/presets/transport/share_taxi.svg	(revision 10565)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="40.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="3.4399436"
+     inkscape:cy="5.9839554"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.3636355,1038.3621 C 2.019072,1038.3621 1,1039.3665 1,1040.6954 l 0,8.1667 c 0,0.707 0.6047586,1.1667 1.1818178,1.1667 l 0,2.3333 c 4.8181822,0 5.8181822,0 10.6363652,0 l 0,-2.3333 c 0.561592,0 1.181817,-0.5156 1.181817,-1.1667 l 0,-8.1667 c 0,-1.3289 -1.019072,-2.3333 -2.363636,-2.3333 z"
+       id="rect4152-0-5"
+       sodipodi:nodetypes="sssccccssss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.9999977,1039.3625 c -1.137708,0 -2,0.8609 -2,2 l 0,7 c 0,0.606 0.511719,1 1,1 l 0,2 2.000001,0 1e-6,-2 5.0000013,0 0,2 2.000001,0 0,-2 c 0.475194,0 1,-0.4419 1,-1 l 0,-7 c 0,-1.1391 -0.862292,-2 -2.000001,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccccccccssss" />
+    <rect
+       rx="1.0000002"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.0000019"
+       height="4.0000224"
+       x="2.9999976"
+       y="-1044.3621"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="3.9999995"
+       cy="-1047.3621"
+       rx="1.0000002"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11.000001"
+       cy="-1047.3621"
+       rx="1"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4145"
+       width="9"
+       height="2"
+       x="3"
+       y="1036.3623"
+       ry="7.8891375e-005" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4143"
+       width="7"
+       height="2.0000393"
+       x="4"
+       y="1037.3621"
+       ry="3.9453123e-005" />
+    <rect
+       style="opacity:1;fill:#ffe100;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4141"
+       width="5"
+       height="2.0000393"
+       x="5"
+       y="1038.3621"
+       rx="0"
+       ry="3.9453123e-005" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/station.svg
===================================================================
--- /trunk/images/presets/transport/station.svg	(revision 10565)
+++ /trunk/images/presets/transport/station.svg	(revision 10565)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="13"
+   viewBox="0 0 16 13"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="35.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.918858"
+     inkscape:cy="8.0581049"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="px">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="-420"
+       originy="-469.99999" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-420,-569.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4145"
+       width="14"
+       height="7"
+       x="421"
+       y="575.36218" />
+    <path
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="path4140-6"
+       sodipodi:type="arc"
+       sodipodi:cx="-428"
+       sodipodi:cy="-575.36218"
+       sodipodi:rx="8"
+       sodipodi:ry="5.9999995"
+       sodipodi:start="0"
+       sodipodi:end="3.1415927"
+       d="m -420,-575.36218 a 8,5.9999995 0 0 1 -4,5.19615 8,5.9999995 0 0 1 -8,0 8,5.9999995 0 0 1 -4,-5.19615 l 8,0 z"
+       transform="scale(-1,-1)" />
+    <rect
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4142-0"
+       width="1"
+       height="7"
+       x="420"
+       y="575.36218" />
+    <rect
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4144-4"
+       width="1"
+       height="7"
+       x="435"
+       y="575.36218" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 422.90909,576.3622 c -0.51714,0 -0.90909,0.43045 -0.90909,1 l 0,4 c 0,0.616 0.3541,1 0.90909,1 l 3.18182,0 c 0.57005,0 0.90909,-0.3619 0.90909,-1 l 0,-4 c 0,-0.56955 -0.39195,-1 -0.90909,-1 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccssss" />
+    <rect
+       rx="0.45454556"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="4.09091"
+       height="2.0000112"
+       x="422.45453"
+       y="-578.86206"
+       ry="0.50000006"
+       transform="scale(1,-1)" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="423.15454"
+       cy="-580.66217"
+       transform="scale(1,-1)"
+       r="0.69999999" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="425.89886"
+       cy="-580.66217"
+       transform="scale(1,-1)"
+       r="0.69999999" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 429.90909,576.3622 c -0.51714,0 -0.90909,0.43045 -0.90909,1 l 0,4 c 0,0.616 0.3541,1 0.90909,1 l 3.18182,0 c 0.57005,0 0.90909,-0.3619 0.90909,-1 l 0,-4 c 0,-0.56955 -0.39195,-1 -0.90909,-1 z"
+       id="rect4152-0-3"
+       sodipodi:nodetypes="sssccssss" />
+    <rect
+       rx="0.45454556"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3-4"
+       width="4.09091"
+       height="2.0000112"
+       x="429.45453"
+       y="-578.86206"
+       ry="0.50000006"
+       transform="scale(1,-1)" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4-6"
+       cx="430.15454"
+       cy="-580.66217"
+       transform="scale(1,-1)"
+       r="0.69999999" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5-6"
+       cx="432.89886"
+       cy="-580.66217"
+       transform="scale(1,-1)"
+       r="0.69999999" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/train.svg
===================================================================
--- /trunk/images/presets/transport/train.svg	(revision 10565)
+++ /trunk/images/presets/transport/train.svg	(revision 10565)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="28.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.0000001"
+     inkscape:cx="-100.00134"
+     inkscape:cy="108.84549"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:snap-page="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4146"
+       d="m 4.376685,1037.1121 c -1.372083,0 -2.376687,0.5446 -2.376687,1.9962 l 2e-6,12.2538 11.000001,0 1e-6,-12.2538 c 0,-1.3422 -1.035853,-1.9962 -2.376687,-1.9962 z"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ssccsss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.999999,1037.3621 c -1.137708,0 -2.0000013,0.8609 -2.000001,2 l 1.8e-6,8 c 2e-7,1.232 0.7790292,2 2.0000002,2 l 7.000001,0 c 1.254116,0 2,-0.7238 2,-2 l 1e-6,-8 c 0,-1.1391 -0.862292,-2 -2.000001,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccssss" />
+    <rect
+       rx="1.0000002"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.0000019"
+       height="4.0000224"
+       x="2.9999995"
+       y="-1042.3618"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="4"
+       cy="-1046.3621"
+       rx="1.0000002"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11"
+       cy="-1046.3621"
+       rx="1"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+    <rect
+       style="opacity:1;fill:#c87137;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4249-2"
+       width="15.000002"
+       height="2.0000422"
+       x="-6.2488175e-007"
+       y="1050.3622"
+       ry="5.5070162e-005"
+       rx="5.5070162e-005" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4144"
+       width="2"
+       height="2.0000393"
+       x="4"
+       y="1049.3621"
+       rx="5.5070199e-005"
+       ry="0.00011014257" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4146"
+       width="2"
+       height="2.0000393"
+       x="9"
+       y="1049.3621"
+       rx="5.5070199e-005"
+       ry="0.00011014257" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/trolleybus.svg
===================================================================
--- /trunk/images/presets/transport/trolleybus.svg	(revision 10565)
+++ /trunk/images/presets/transport/trolleybus.svg	(revision 10565)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="31.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.667308"
+     inkscape:cy="9.9665688"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4151"
+       width="9"
+       height="2.9999213"
+       x="3"
+       y="1036.3617" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.3636355,1039.3617 C 2.019072,1039.3617 1,1040.3661 1,1041.695 l 0,8.1667 c 0,0.707 0.6047586,1.1667 1.1818178,1.1667 l 0,1.3335 c 4.8181822,2e-4 5.8181822,2e-4 10.6363652,0 l 0,-1.3335 c 0.561592,0 1.181817,-0.5156 1.181817,-1.1667 l 0,-8.1667 c 0,-1.3289 -1.019072,-2.3333 -2.363636,-2.3333 z"
+       id="rect4152-0-5"
+       sodipodi:nodetypes="sssccccssss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.9999977,1040.3621 c -1.137708,0 -2,0.8609 -2,2 l 0,7 c 0,0.606 0.511719,1 1,1 l 0,2 2.000001,0 1e-6,-2 5.0000013,0 0,2 2.000001,0 0,-2 c 0.475194,0 1,-0.4419 1,-1 l 0,-7 c 0,-1.1391 -0.862292,-2 -2.000001,-2 z"
+       id="rect4152-0"
+       sodipodi:nodetypes="sssccccccccssss" />
+    <rect
+       rx="1.0000002"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4152-9-3"
+       width="9.0000019"
+       height="4.0000224"
+       x="2.9999976"
+       y="-1045.3617"
+       ry="1.0000001"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-4"
+       cx="3.9999995"
+       cy="-1048.3617"
+       rx="1.0000002"
+       ry="1.0000035"
+       transform="scale(1,-1)" />
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4177-6-5"
+       cx="11.000001"
+       cy="-1048.3617"
+       rx="1"
+       ry="1.0000036"
+       transform="scale(1,-1)" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4141"
+       width="7"
+       height="1"
+       x="4"
+       y="1037.3617"
+       rx="0"
+       ry="1" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4147"
+       width="1"
+       height="2"
+       x="6"
+       y="1038.3617"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.60000002;stroke-opacity:1"
+       id="rect4149"
+       width="1"
+       height="2"
+       x="8"
+       y="1038.3617"
+       ry="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/combined_foot_cycleway.svg
===================================================================
--- /trunk/images/presets/transport/way/combined_foot_cycleway.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/combined_foot_cycleway.svg	(revision 10565)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="foot_cycleway_combined.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="8.2172205"
+     inkscape:cy="7.1801297"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4183"
+       cx="7.9999995"
+       cy="1044.3621"
+       r="7.75" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16.000002,1044.3622 c 0,4.4183 -3.581722,8 -8.0000007,8 -4.4182788,0 -8.00000180882801,-3.5817 -8.00000180882801,-8 0,-4.4183 3.58172300882801,-8.0001 8.00000180882801,-8.0001 4.4182787,0 8.0000007,3.5818 8.0000007,8.0001 z"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1883" />
+    <g
+       id="g4206"
+       transform="matrix(1.1965954,0,0,1.1965954,-1.5540266,-206.53432)">
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="5.3428707"
+         cy="1049.2119"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="FrontWheel" />
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="10.625476"
+         cy="1049.1843"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="RearWheel" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4174"
+         d="m 10.640625,1049.1434 -1.2173079,-1.5887 -3.3920677,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176"
+         d="m 5.3437495,1049.1434 1.2343749,-3.0157 0.7500014,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4178"
+         d="m 6.8721935,1047.567 0.9305068,1.6117 2.8039017,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4180"
+         d="m 9.324589,1047.5652 0,-0.8906 0.671875,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4199"
+       transform="matrix(1.1301004,0,0,1.1301004,-0.85300497,-135.47293)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 6.7578125 1.7851562 C 6.4310617 1.78267 5.8754088 1.9308083 5.8730469 3.1171875 C 5.8722798 3.5019866 5.9284594 3.8359523 6.1777344 4.1269531 C 6.2421651 4.0556438 6.373659 3.9174154 6.4414062 3.8496094 C 6.2079247 3.3768885 6.3356982 2.9943604 6.3730469 2.5585938 L 6.5195312 2.5976562 L 6.5195312 3.7753906 C 5.6938842 4.5534646 5.6083536 5.0746022 5.4863281 5.6640625 L 5.4863281 5.6679688 L 6.4277344 5.6738281 L 6.4414062 7.8710938 C 6.4414063 8.111014 6.8554688 8.1192638 6.8554688 7.8710938 L 6.8554688 5.6757812 L 7.046875 5.6757812 L 7.0605469 7.8710938 C 7.0605469 8.111014 7.4726562 8.1192638 7.4726562 7.8710938 L 7.4726562 5.6796875 L 8.4492188 5.6835938 C 8.3325851 5.0815894 8.301258 4.5503471 7.4160156 3.7851562 L 7.4121094 2.5625 L 7.4863281 2.5625 C 7.6957627 2.9986057 7.9602806 3.4078657 8.1152344 3.8710938 C 8.0806533 3.9819566 7.9568286 4.0898601 8.1152344 4.2773438 L 9.2167969 5.2929688 L 9.1015625 7.8242188 C 9.0662468 8.1109252 9.4353875 8.1334905 9.4707031 7.8496094 L 9.5332031 6.7070312 L 9.8007812 6.7070312 L 10.003906 7.8339844 C 10.048051 8.1205778 10.446059 8.0857481 10.388672 7.7773438 L 10.179688 6.59375 L 10.175781 5.3242188 L 10.835938 6.078125 C 11.023647 6.2878716 11.276062 6.0208585 11.089844 5.8105469 L 10.130859 4.7070312 L 9.2753906 4.71875 C 9.2753906 4.71875 8.8904963 4.4085195 8.5214844 4.0683594 C 8.7483493 3.9426922 8.4144167 3.379324 8.1210938 2.8242188 C 7.8782392 2.36472 7.7177453 1.7851562 7.0976562 1.7851562 L 6.7578125 1.7851562 z "
+         transform="matrix(0.88487729,0,0,0.88487729,0.75480417,1036.93)"
+         id="path1916" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.4395552,1037.8394 c 1.087e-4,0.2804 -0.2271666,0.5078 -0.507558,0.5078 -0.2803918,0 -0.5076642,-0.2274 -0.5075584,-0.5078 -1.087e-4,-0.2804 0.2271666,-0.5078 0.5075584,-0.5078 0.2803914,0 0.5076638,0.2274 0.507558,0.5078 l 0,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1922" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 9.7691448,1040.4593 c 9.42e-5,0.2505 -0.2029354,0.4536 -0.4534184,0.4536 -0.2504832,0 -0.4535132,-0.2031 -0.4534187,-0.4536 -9.42e-5,-0.2504 0.2029355,-0.4535 0.4534187,-0.4535 0.250483,0 0.4535129,0.2031 0.4534184,0.4535 l 0,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1924" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/cycle_lane_track.svg
===================================================================
--- /trunk/images/presets/transport/way/cycle_lane_track.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/cycle_lane_track.svg	(revision 10565)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="cycle_lane2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="-458.48264"
+     inkscape:cy="-95.460413"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4183"
+       cx="7.9999995"
+       cy="1044.3621"
+       r="7.75" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16.000002,1044.3622 c 0,4.4183 -3.581722,8 -8.0000007,8 -4.4182788,0 -8.00000180882801,-3.5817 -8.00000180882801,-8 0,-4.4183 3.58172300882801,-8.0001 8.00000180882801,-8.0001 4.4182787,0 8.0000007,3.5818 8.0000007,8.0001 z"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1883" />
+    <g
+       id="g4206"
+       transform="matrix(1.6304228,0,0,1.6304228,-5.0175772,-664.98842)">
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="5.3428707"
+         cy="1049.2119"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="FrontWheel" />
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="10.625476"
+         cy="1049.1843"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="RearWheel" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4174"
+         d="m 10.640625,1049.1434 -1.2173079,-1.5887 -3.3920677,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176"
+         d="m 5.3437495,1049.1434 1.2343749,-3.0157 0.7500014,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4178"
+         d="m 6.8721935,1047.567 0.9305068,1.6117 2.8039017,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4180"
+         d="m 9.324589,1047.5652 0,-0.8906 0.671875,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4312"
+       width="10.000002"
+       height="1"
+       x="3"
+       y="1038.3621"
+       ry="3.9333914e-005" />
+    <rect
+       ry="3.9333914e-005"
+       y="1049.3621"
+       x="3"
+       height="1"
+       width="10.000002"
+       id="rect4359"
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/dedicated_bridleway.svg
===================================================================
--- /trunk/images/presets/transport/way/dedicated_bridleway.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/dedicated_bridleway.svg	(revision 10565)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="dedicated_bridleway.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627418"
+     inkscape:cx="3.4120892"
+     inkscape:cy="4.8862001"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 7.9997952,1052.3625 c 4.4172818,0 8.0002068,-3.5825 8.0002068,-8.0002 0,-4.4173 -3.582925,-7.9998 -8.0002068,-7.9998 -4.4172709,0 -7.99979587683724,3.5825 -7.99979587683724,7.9998 0,4.4177 3.58252497683724,8.0002 7.99979587683724,8.0002"
+       id="path3022"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 6.7191961,1042.3192 0.9066367,-0.4749 0.1296414,0.6192 -0.460794,0.2734 c 0,0 -0.1146901,0 -0.5754841,-0.4177"
+       id="path4139"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g4138"
+       transform="matrix(1.0578344,0,0,1.0903479,-0.45739441,-94.305852)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4141"
+         d="m 12.431647,1046.894 0.287942,1.3529 c 0.02866,0.1001 0.02866,0.2156 0.02866,0.302 0,0.4027 -0.359833,0.7626 -0.777006,0.7626 l -0.345282,0 0.403033,-0.7484 -0.345693,-1.5535 -1.136428,-1.1369 0.215662,0.8053 c 0.02866,0.058 0.07186,0.2451 -0.0864,0.3743 l -1.2087191,0.9927 0.05774,0.2738 c 0.028659,0.2011 -0.071859,0.5463 -0.5609436,0.6902 l -0.2160515,-1.0072 c -0.029081,-0.1293 -0.0432,-0.2589 0.1296309,-0.4026 l 1.1077473,-0.9067 -0.4026323,-1.1078 c -0.5613441,0 -1.2519292,0.3453 -2.2595269,0.3453 l -0.4599721,0 0.8198051,2.1441 c 0.1009399,0.2588 0.1296309,0.4026 0.1296309,0.5609 0,0.3598 -0.345282,0.6765 -0.6328239,0.6765 l -0.4175731,0 0.3598224,-0.6765 -0.9353065,-2.4457 -1.6981723,0 0,1.2083 0.187382,0.1728 c 0.215651,0.2016 0.287541,0.5037 0.07186,0.8199 l -0.690575,-0.4746 c -0.201522,-0.1296 -0.273402,-0.2442 -0.273402,-0.4749 l 0,-1.4966 c 0,-0.1866 0.100519,-0.4459 0.532263,-0.4891 l 0.963987,-0.1151 c 0,0 -0.287541,-0.3166 -0.388502,-0.7484 -0.08598,-0.4312 -0.100519,-1.0213 -0.100519,-1.0213 l -0.460383,-1.3238 -0.590014,0.676 0,0.073 c 0,0.1297 -0.0864,0.4749 -0.489063,0.4749 -0.302072,0 -0.504005,-0.317 -0.446254,-0.5472 l 0.489464,-2.3306 -0.316612,-0.4462 c 0.129631,-0.015 0.517733,0.028 0.690574,0.3166 0.07186,-0.015 0.316623,-0.043 0.474523,-0.043 0.359823,0 1.093618,0.1296 1.626292,0.691 0.373963,0.388 0.6186949,0.762 0.6186949,0.762 l 1.1222877,-0.5896 -0.1583113,-0.7338 c -0.0864,-0.403 0.1583113,-0.7051 0.4749235,-0.777 0.3452925,-0.086 0.6619047,0.2015 0.719255,0.4317 l 0.4317132,2.0285 c 0.057319,0.288 0.071859,0.5469 -0.244732,0.8062 0,0 0.9066367,-0.2016 1.3815597,-0.2016 0.489054,0 1.136418,0.1151 1.654963,0.561 l 0.22978,0 c 0.561355,0 1.021738,0.4026 1.021738,1.1654 l 0,1.8561 c -0.201521,0 -0.690574,-0.2589 -0.690574,-1.0504 0,-0.4171 0.07186,-0.4171 0.07186,-0.9494 0,-0.5182 -0.244732,-0.5901 -0.431713,-0.5901 l -0.144172,0 0,2.0003 0.504004,0.7479 c 0.0432,0.072 0.07186,0.2015 0.100519,0.3166"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4137"
+         d="m 7.6831831,1038.3046 c 0.3452925,0 0.6332348,0.288 0.6332348,0.6623 0,0.3594 -0.2879423,0.6619 -0.6332348,0.6619 -0.3739625,0 -0.6619047,-0.3025 -0.6619047,-0.6619 0,-0.3743 0.2879422,-0.6623 0.6619047,-0.6623"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/dedicated_cycleway.svg
===================================================================
--- /trunk/images/presets/transport/way/dedicated_cycleway.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/dedicated_cycleway.svg	(revision 10565)
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="dedicated_cycleway.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-0.76177369"
+     inkscape:cy="3.9974697"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4183"
+       cx="7.9999995"
+       cy="1044.3621"
+       r="7.75" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16.000002,1044.3622 c 0,4.4183 -3.581722,8 -8.0000007,8 -4.4182788,0 -8.00000180882801,-3.5817 -8.00000180882801,-8 0,-4.4183 3.58172300882801,-8.0001 8.00000180882801,-8.0001 4.4182787,0 8.0000007,3.5818 8.0000007,8.0001 z"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1883" />
+    <g
+       id="g4206"
+       transform="matrix(1.6304228,0,0,1.6304228,-5.0175772,-664.98842)">
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="5.3428707"
+         cy="1049.2119"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="FrontWheel" />
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="10.625476"
+         cy="1049.1843"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="RearWheel" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4174"
+         d="m 10.640625,1049.1434 -1.2173079,-1.5887 -3.3920677,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176"
+         d="m 5.3437495,1049.1434 1.2343749,-3.0157 0.7500014,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4178"
+         d="m 6.8721935,1047.567 0.9305068,1.6117 2.8039017,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4180"
+         d="m 9.324589,1047.5652 0,-0.8906 0.671875,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/dedicated_footway.svg
===================================================================
--- /trunk/images/presets/transport/way/dedicated_footway.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/dedicated_footway.svg	(revision 10565)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="dedicated_footway.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="12.70637"
+     inkscape:cy="2.7418827"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4183"
+       cx="7.9999995"
+       cy="1044.3621"
+       r="7.75" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16.000002,1044.3622 c 0,4.4183 -3.581722,8 -8.0000007,8 -4.4182788,0 -8.00000180882801,-3.5817 -8.00000180882801,-8 0,-4.4183 3.58172300882801,-8.0001 8.00000180882801,-8.0001 4.4182787,0 8.0000007,3.5818 8.0000007,8.0001 z"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1883" />
+    <g
+       id="g4199"
+       transform="matrix(2.0369074,0,0,2.0369074,-8.0490796,-1075.6128)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 5.6679688 3.3730469 C 5.0790289 3.3685657 4.0765228 3.6370456 4.0722656 5.7753906 C 4.070883 6.4689575 4.1757035 7.0711996 4.625 7.5957031 C 4.6417898 7.5771208 4.6723236 7.5463275 4.6933594 7.5234375 C 4.7580699 7.4506864 4.8339714 7.3741453 4.90625 7.2988281 C 4.9773387 7.2239307 5.0481241 7.1452783 5.0976562 7.0957031 C 4.6768262 6.2436649 4.9072916 5.5530095 4.9746094 4.7675781 L 5.2382812 4.8378906 L 5.2382812 6.9609375 C 5.1141466 7.0779196 5.0126261 7.1879801 4.90625 7.2988281 C 4.8274255 7.3818758 4.7588022 7.4522261 4.6933594 7.5234375 C 3.7115742 8.627215 3.5660815 9.4496718 3.3769531 10.363281 L 3.3769531 10.371094 L 5.0742188 10.378906 L 5.0996094 14.34375 C 5.0996094 14.776185 5.84375 14.791055 5.84375 14.34375 L 5.84375 10.382812 L 6.1875 10.384766 L 6.2128906 14.34375 C 6.2128906 14.776185 6.9570312 14.791055 6.9570312 14.34375 L 6.9570312 10.388672 L 8.71875 10.398438 C 8.508528 9.3133771 8.4529941 8.3577054 6.8574219 6.9785156 L 6.8476562 4.7753906 L 6.9824219 4.7753906 C 7.3599094 5.5614331 7.8339905 6.2978843 8.1132812 7.1328125 C 8.0509519 7.3326331 7.8277686 7.5273115 8.1132812 7.8652344 L 10.101562 9.6972656 L 9.8925781 14.257812 C 9.8289246 14.774576 10.492987 14.816359 10.556641 14.304688 L 10.671875 12.244141 L 11.154297 12.244141 L 11.519531 14.273438 C 11.599098 14.789997 12.314374 14.727747 12.210938 14.171875 L 11.837891 12.041016 L 11.828125 9.7519531 L 13.017578 11.109375 C 13.355908 11.487425 13.814157 11.006022 13.478516 10.626953 L 11.75 8.6386719 L 10.205078 8.6601562 C 10.205078 8.6601562 9.5127681 8.0994371 8.8476562 7.4863281 C 9.2565604 7.2598241 8.6556421 6.2485756 8.1269531 5.2480469 C 7.6892289 4.4198405 7.3989064 3.3730469 6.28125 3.3730469 L 5.6679688 3.3730469 z "
+         transform="matrix(0.49094042,0,0,0.49094042,3.9516176,1036.8537)"
+         id="path1916" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.4395552,1037.8394 c 1.087e-4,0.2804 -0.2271666,0.5078 -0.507558,0.5078 -0.2803918,0 -0.5076642,-0.2274 -0.5075584,-0.5078 -1.087e-4,-0.2804 0.2271666,-0.5078 0.5075584,-0.5078 0.2803914,0 0.5076638,0.2274 0.507558,0.5078 l 0,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1922" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 9.7691448,1040.4593 c 9.42e-5,0.2505 -0.2029354,0.4536 -0.4534184,0.4536 -0.2504832,0 -0.4535132,-0.2031 -0.4534187,-0.4536 -9.42e-5,-0.2504 0.2029355,-0.4535 0.4534187,-0.4535 0.250483,0 0.4535129,0.2031 0.4534184,0.4535 l 0,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1924" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/path.svg
===================================================================
--- /trunk/images/presets/transport/way/path.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/path.svg	(revision 10565)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="path2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.7538291"
+     inkscape:cy="7.7235299"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="XMLID_164_"
+       class="st0"
+       d="M 4.4008639e-5,1048.734 C 1.9933876,1048.5426 10.335253,1046.9632 13.82955,1044.5055 c -3.270239,-1.7867 -7.8460909,-1.3191 -11.158955,-2.3481 -0.732418,-0.2338 -1.92431899,-1.0063 -0.791149,-1.7567 2.2628503,-1.0859 6.120555,-1.0386 7.2723277,-1.7347 1.4084223,-0.8512 -2.4742121,-1.9985 -3.7795367,-2.3039 0.8291485,0.1288 5.650922,0.7645 4.815971,2.2113 -0.8503911,1.4735 -4.9613089,1.7863 -6.992489,2.388 3.9192208,0.3495 14.684712,0.046 12.527055,4.5682 -1.505951,3.1563 -10.9486225,6.4727 -15.71927399,6.8325 z"
+       inkscape:connector-curvature="0"
+       style="fill:#c87137"
+       sodipodi:nodetypes="ccccscscscc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/segregated_foot_cycleway.svg
===================================================================
--- /trunk/images/presets/transport/way/segregated_foot_cycleway.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/segregated_foot_cycleway.svg	(revision 10565)
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="foot_cycleway_segregated.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="90.509668"
+     inkscape:cx="0.17403485"
+     inkscape:cy="8.2070321"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <circle
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="path4183"
+       cx="7.9999995"
+       cy="1044.3621"
+       r="7.75" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16.000002,1044.3622 c 0,4.4183 -3.581722,8 -8.0000007,8 -4.4182788,0 -8.00000180882801,-3.5817 -8.00000180882801,-8 0,-4.4183 3.58172300882801,-8.0001 8.00000180882801,-8.0001 4.4182787,0 8.0000007,3.5818 8.0000007,8.0001 z"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path1883" />
+    <g
+       id="g4206"
+       transform="matrix(0.8390792,0,0,0.8390792,5.3702027,164.66361)">
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="5.3428707"
+         cy="1049.2119"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="FrontWheel" />
+      <ellipse
+         ry="1.4791328"
+         rx="1.4791296"
+         cx="10.625476"
+         cy="1049.1843"
+         style="fill:none;stroke:#ffffff;stroke-width:0.50000012;stroke-miterlimit:4;stroke-dasharray:none"
+         id="RearWheel" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4174"
+         d="m 10.640625,1049.1434 -1.2173079,-1.5887 -3.3920677,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176"
+         d="m 5.3437495,1049.1434 1.2343749,-3.0157 0.7500014,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4178"
+         d="m 6.8721935,1047.567 0.9305068,1.6117 2.8039017,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4180"
+         d="m 9.324589,1047.5652 0,-0.8906 0.671875,0"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4199"
+       transform="matrix(1.2697888,0,0,1.2697888,-6.3140121,-277.37088)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 2.2363281 4.9550781 C 1.8691886 4.9522846 1.2448414 5.120101 1.2421875 6.453125 C 1.2413256 6.885488 1.3058503 7.2609201 1.5859375 7.5878906 C 1.6583323 7.507767 1.8047381 7.3515779 1.8808594 7.2753906 C 1.6185179 6.7442381 1.7627223 6.3138492 1.8046875 5.8242188 L 1.96875 5.8671875 L 1.96875 7.1914062 C 1.0410472 8.0656557 0.94570247 8.6501783 0.80859375 9.3125 L 0.80859375 9.3164062 L 1.8671875 9.3222656 L 1.8828125 11.792969 C 1.8828125 12.062545 2.3457031 12.071814 2.3457031 11.792969 L 2.3457031 9.3242188 L 2.5625 9.3261719 L 2.5761719 11.792969 C 2.5761719 12.062545 3.0410156 12.071814 3.0410156 11.792969 L 3.0410156 9.328125 L 4.1386719 9.3339844 C 4.0076214 8.657568 3.9731803 8.0609457 2.9785156 7.2011719 L 2.9726562 5.828125 L 3.0566406 5.828125 C 3.2919628 6.3181364 3.5876116 6.7783418 3.7617188 7.2988281 C 3.7228632 7.4233944 3.5837329 7.5452015 3.7617188 7.7558594 L 5.0019531 8.8964844 L 4.8710938 11.740234 C 4.8314127 12.06238 5.2454754 12.088502 5.2851562 11.769531 L 5.3554688 10.486328 L 5.6582031 10.486328 L 5.8847656 11.75 C 5.9343667 12.072018 6.3808874 12.034025 6.3164062 11.6875 L 6.0839844 10.359375 L 6.078125 8.9316406 L 6.8183594 9.7773438 C 7.0292713 10.013017 7.3147045 9.7128702 7.1054688 9.4765625 L 6.0292969 8.2382812 L 5.0644531 8.25 C 5.0644531 8.25 4.6333744 7.9017376 4.21875 7.5195312 C 4.473657 7.3783308 4.099111 6.746767 3.7695312 6.1230469 C 3.4966581 5.6067508 3.315877 4.9550781 2.6191406 4.9550781 L 2.2363281 4.9550781 z "
+         transform="matrix(0.78753268,0,0,0.78753268,4.9724896,1034.6075)"
+         id="path1916" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 7.4395552,1037.8394 c 1.087e-4,0.2804 -0.2271666,0.5078 -0.507558,0.5078 -0.2803918,0 -0.5076642,-0.2274 -0.5075584,-0.5078 -1.087e-4,-0.2804 0.2271666,-0.5078 0.5075584,-0.5078 0.2803914,0 0.5076638,0.2274 0.507558,0.5078 l 0,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1922" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 9.7691448,1040.4593 c 9.42e-5,0.2505 -0.2029354,0.4536 -0.4534184,0.4536 -0.2504832,0 -0.4535132,-0.2031 -0.4534187,-0.4536 -9.42e-5,-0.2504 0.2029355,-0.4535 0.4534187,-0.4535 0.250483,0 0.4535129,0.2031 0.4534184,0.4535 l 0,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1924" />
+    </g>
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4214"
+       width="14.46875"
+       height="0.68750006"
+       x="-1051.5964"
+       y="7.4352798"
+       ry="0.34375003"
+       transform="matrix(0,-1,1,0,0,0)" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/steps.svg
===================================================================
--- /trunk/images/presets/transport/way/steps.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/steps.svg	(revision 10565)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_steps.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-0.096159945"
+     inkscape:cy="4.7918823"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-text-baseline="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.50000024;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 10.134575,1039.558 2.104004,2.0626 c 0.45853,0.4108 -0.149351,0.9707 -0.520359,0.5993 l -1.583645,-1.5852 c 0,0 -0.0048,4.9292 -0.0094,6.8612 -0.0014,0.5918 -0.8840495,0.631 -0.8840495,-0.019 0,-0.5897 0.00187,-3.9202 0.00187,-3.9202 l -0.3133288,1.3193 -1.0985332,1.0692 c -0.4826779,0.4809 -1.1167814,-0.1368 -0.5744453,-0.6295 l 0.9008346,-0.8906 0.2704369,-1.6971 -0.00746,-1.4734 -0.8057155,1.3436 c -0.3019068,0.504 -0.9434561,0.047 -0.6248024,-0.4678 l 1.6897644,-2.7324 c 0.1234001,-0.1934 0.1749921,-0.2151 0.6646964,-0.2219 0.4897044,-0.01 0.5142236,0.1051 0.7901324,0.3819 z"
+       id="path4173"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsccscccccccccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -4.7683724e-7,1044.8646 3.50088317683724,0 0,2 4,0 0,2 3.9999993,0 0,2 3.99912,0 0,1.4975"
+       id="path4179"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <ellipse
+       style="opacity:1;fill:#0031ff;fill-opacity:1;stroke:#ffffff;stroke-width:0.75000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529"
+       id="path4137"
+       cx="9.3905363"
+       cy="1037.8567"
+       rx="1.1111565"
+       ry="1.1195636" />
+    <path
+       sodipodi:nodetypes="cccccscccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path4140"
+       d="m 10.134575,1039.558 2.104004,2.0626 c 0.45853,0.4108 -0.132466,0.953 -0.520359,0.5993 l -1.583645,-1.5852 c 0,0 -0.0048,4.9292 -0.0094,6.8612 -0.0014,0.5918 -0.8840495,0.631 -0.8840495,-0.019 0,-0.5897 0.00187,-3.9202 0.00187,-3.9202 l -0.3133288,1.3193 -1.0985332,1.0692 c -0.4826779,0.4809 -1.1167814,-0.1368 -0.5744453,-0.6295 l 0.9008346,-0.8906 0.2704369,-1.6971 -0.00746,-1.4734 -0.8057155,1.3436 c -0.3019068,0.504 -0.9434561,0.047 -0.6248024,-0.4678 l 1.6897644,-2.7324 c 0.1234001,-0.1934 0.1515267,-0.2152 0.6529638,-0.222 0.501437,-0.01 0.5259562,0.1052 0.801865,0.382 z"
+       style="fill:#0031ff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+    <path
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0"
+       id="path4145"
+       d="m -4.7683724e-7,1045.8621 2.50147647683724,0 0,2 4.0000001,0 0,2 4.0000009,0 0,2 4.498525,0"
+       style="fill:none;fill-rule:evenodd;stroke:#333333;stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/track.svg
===================================================================
--- /trunk/images/presets/transport/way/track.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/track.svg	(revision 10565)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_track5.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.3283712"
+     inkscape:cy="4.8721828"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3621)">
+    <g
+       id="g4187"
+       transform="matrix(0.97816647,0,0,0.97787626,0.17462164,23.127124)">
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:1.53370905;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 7.8643285,1038.9709 -4.685811,0 0,5.4508 c -1.4220966,0.4947 -2.481982,1.88 -2.481982,3.5589 0,2.0986 1.6839725,3.7693 3.6284723,3.7693 1.8429237,0 3.4382913,-1.4835 3.612425,-3.4323 1.6579709,0 1.3542269,0 2.4427552,0.011 -0.184078,0.3388 -0.280898,0.718 -0.281719,1.1036 4.05e-4,1.282 1.039543,2.3211 2.321509,2.3215 1.282663,6e-4 2.322888,-1.0387 2.323293,-2.3215 -1.39e-4,-0.3806 -0.09382,-0.7553 -0.272804,-1.0912 0.06088,4e-4 0.832676,0 0.832676,0 l -0.0019,-3.4787 -6.1443331,-0.6204 z"
+         id="path4153"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4141"
+         d="m 7.8643285,1038.9709 -4.685811,0 0,5.4508 c -1.4220966,0.4947 -2.481982,1.88 -2.481982,3.5589 0,2.0986 1.6839725,3.7693 3.6284723,3.7693 1.8429237,0 3.4382913,-1.4835 3.612425,-3.4323 1.6579709,0 1.3542269,0 2.4427552,0.011 -0.184078,0.3388 -0.280898,0.718 -0.281719,1.1036 4.05e-4,1.282 1.039543,2.3211 2.321509,2.3215 1.282663,6e-4 2.322888,-1.0387 2.323293,-2.3215 -1.39e-4,-0.3806 -0.09382,-0.7553 -0.272804,-1.0912 0.06088,4e-4 0.832676,0 0.832676,0 l -0.0019,-3.4787 -6.1443331,-0.6204 z"
+         style="fill:#000000;stroke:none;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4139"
+         d="m 4.1787991,1039.9017 2.9455706,0 0.9878004,4.3827 -3.933371,-0.028 z"
+         style="fill:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4137"
+         d="m 4.3392722,1046.5044 c 0.9287187,0 1.4799173,0.7049 1.4799173,1.4994 0,0.7943 -0.5511986,1.4994 -1.4799173,1.4994 -0.928717,0 -1.4799176,-0.7051 -1.4799176,-1.4994 0,-0.7945 0.5512006,-1.4994 1.4799176,-1.4994 z"
+         style="fill:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4140"
+         d="m 12.378968,1048.3337 c 0.701936,8e-4 1.153715,0.5173 1.153623,1.0967 -9.2e-5,0.5792 -0.49896,1.1112 -1.112613,1.1108 -0.613651,-7e-4 -1.11633,-0.5293 -1.110829,-1.1108 0.0055,-0.5818 0.367884,-1.0974 1.069819,-1.0967 z"
+         style="fill:#ffffff" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_bicycle_road.svg
===================================================================
--- /trunk/images/presets/transport/way/way_bicycle_road.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_bicycle_road.svg	(revision 10565)
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_bicycle_road.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="10.606902"
+     inkscape:cy="2.6828405"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43253)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4150"
+       d="m 9.0000011,1052.3621 -1.0000035,0 0,-16 1.0000035,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000014,1039.3637 -1.0000035,0 0,-2 1.0000035,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000044,1043.3637 -1.0000036,0 0,-2 1.0000036,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 0.9999997,1052.3621 -1.0000034980233,0 0,-16 1.0000034980233,0 z"
+       id="path4148"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4144"
+       cx="12.500001"
+       cy="1048.8621"
+       r="2.5000017" />
+    <g
+       id="g4216"
+       transform="translate(-0.49999974,-0.49999774)">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 6.9355488,1043.6628 c -0.1797699,0 -0.2077347,0.1051 -0.28125,0.2325 l -1.4140625,2.7109 c -0.3603853,-0.1453 -0.7545796,-0.2266 -1.1699219,-0.2266 -1.6356291,0 -3.0703125,1.3415 -3.0703124,2.9903 -1e-7,1.7176 1.4480151,2.9922 3.0703124,2.9922 1.6922901,0 3.0722657,-1.2871 3.0722657,-2.9922 0,-1.0437 -0.5602465,-1.97 -1.40625,-2.5059 l 0.4121093,-0.789 2.3985754,3.4113 c 0.041154,0.058 0.1426096,0.159 0.2713465,0.159 l 1.1445309,0 c 0.1440218,1.5615 1.4483258,2.7129 3.0449218,2.7129 1.62233,0 2.992188,-1.2871 2.992188,-2.9922 0,-1.6356 -1.356525,-2.9902 -2.992188,-2.9902 -1.605647,0 -2.896292,1.2048 -3.0429688,2.7109 l -0.8144526,0 0.9570314,-3.2754 0.582031,0.01 c 0.519111,0 0.51987,-0.7168 0.0078,-0.7168 l -1.7675773,-0.016 c -0.4595687,0 -0.4826045,0.7141 0.029297,0.7168 l 0.5664055,0.01 -0.839843,2.875 -2.2480467,-3.166 0.6757927,-1.2951 1.0273438,0 c 0.3707027,0 0.3707027,-0.5569 0,-0.5585 z m -2.8652344,3.4336 c 0.2975593,0 0.5767812,0.058 0.8359376,0.1524 l -1.0820313,2.0723 c -0.2068299,0.3397 0.3337774,0.6218 0.4941406,0.2578 l 1.0878907,-2.084 c 0.6200081,0.4131 1.0175781,1.1055 1.0175781,1.875 0,1.3272 -1.0138888,2.2754 -2.3535157,2.2754 -1.2500412,0 -2.3535156,-0.9608 -2.3535156,-2.2754 0,-1.2233 1.1168062,-2.2735 2.3535156,-2.2735 z m 8.9374996,0 c 1.236699,0 2.273438,1.0369 2.273438,2.2735 0,1.3272 -1.023405,2.2754 -2.273438,2.2754 -1.241846,0 -2.192412,-0.8198 -2.326172,-1.9961 l 2.404297,0 c 0.370762,0 0.370762,-0.557 0,-0.5586 l -2.402344,0 c 0.142041,-1.1083 1.099524,-1.9942 2.324219,-1.9942 z"
+         id="path4214"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccsssscccccsssccccccccccccccsccccsssssssccccs" />
+      <path
+         sodipodi:nodetypes="cccsssscccccsssccccccccccccccsccccsssssssccccs"
+         inkscape:connector-curvature="0"
+         id="path4166"
+         d="m 6.9355488,1043.6628 c -0.1797699,0 -0.2077347,0.1051 -0.28125,0.2325 l -1.4140625,2.7109 c -0.3603853,-0.1453 -0.7545796,-0.2266 -1.1699219,-0.2266 -1.6356291,0 -3.0703125,1.3415 -3.0703124,2.9903 -1e-7,1.7176 1.4480151,2.9922 3.0703124,2.9922 1.6922901,0 3.0722657,-1.2871 3.0722657,-2.9922 0,-1.0437 -0.5602465,-1.97 -1.40625,-2.5059 l 0.4121093,-0.789 2.3985754,3.4113 c 0.041154,0.058 0.1426096,0.159 0.2713465,0.159 l 1.1445309,0 c 0.1440218,1.5615 1.4483258,2.7129 3.0449218,2.7129 1.62233,0 2.992188,-1.2871 2.992188,-2.9922 0,-1.6356 -1.356525,-2.9902 -2.992188,-2.9902 -1.605647,0 -2.896292,1.2048 -3.0429688,2.7109 l -0.8144526,0 0.9570314,-3.2754 0.582031,0.01 c 0.519111,0 0.51987,-0.7168 0.0078,-0.7168 l -1.7675773,-0.016 c -0.4595687,0 -0.4826045,0.7141 0.029297,0.7168 l 0.5664055,0.01 -0.839843,2.875 -2.2480467,-3.166 0.6757927,-1.2951 1.0273438,0 c 0.3707027,0 0.3707027,-0.5569 0,-0.5585 z m -2.8652344,3.4336 c 0.2975593,0 0.5767812,0.058 0.8359376,0.1524 l -1.0820313,2.0723 c -0.2068299,0.3397 0.3337774,0.6218 0.4941406,0.2578 l 1.0878907,-2.084 c 0.6200081,0.4131 1.0175781,1.1055 1.0175781,1.875 0,1.3272 -1.0138888,2.2754 -2.3535157,2.2754 -1.2500412,0 -2.3535156,-0.9608 -2.3535156,-2.2754 0,-1.2233 1.1168062,-2.2735 2.3535156,-2.2735 z m 8.9374996,0 c 1.236699,0 2.273438,1.0369 2.273438,2.2735 0,1.3272 -1.023405,2.2754 -2.273438,2.2754 -1.241846,0 -2.192412,-0.8198 -2.326172,-1.9961 l 2.404297,0 c 0.370762,0 0.370762,-0.557 0,-0.5586 l -2.402344,0 c 0.142041,-1.1083 1.099524,-1.9942 2.324219,-1.9942 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.71800011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_construction.svg
===================================================================
--- /trunk/images/presets/transport/way/way_construction.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_construction.svg	(revision 10565)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_construction.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="11.816249"
+     inkscape:cy="8.3197995"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ffda00;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffda00;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4144"
+       d="m 9.0000011,1052.3621 -1.0000032,0 0,-16 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 1.0000026,1052.3621 -1.00000307683724,0 0,-16 1.00000307683724,0 z"
+       id="path4142"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccsccccsccccccccccccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path4148"
+       d="m 10.720476,1041.2659 -1.5781251,1.961 c -0.1548457,0.1404 -0.1806967,0.3677 -0.076172,0.5488 0.517885,0.897 1.5410151,2.5351 1.5410151,2.5351 l -3.1191411,3.0567 c -0.2574782,-0.3929 -0.552496,-0.7643 -1.1269521,-0.7559 -0.462131,0.01 -0.7366883,0.1639 -1.2636719,0.7227 0,0 -1.3733516,0.079 -1.3965222,1.3725 -0.016223,0.9059 -0.7386567,-0.055 -1.1659778,1.1548 l 8.0976571,0 c -1.2813647,-0.5416 -1.0600741,-1.6258 -2.0683602,-1.5898 -0.4108704,0.016 -0.647114,-0.2616 -0.8671875,-0.5918 1.2784057,-1.2784 4.1347657,-4.0508 4.1347657,-4.0508 l -1.433593,2.4512 1.529297,3.3691 c 0.371179,0.8309 1.616701,0.2662 1.236328,-0.5605 l -1.238282,-2.7305 1.482422,-2.4589 0.06641,2.5019 0.679687,3.1132 c 0.18125,0.9018 1.536659,0.6064 1.326172,-0.289 l -0.652344,-2.9903 -0.07617,-2.541 c -0.0024,-0.1721 -0.07014,-0.3368 -0.189453,-0.4609 l -0.990239,-1.1094 0.210937,-0.207 c 0.288052,0.3533 0.929142,0.03 0.716797,-0.4531 l -0.07617,-0.1739 0.253907,-0.25 c 0.18391,-0.1839 -0.0622,-0.4549 -0.257817,-0.2636 l -0.156248,0.1523 -0.751953,-1.7012 -2.097164,-0.016 c -0.482794,8e-4 -0.621584,0.1608 -0.693852,0.2545 z m 1.017578,0.6055 1.207032,0.014 0.658203,1.4902 -0.277344,0.2734 z m -1.5,2.1719 1.611329,1.0527 -0.613282,0.5996 z"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.0616979px"
+       d="m 11.09743,1041.0022 c -0.165896,0.01 -0.304686,0.17 -0.376954,0.2637 l -1.5781251,1.961 c -0.1548457,0.1404 -0.1847852,0.3701 -0.076172,0.5488 l 1.5410151,2.5351 -3.1191411,3.0567 c -0.2574782,-0.3929 -0.552496,-0.7643 -1.1269521,-0.7559 -0.462131,0.01 -0.7366883,0.1639 -1.2636719,0.7227 0,0 -1.3733516,0.079 -1.3965222,1.3725 -0.016223,0.9059 -0.7386567,-0.055 -1.1659778,1.1548 l 8.0976571,0 c -1.2813647,-0.5416 -1.0600741,-1.6258 -2.0683602,-1.5898 -0.4108704,0.016 -0.647114,-0.2616 -0.8671875,-0.5918 1.2784057,-1.2784 4.1347657,-4.0508 4.1347657,-4.0508 l -1.433593,2.4512 1.529297,3.3691 c 0.371179,0.8309 1.616701,0.2662 1.236328,-0.5605 l -1.238282,-2.7305 1.482422,-2.4589 0.06641,2.5019 0.679687,3.1132 c 0.18125,0.9018 1.536659,0.6064 1.326172,-0.289 l -0.652344,-2.9903 -0.07617,-2.541 c -0.0024,-0.1721 -0.07014,-0.3368 -0.189453,-0.4609 l -0.990239,-1.1094 0.210937,-0.207 c 0.288052,0.3533 0.929142,0.03 0.716797,-0.4531 l -0.07617,-0.1739 0.253907,-0.25 c 0.18391,-0.1839 -0.0622,-0.4549 -0.257817,-0.2636 l -0.156248,0.1523 -0.751953,-1.7012 z m 0.640624,0.8692 1.207032,0.014 0.658203,1.4902 -0.277344,0.2734 z m -1.5,2.1719 1.611329,1.0527 -0.613282,0.5996 z"
+       id="path2224"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccsccccscccccccccccccccccccccccccccccccccc" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4146"
+       cx="8.4802437"
+       cy="1040.3616"
+       r="1.5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_escape.svg
===================================================================
--- /trunk/images/presets/transport/way/way_escape.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_escape.svg	(revision 10565)
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_escape.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.7365774"
+     inkscape:cy="7.827016"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4158"
+       d="m 9.0000011,1052.3621 -1.0000029,0 0,-16 1.0000029,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="964.44409"
+       x="379.53418"
+       id="XMLID_308_-8" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="964.43304"
+       x="381.49033"
+       id="XMLID_307_-3"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="966.39923"
+       x="379.53415"
+       id="XMLID_306_-4" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="966.38818"
+       x="381.49026"
+       id="XMLID_305_-0" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="968.35437"
+       x="379.53409"
+       id="XMLID_304_-9" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="968.34326"
+       x="381.49023"
+       id="XMLID_303_-4" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="970.30945"
+       x="379.53406"
+       id="XMLID_302_-4" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="970.2984"
+       x="381.4902"
+       id="XMLID_301_-4" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="972.26459"
+       x="379.53403"
+       id="XMLID_300_-8" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="972.25354"
+       x="381.49014"
+       id="XMLID_299_-9" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="974.21973"
+       x="379.53397"
+       id="XMLID_298_-0" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="974.20862"
+       x="381.49011"
+       id="XMLID_297_-5" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="976.17487"
+       x="379.53394"
+       id="XMLID_296_-7" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="976.16376"
+       x="381.49008"
+       id="XMLID_295_-6" />
+    <rect
+       height="1.9550747"
+       width="1.9550747"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="978.12994"
+       x="379.53387"
+       id="XMLID_294_-7" />
+    <rect
+       style="fill:#ffff00"
+       height="1.9550747"
+       width="1.9550747"
+       class="st11"
+       transform="matrix(0.9348333,0.35508688,-0.35508688,0.9348333,0,0)"
+       y="978.1189"
+       x="381.49002"
+       id="XMLID_293_-0" />
+    <path
+       class="st5"
+       d="m 1.0000025,1052.3621 -1.00000297683724,0 0,-16 1.00000297683724,0 z"
+       id="path4156"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_living_street.svg
===================================================================
--- /trunk/images/presets/transport/way/way_living_street.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_living_street.svg	(revision 10565)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_living_street10.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <clipPath
+       id="clipPath19">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 0.496094,0.0351562 5952.500006,0 0,7934.6400438 -5952.500006,0 0,-7934.6400438 z"
+         id="path21" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.148732"
+     inkscape:cy="3.6412854"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       height="16.000042"
+       width="9.0000019"
+       class="st4"
+       y="1036.3621"
+       x="-4.7683727e-007"
+       id="XMLID_61_" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       height="16.000042"
+       width="1.0000002"
+       class="st4"
+       y="1036.3621"
+       x="8.000001"
+       id="rect4151" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 4.9999557,1039.3655 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 4.9999587,1043.3655 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 4.9999587,1047.3655 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 7.3492603,1049.6462 c 0,-0.9478 -0.7682665,-1.7164 -1.7161141,-1.7164 -0.947775,0 -1.7161169,0.7686 -1.7161169,1.7164 0,0.9478 0.7683419,1.7159 1.7161169,1.7159 0.9478476,0 1.7161141,-0.7681 1.7161141,-1.7159"
+       id="path35"
+       style="fill:#0031ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <path
+       sodipodi:nodetypes="ccccccssccccccccsssscccccc"
+       style="fill:#0031ff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
+       id="path4144"
+       d="m 10.140966,1046.7542 -0.9944619,-1.8507 -1.1156893,2.2312 c -0.138165,0.2764 -0.4743006,0.3906 -0.7507955,0.2513 -0.2764418,-0.1396 -0.3884647,-0.474 -0.2501991,-0.7507 l 1.5057313,-3.0115 c 0.303321,-0.6064 0.923453,-0.9897 1.6018125,-0.9897 l 1.997355,0 c 0.329737,0 0.63265,0.1787 0.788747,0.4713 l 1.156119,2.1521 c 0.09721,0.1759 0.09224,0.3906 -0.01312,0.5631 -0.105417,0.1703 -0.294717,0.2764 -0.495912,0.2681 -0.201287,0 -0.383325,-0.1229 -0.476788,-0.2988 l -1.052813,-1.9595 -0.677681,0 2.162397,4.0463 1.228131,0.022 c 0.412041,0.01 0.746203,0.3347 0.746203,0.7462 0,0.4121 -0.334121,0.7519 -0.746203,0.7462 l -1.585043,-0.022 c -0.329624,0 -0.632656,-0.1786 -0.788822,-0.4718 l -0.843783,-1.5923 -2.0731756,4.1461 c -0.1843969,0.3705 -0.6325023,0.5179 -1.0010868,0.3347 -0.3686626,-0.1842 -0.5179724,-0.6323 -0.3336765,-1.0036 z"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 10.140966,1046.7542 -0.9944619,-1.8507 -1.1156893,2.2312 c -0.138165,0.2764 -0.4743006,0.3906 -0.7507955,0.2513 -0.2764418,-0.1396 -0.3884647,-0.474 -0.2501991,-0.7507 l 1.5057313,-3.0115 c 0.303321,-0.6064 0.923453,-0.9897 1.6018125,-0.9897 l 1.997355,0 c 0.329737,0 0.63265,0.1787 0.788747,0.4713 l 1.156119,2.1521 c 0.09721,0.1759 0.09224,0.3906 -0.01312,0.5631 -0.105417,0.1703 -0.294717,0.2764 -0.495912,0.2681 -0.201287,0 -0.383325,-0.1229 -0.476788,-0.2988 l -1.052813,-1.9595 -0.677681,0 2.162397,4.0463 1.228131,0.022 c 0.412041,0.01 0.746203,0.3347 0.746203,0.7462 0,0.4121 -0.334121,0.7519 -0.746203,0.7462 l -1.585043,-0.022 c -0.329624,0 -0.632656,-0.1786 -0.788822,-0.4718 l -0.843783,-1.5923 -2.0731756,4.1461 c -0.1843969,0.3705 -0.6325023,0.5179 -1.0010868,0.3347 -0.3686626,-0.1842 -0.5179724,-0.6323 -0.3336765,-1.0036 z"
+       id="path39"
+       style="fill:#0031ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       sodipodi:nodetypes="ccccccssccccccccsssscccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 10.01789,1040.8625 c 0,-0.917 -0.7435855,-1.661 -1.6606726,-1.661 -0.9172669,0 -1.6608557,0.744 -1.6608557,1.661 0,0.917 0.7435888,1.6607 1.6608557,1.6607 0.9170871,0 1.6606726,-0.7437 1.6606726,-1.6607"
+       id="path43"
+       style="fill:#0031ff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.50000006;stroke-miterlimit:4;stroke-dasharray:none" />
+    <rect
+       id="rect4149"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       class="st4"
+       width="1.0000002"
+       height="16.000042"
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_motorway.svg
===================================================================
--- /trunk/images/presets/transport/way/way_motorway.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_motorway.svg	(revision 10565)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="16"
+   viewBox="0 0 15 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_motorway.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-17.965411"
+     inkscape:cy="8.1794399"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path243"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m -4.7683724e-7,1052.3621 7.00000127683724,0 0,-16 -7.00000127683724,0 0,16 z" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 4.0000027,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 4.0000057,1043.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-8"
+       d="m 4.0000033,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-6"
+       d="m 4.0000033,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path243-1"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m 7.9999949,1052.3621 7.0000031,0 0,-16 -7.0000031,0 0,16 z" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-6"
+       d="m 11.999999,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 12.000002,1043.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-8-5"
+       d="m 11.999999,1047.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-6-9"
+       d="m 11.999999,1051.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_motorway_link.svg
===================================================================
--- /trunk/images/presets/transport/way/way_motorway_link.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_motorway_link.svg	(revision 10565)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_motorway_link.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="2.2222667"
+     inkscape:cy="4.3455837"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path243"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="m -4.7683724e-7,1052.3621 7.00000127683724,0 0,-16 -7.00000127683724,0 0,16 z" />
+    <path
+       style="fill:#0000ff;fill-opacity:1"
+       d="m 7.9999995,1036.3621 0,16 7.0000005,0 0,-3 1,0 0,-9 -1,0 0,-4 -7.0000005,0 z"
+       id="XMLID_61_" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 4.0000027,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 4.0000057,1043.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-8"
+       d="m 4.0000033,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-6"
+       d="m 4.0000033,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-6"
+       d="m 11.999999,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 12.000002,1043.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-8-5"
+       d="m 11.999999,1047.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-6-9"
+       d="m 11.999999,1051.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7-0"
+       d="m 12.000002,1045.3621 0,-1 2,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7-0-6"
+       d="m 15.000002,1045.3621 0,-1 1,0 0,1 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_pedestrian.svg
===================================================================
--- /trunk/images/presets/transport/way/way_pedestrian.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_pedestrian.svg	(revision 10565)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_pedestrian.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.000001"
+     inkscape:cx="-11.842439"
+     inkscape:cy="9.1066944"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78328,616.43253)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 4.9999404,1039.3637 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 4.9999434,1043.3637 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 4.9999434,1047.3637 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 4.9999404,1051.3637 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 1.0000025,1052.3605 -1.00000297683724,0 0,-15.9984 1.00000297683724,0 z"
+       id="path4144"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4146"
+       d="m 9.0000011,1052.3605 -1.0000029,0 0,-15.9984 1.0000029,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccsscc"
+       inkscape:connector-curvature="0"
+       id="path4150"
+       d="m 8.9658564,1040.0181 c -0.7445917,0 -1.3435512,0.5365 -1.3435512,1.2025 l 0,4.5869 c -0.011891,0.7514 1.2544814,0.7514 1.2425902,0 l 0,-3.7485 0.6403454,0 0,9.1285 c -0.01528,0.9661 1.6128972,0.9661 1.5976172,0 l 0,-5.3819 0.790862,0 0,5.3819 c 0,0.966 1.612758,0.9659 1.597619,0 l 0,-9.1285 0.705526,0 0,3.7485 c -0.01195,0.7514 1.254538,0.7514 1.242589,0 l 0,-3.8636 0,-0.7235 c 0,-0.6658 -0.60007,-1.2024 -1.344661,-1.2024 l -5.1289366,0 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.90000015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate" />
+    <ellipse
+       style="opacity:1;fill:#0031ff;fill-opacity:1;stroke:#ffffff;stroke-width:0.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4145"
+       cx="11.53088"
+       cy="1038.2709"
+       rx="1.6588078"
+       ry="1.6587859" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#0031ff;fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+       d="m 8.9658564,1040.0181 c -0.7445917,0 -1.3435512,0.5365 -1.3435512,1.2025 l 0,4.5869 c -0.011891,0.7514 1.2544814,0.7514 1.2425902,0 l 0,-3.7485 0.6403454,0 0,9.1285 c -0.01528,0.9661 1.6128972,0.9661 1.5976172,0 l 0,-5.3819 0.790862,0 0,5.3819 c 0,0.966 1.612758,0.9659 1.597619,0 l 0,-9.1285 0.705526,0 0,3.7485 c -0.01195,0.7514 1.254538,0.7514 1.242589,0 l 0,-4.5871 c 0,-0.6658 -0.60007,-1.2024 -1.344661,-1.2024 l -5.1289366,0 z"
+       id="path3772"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccscc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_primary.svg
===================================================================
--- /trunk/images/presets/transport/way/way_primary.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_primary.svg	(revision 10565)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_primary2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-5.9316545"
+     inkscape:cy="9.4113212"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78328,616.43414)"
+       style="fill:#ff2a2a;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ff2a2a;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_primary_link.svg
===================================================================
--- /trunk/images/presets/transport/way/way_primary_link.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_primary_link.svg	(revision 10565)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_primary_link.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-7.4105752"
+     inkscape:cy="3.671305"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16,1040.3621 0,8.9999 -6.999998,0 0,-8.9999 z m -15.999949545768,-4.0016 8.999941545768,0 0,15.9984 -8.999941545768,0 z"
+       style="fill:#ff2a2a;fill-opacity:1"
+       id="XMLID_61_-5" />
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ff0f06;fill-opacity:0.89302326" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3"
+       d="m 13.000002,1045.3621 0,-1 2,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-0"
+       d="m 9.0000011,1045.3621 0,-1 1.9999999,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-2"
+       d="m 5.0000004,1045.3621 0,-1 2.0000009,0 0,1 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_residential.svg
===================================================================
--- /trunk/images/presets/transport/way/way_residential.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_residential.svg	(revision 10565)
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_residential3.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <clipPath
+       id="clipPath19">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 0.496094,0.0351562 5952.500006,0 0,7934.6400438 -5952.500006,0 0,-7934.6400438 z"
+         id="path21" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="7.6308379"
+     inkscape:cy="6.7768599"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       height="16.000042"
+       width="9.0000019"
+       class="st4"
+       y="1036.3621"
+       x="-4.7683727e-007"
+       id="XMLID_61_" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       height="16.000042"
+       width="1.0000002"
+       class="st4"
+       y="1036.3621"
+       x="8.000001"
+       id="rect4151" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 4.9999557,1039.3655 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 4.9999587,1043.3655 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 4.9999587,1047.3655 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <rect
+       id="rect4149"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       class="st4"
+       width="1.0000002"
+       height="16.000042"
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+    <path
+       class="st5"
+       d="m 5.0000004,1051.3621 -1.000004,0 0,-2 1.000004,0 z"
+       id="path4153"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_road.svg
===================================================================
--- /trunk/images/presets/transport/way/way_road.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_road.svg	(revision 10565)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_road.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="9.1132973"
+     inkscape:cy="7.7363408"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382-2"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78324,616.43072)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         id="XMLID_61_-9"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4144"
+       d="m 9.000005,1052.3621 -1.000004,0 0,-16 1.000004,0 z"
+       class="st5" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 11.736234,1039.8188 c -0.77002,0.017 -1.567111,0.7072 -1.489779,2.2195 l -1.7457337,-0.017 c -0.032221,-2.2242 1.025931,-3.0492 1.5484917,-3.2969 0.49942,-0.2368 1.133572,-0.3622 1.751006,-0.3622 0.738027,0 1.340991,0.094 1.80889,0.2787 0.4679,0.1843 0.848973,0.4225 1.133571,0.7101 0.284599,0.2877 0.482371,0.6113 0.593316,0.9664 0.110946,0.3551 0.164006,0.6967 0.164006,1.0203 0,0.409 -0.082,0.7731 -0.250832,1.0922 -0.16883,0.3191 -0.37625,0.6158 -0.622259,0.8944 -0.246009,0.2787 -0.516136,0.5394 -0.815206,0.7956 -0.29907,0.2517 -0.569197,0.5124 -0.815207,0.7821 -0.246009,0.2697 -0.453428,0.5663 -0.622258,0.8854 -0.168829,0.3191 -0.250833,0.6742 -0.250833,1.0743 l 0,0.1977 c 0,0.072 0.0048,0.1394 0.0193,0.1978 l -1.504996,0 c -0.05306,-0.2382 -0.07718,-0.4944 -0.07718,-0.7596 0,-0.3866 0.07236,-0.7326 0.221891,-1.0473 0.149535,-0.3146 0.337659,-0.6068 0.569197,-0.8764 0.231538,-0.2697 0.477547,-0.5214 0.733204,-0.7596 0.255656,-0.2338 0.501665,-0.472 0.738027,-0.7102 0.231538,-0.2382 0.424486,-0.4944 0.569197,-0.7596 0.149535,-0.2652 0.221891,-0.5528 0.221891,-0.8675 0,-0.5079 -0.173654,-0.9169 -0.52096,-1.236 -0.342484,-0.3101 -0.686455,-0.4366 -1.356739,-0.4221 z m 1.052845,10.3643 c 0,0.3236 -0.115769,0.6068 -0.347307,0.845 -0.231538,0.2382 -0.549902,0.3596 -0.95027,0.3596 -0.400368,0 -0.718732,-0.1214 -0.95027,-0.3596 -0.231538,-0.2382 -0.347307,-0.5214 -0.347307,-0.845 0,-0.3236 0.115769,-0.6068 0.347307,-0.8495 0.231538,-0.2382 0.549902,-0.3595 0.95027,-0.3595 0.400368,0 0.713909,0.1213 0.95027,0.3595 0.231538,0.2383 0.347307,0.5214 0.347307,0.8495 z"
+       class="st1"
+       id="path4148"
+       sodipodi:nodetypes="sccsssssssscssssccssscccscsssssscscs" />
+    <g
+       id="XMLID_135_"
+       transform="matrix(0.04823707,0,0,0.04494684,-1.1321391,1026.5321)"
+       style="fill:#000000">
+      <path
+         style="fill:#000000"
+         inkscape:connector-curvature="0"
+         d="m 266.77352,295.60834 c -15.96324,0.36944 -32.48768,15.73538 -30.88452,49.38093 l -36.19071,-0.38025 C 199.03031,295.12395 220.9668,276.76971 231.8,271.25733 242.15344,265.98907 255.3,263.2 268.1,263.2 c 15.3,0 27.8,2.1 37.5,6.2 9.7,4.1 17.6,9.4 23.5,15.8 5.9,6.4 10,13.6 12.3,21.5 2.3,7.9 3.4,15.5 3.4,22.7 0,9.1 -1.7,17.2 -5.2,24.3 -3.5,7.1 -7.8,13.7 -12.9,19.9 -5.1,6.2 -10.7,12 -16.9,17.7 -6.2,5.6 -11.8,11.4 -16.9,17.4 -5.1,6 -9.4,12.6 -12.9,19.7 -3.5,7.1 -5.2,15 -5.2,23.9 l 0,4.4 c 0,1.6 0.1,3.1 0.4,4.4 l -31.2,0 c -1.1,-5.3 -1.6,-11 -1.6,-16.9 0,-8.6 1.5,-16.3 4.6,-23.3 3.1,-7 7,-13.5 11.8,-19.5 4.8,-6 9.9,-11.6 15.2,-16.9 5.3,-5.2 10.4,-10.5 15.3,-15.8 4.8,-5.3 8.8,-11 11.8,-16.9 3.1,-5.9 4.6,-12.3 4.6,-19.3 0,-11.3 -3.6,-20.4 -10.8,-27.5 -7.1,-6.9 -14.23086,-9.71326 -28.12648,-9.39166 z M 288.6,526.2 c 0,7.2 -2.4,13.5 -7.2,18.8 -4.8,5.3 -11.4,8 -19.7,8 -8.3,0 -14.9,-2.7 -19.7,-8 -4.8,-5.3 -7.2,-11.6 -7.2,-18.8 0,-7.2 2.4,-13.5 7.2,-18.9 4.8,-5.3 11.4,-8 19.7,-8 8.3,0 14.8,2.7 19.7,8 4.8,5.3 7.2,11.6 7.2,18.9 z"
+         class="st1"
+         id="XMLID_140_"
+         sodipodi:nodetypes="sccsssssssscssssccssscccscsssssscscs" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000012,1039.3621 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000042,1043.3621 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000042,1047.3621 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000012,1051.3621 -1.000004,0 0,-2 1.000004,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 1.0000035,1052.3621 -1.00000397683724,0 0,-16 1.00000397683724,0 z"
+       id="path4142"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_secondary.svg
===================================================================
--- /trunk/images/presets/transport/way/way_secondary.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_secondary.svg	(revision 10565)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_secondary.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-6.3222795"
+     inkscape:cy="9.4113212"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ffa506;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffa506;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_secondary_link.svg
===================================================================
--- /trunk/images/presets/transport/way/way_secondary_link.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_secondary_link.svg	(revision 10565)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_secondary_link.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.4706492"
+     inkscape:cy="6.8026677"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382-7"
+       transform="matrix(0,1.3846064,-0.49634025,0,199.69553,835.57882)"
+       style="fill:#ffa506;fill-opacity:1">
+      <path
+         id="XMLID_61_-5"
+         style="fill:#ffa506;fill-opacity:1"
+         d="m 147.89999,370.10001 6.5,0 0,14.1 -6.5,0 z m -2.89006,32.23584 0,-18.1326 11.55447,0 0,18.1326 z" />
+    </g>
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ffa506;fill-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-5"
+       d="m 5.0000004,1045.3621 0,-1 1.9999999,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-5-5"
+       d="m 9.0000011,1045.3621 0,-1 1.9999999,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-5-7"
+       d="m 13.000002,1045.3621 0,-1 2,0 0,1 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_service.svg
===================================================================
--- /trunk/images/presets/transport/way/way_service.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_service.svg	(revision 10565)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="7"
+   height="16"
+   viewBox="0 0 7 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_service.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="2.891509"
+     inkscape:cy="9.0539547"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.0769141,0,0,1.1346381,-159.27553,616.43092)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       class="st5"
+       d="m 1.000003,1052.3605 -1.00000323841862,0 0,-15.9984 1.00000323841862,0 z"
+       id="path4144"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       class="st5"
+       d="m 7.0000006,1052.3621 -1.0000032,0 0,-15.9984 1.0000032,0 z"
+       id="path4144-2"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_service_parking_aisle.svg
===================================================================
--- /trunk/images/presets/transport/way/way_service_parking_aisle.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_service_parking_aisle.svg	(revision 10565)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="4"
+   height="16"
+   viewBox="0 0 4 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_service_parking_aisle.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="-0.75848883"
+     inkscape:cy="6.6411186"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(0.6153756,0,0,1.1346381,-91.013989,616.43092)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffffff;fill-opacity:1" />
+    </g>
+    <path
+       class="st5"
+       d="m 1.0000031,1052.3621 -1.000003159604648,0 0,-15.9984 1.000003159604648,0 z"
+       id="path4144-2"
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#808080;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4142"
+       d="m 4.0000001,1052.3605 -1.0000031,0 0,-15.9984 1.0000031,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_tertiary.svg
===================================================================
--- /trunk/images/presets/transport/way/way_tertiary.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_tertiary.svg	(revision 10565)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_tertiary2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-0.6035295"
+     inkscape:cy="9.4113212"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ffd42a">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#ffd42a" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_tertiary_link.svg
===================================================================
--- /trunk/images/presets/transport/way/way_tertiary_link.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_tertiary_link.svg	(revision 10565)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_tertiary_link.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="2.3495955"
+     inkscape:cy="7.7550712"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 16,1040.3622 0,8.9999 -6.999998,0 0,-8.9999 z m -15.999949545768,-4.0017 8.999941545768,0 0,15.9984 -8.999941545768,0 z"
+       style="fill:#ffd42a;fill-opacity:1"
+       id="XMLID_61_-0" />
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-2"
+       d="m 5.0000004,1045.3621 0,-1 2,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-5"
+       d="m 9.0000011,1045.3621 0,-1 2.0000009,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#606060;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-5-0"
+       d="m 13.000002,1045.3621 0,-1 2.000001,0 0,1 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_trunk.svg
===================================================================
--- /trunk/images/presets/transport/way/way_trunk.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_trunk.svg	(revision 10565)
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_trunk.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="2.4525276"
+     inkscape:cy="7.8737159"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 5.0454232e-5,1036.3605 8.999941545768,0 0,15.9984 -8.999941545768,0 z"
+       style="fill:#0000ff;fill-opacity:1"
+       id="XMLID_61_-5"
+       sodipodi:nodetypes="ccccc" />
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ff0f06;fill-opacity:0.89302326" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_trunk_link.svg
===================================================================
--- /trunk/images/presets/transport/way/way_trunk_link.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_trunk_link.svg	(revision 10565)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_trunk_link.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="22.22596"
+     inkscape:cy="11.12509"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382-3"
+       transform="matrix(0,1.3846064,-0.49645373,0,199.73753,835.57882)"
+       style="fill:#0000ff;fill-opacity:1">
+      <path
+         id="XMLID_61_-5"
+         style="fill:#0000ff;fill-opacity:1"
+         d="m 147.89999,370.10001 6.5,0 0,14.1 -6.5,0 z m -2.89006,32.22848 0,-18.12846 11.55447,0 0,18.12846 z" />
+    </g>
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#ff0f06;fill-opacity:0.89302326" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3"
+       d="m 13.000002,1045.3621 0,-1 2,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-0"
+       d="m 9.0000011,1045.3621 0,-1 1.9999999,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-2"
+       d="m 5.0000004,1045.3621 0,-1 2.0000009,0 0,1 z"
+       class="st5" />
+    <g
+       id="g3382-3-9"
+       transform="matrix(0,1.3846064,-0.49645373,0,199.73753,835.57882)"
+       style="fill:#0000ff;fill-opacity:1">
+      <path
+         inkscape:connector-curvature="0"
+         id="XMLID_61_-5-4"
+         style="fill:#0000ff;fill-opacity:1"
+         d="m 147.89999,370.10001 6.5,0 0,14.1 -6.5,0 z m -2.89006,32.22848 0,-18.12846 11.55447,0 0,18.12846 z" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-3"
+       d="m 5.0000048,1039.3623 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-2"
+       d="m 5.0000078,1043.3623 -1.0000033,0 0,-2 1.0000033,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7-9"
+       d="m 5.0000079,1047.3623 -1.0000034,0 0,-2 1.0000034,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4-8"
+       d="m 5.0000048,1051.3623 -1.0000034,0 0,-2 1.0000034,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-6"
+       d="m 13.000008,1045.3623 0,-1 2,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-0-7"
+       d="m 9.000006,1045.3623 0,-1 2,0 0,1 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-3-2-6"
+       d="m 5.0000046,1045.3623 0,-1 2.0000013,0 0,1 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/transport/way/way_unclassified.svg
===================================================================
--- /trunk/images/presets/transport/way/way_unclassified.svg	(revision 10565)
+++ /trunk/images/presets/transport/way/way_unclassified.svg	(revision 10565)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="way_unclassified.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-1.7588147"
+     inkscape:cy="6.7477773"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5.0000006,1039.3621 -1.000003,0 0,-2 1.000003,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5.0000036,1043.3621 -1.0000031,0 0,-2 1.0000031,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5.0000037,1047.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5.0000006,1051.3621 -1.0000032,0 0,-2 1.0000032,0 z"
+       class="st5" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/bicycle_repair_station.svg
===================================================================
--- /trunk/images/presets/vehicle/bicycle_repair_station.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/bicycle_repair_station.svg	(revision 10565)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   height="575"
+   width="575"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="16.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="TRUE"
+   inkscape:export-filename="/home/uwe/Desktop/Zeichen_237.png"
+   inkscape:export-xdpi="4.2362185"
+   inkscape:export-ydpi="4.2362185">
+  <title
+     id="title68846">Bicycle repair station</title>
+  <metadata
+     id="metadata13">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Bicycle repair station</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Bryce Nesbitt</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Unrestricted</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>Wrench plus bicycle symbol</dc:description>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>BeaOriginal</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     inkscape:window-height="988"
+     inkscape:window-width="1680"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="1.1172287"
+     inkscape:cx="457.44214"
+     inkscape:cy="226.1412"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="-8.609891e-005px" />
+  </sodipodi:namedview>
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:#0078ff;stroke-width:0.98967296;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="rect2990"
+     width="574.01031"
+     height="574.01031"
+     x="0.49483648"
+     y="0.49483648" />
+  <g
+     id="g3138"
+     transform="matrix(0.98757845,0,0,1,-171.61601,7.0110373)"
+     inkscape:export-xdpi="4.2362185"
+     inkscape:export-ydpi="4.2362185">
+    <circle
+       transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
+       r="161"
+       cy="409"
+       cx="215"
+       style="fill:none;stroke:#000000;stroke-width:40px;stroke-opacity:1"
+       id="FrontWheel"
+       sodipodi:cx="215"
+       sodipodi:cy="409"
+       sodipodi:rx="161"
+       sodipodi:ry="161"
+       d="m 376,409 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
+    <circle
+       transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
+       r="161"
+       cy="406"
+       cx="790"
+       style="fill:none;stroke:#000000;stroke-width:40px;stroke-opacity:1"
+       id="RearWheel"
+       sodipodi:cx="790"
+       sodipodi:cy="406"
+       sodipodi:rx="161"
+       sodipodi:ry="161"
+       d="m 951,406 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61219299;stroke-opacity:1"
+       id="Frame"
+       d="m 419.33591,187.76277 c -81.15626,0.791 -67.39292,-8.38456 -111.05594,131.93826 -35.56995,112.11783 -31.69552,99.89097 -31.88155,107.75543 -0.13037,6.10982 4.80163,10.95404 10.99923,11.36869 12.88887,-1.30322 7.46752,1.39395 52.15306,-137.36977 163.27931,172.24394 102.021,144.31296 189.89195,147.81092 115.48553,-1.10739 124.87203,6.01158 126.24309,-10.91575 -0.1582,-5.74792 -2.84759,-9.17557 -82.10546,-185.56784 l 7.59356,-20.88232 26.1029,-0.4746 -0.9492,-21.83151 -97.2926,0 c -8.5955,11.75949 3.48039,11.70675 46.98521,21.35692 l -7.59357,21.3569 -194.11061,0.47461 c 13.07781,-45.66688 5.69518,-42.8193 64.54534,-42.71383 l 0.47459,-22.30611 z m -70.62884,88.427 189.94107,-0.33678 -54.89431,147.50742 -135.04676,-147.17064 z m 212.84176,8.75614 -53.88399,141.44548 117.87123,0.33677 -63.98724,-141.78225 z"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="Layer_2"
+     transform="matrix(0,-1.6091568,1.6672138,0,-129.48538,524.0285)">
+    <path
+       d="m 230.667,88 5,42 20,6.333 18,-11 -6.333,-43 c 0,0 36.667,11 39.667,37.333 0,0 3.999,23 -10.334,34 l -10.999,10 c 0,0 -14,10.667 -10.667,34 v 204 l -0.333,7.667 c 0,0 1,9 -9,9.333 h -19 c 0,0 -10,1.667 -11.667,-12.333 V 185.999 c 0,0 1.333,-12.333 -8.333,-18.333 l -12.333,-10 c 0,0 -21.333,-16.334 -7.333,-45.667 -0.001,0 4.999,-13.999 23.665,-23.999 z"
+       id="path68800"
+       inkscape:connector-curvature="0"
+       style="fill:#1e1916" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/block.svg
===================================================================
--- /trunk/images/presets/vehicle/block.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/block.svg	(revision 10565)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15.9375"
+   height="15.90625"
+   id="svg2991"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs2993" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="8.7345822"
+     inkscape:cy="0.77463682"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2996">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-520.5625,-261.5625)">
+    <path
+       style="fill:#636363;fill-opacity:1;stroke:#a1a1a1;stroke-width:0.61757529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 520.93727,277.14901 0.43342,-2.75321 c 0.59954,-1.65335 0.5523,-1.69959 -0.29402,-3.35297 l 0.15463,-3.30654 c -0.77624,-1.91374 0.41183,-2.13154 1.17607,-3.52857 0.39414,-0.41334 1.66547,-0.98756 2.51754,-1.5393 1.23749,-0.94198 1.39145,-0.57462 2.8292,-0.57462 l 2.09934,0.1 1.76851,-0.33291 c 1.56613,0.0583 1.27751,0.62457 2.84366,1.26694 0.9367,0.52299 0.93856,1.72359 1.37687,2.37878 0.30036,1.40567 -0.60684,1.78242 -0.68934,2.28294 -0.12421,0.44912 0.34135,1.34055 0.47351,1.71589 l 0.35345,0.99621 c 0.31379,0.46992 0.24136,0.95749 0.13192,1.2814 -0.3595,1.30679 0.076,1.25952 0.076,2.49956 -0.47777,0.94042 -0.19272,0.37822 -0.50557,1.49328 l 0.25726,1.37325 z"
+       id="path2998-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#636363;fill-opacity:1;stroke:none"
+       d="m 521.31863,276.70969 -0.11161,0.74777 14.48996,5.2e-4 -0.13672,-0.63728 z"
+       id="path3796"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#757575;fill-opacity:1;stroke:none"
+       d="m 527.84111,264.44981 c -1.76883,0.20851 -2.49432,0.83814 -3.24732,1.36222 -1.06232,1.07184 -0.93912,1.28632 -1.27453,2.43794 0.19654,1.52154 0.0224,3.33515 0.71142,5.2642 0.0279,1.38016 -0.32493,2.70954 -0.84349,3.9438 l 10.07172,-0.006 c -0.35262,-1.57014 0.8333,-2.95204 0.74312,-4.7397 -0.11859,-1.26013 -0.97632,-2.10065 -0.77067,-4.81984 0.21686,-0.87139 1.29168,-1.85288 0.13081,-3.1302 -1.2011,-1.03943 -4.22603,-0.14496 -5.52094,-0.31263 z"
+       id="path3768-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       style="fill:#828282;fill-opacity:1;stroke:none"
+       d="m 526.68506,271.90563 c 0.42328,1.23632 1.16173,2.27527 2.48108,2.2234 1.0884,-0.65293 1.2408,-1.91124 1.48473,-3.11035 0.47943,-1.30027 0.34598,-2.67871 -0.28479,-4.12057 -0.84116,-0.25535 -1.34969,0.77276 -2.49872,1.38847 -0.84256,0.45148 -1.46729,2.96948 -1.18233,3.61905 z"
+       id="path3770-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccscc"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/bump.svg
===================================================================
--- /trunk/images/presets/vehicle/bump.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/bump.svg	(revision 10565)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__bump_2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="1.8121138"
+     inkscape:cy="7.2926704"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846053,0,0,1.1346381,-204.78305,616.43414)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3653 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5,1042.3653 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5,1048.3653 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3653 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4154"
+       width="9"
+       height="2"
+       x="2.3607492e-006"
+       y="1043.3652" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/car_parts.svg
===================================================================
--- /trunk/images/presets/vehicle/car_parts.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/car_parts.svg	(revision 10565)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="149.28694"
+   height="139.99617"
+   id="svg3009"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="Neues Dokument 2">
+  <defs
+     id="defs3011" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="107.5065"
+     inkscape:cy="66.142335"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3014">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-305.35701,-413.79721)">
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:12.4419775;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path2985"
+       sodipodi:cx="268.57144"
+       sodipodi:cy="469.50504"
+       sodipodi:rx="157.14285"
+       sodipodi:ry="157.14285"
+       d="m 425.71429,469.50504 c 0,86.7876 -70.35525,157.14285 -157.14285,157.14285 -86.7876,0 -157.14285,-70.35525 -157.14285,-157.14285 0,-86.78761 70.35525,-157.14286 157.14285,-157.14286 86.7876,0 157.14285,70.35525 157.14285,157.14286 z"
+       transform="matrix(0.42849139,0,0,0.42849139,269.56245,282.61189)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       style="fill:#ff0000;stroke:none;display:inline"
+       d="m 343.92899,423.79074 0,120.00003 -15.00015,0 c -31.81806,-40.28928 -31.03773,-80.28218 0,-120.00003 z"
+       id="path4019"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:14.46901035;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="path2991"
+       sodipodi:cx="-100"
+       sodipodi:cy="432.36218"
+       sodipodi:rx="140"
+       sodipodi:ry="140"
+       d="m 40,432.36218 c 0,77.31987 -62.680135,140 -140,140 -77.31986,0 -140,-62.68013 -140,-140 0,-77.31986 62.68014,-140 140,-140 77.319865,0 140,62.68014 140,140 z"
+       transform="matrix(0.3395943,0,0,0.33959431,418.60243,336.96302)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path3944"
+       sodipodi:cx="60"
+       sodipodi:cy="472.36218"
+       sodipodi:rx="20"
+       sodipodi:ry="20"
+       d="m 80,472.36218 c 0,11.0457 -8.954305,20 -20,20 -11.045695,0 -20,-8.9543 -20,-20 0,-11.04569 8.954305,-20 20,-20 11.045695,0 20,8.95431 20,20 z"
+       transform="matrix(0.75,0,0,0.75,339.643,129.51912)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path4021-4"
+       sodipodi:cx="130"
+       sodipodi:cy="642.36218"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 160,642.36218 c 0,16.56855 -13.43146,30 -30,30 -16.56854,0 -30,-13.43145 -30,-30 0,-16.56854 13.43146,-30 30,-30 16.56854,0 30,13.43146 30,30 z"
+       transform="matrix(0.16666667,0,0,0.16666667,362.97633,346.73039)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path4021-4-9"
+       sodipodi:cx="130"
+       sodipodi:cy="642.36218"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 160,642.36218 c 0,16.56855 -13.43146,30 -30,30 -16.56854,0 -30,-13.43145 -30,-30 0,-16.56854 13.43146,-30 30,-30 16.56854,0 30,13.43146 30,30 z"
+       transform="matrix(0.16666667,0,0,0.16666667,392.97633,376.73039)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path4021-4-4"
+       sodipodi:cx="130"
+       sodipodi:cy="642.36218"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 160,642.36218 c 0,16.56855 -13.43146,30 -30,30 -16.56854,0 -30,-13.43145 -30,-30 0,-16.56854 13.43146,-30 30,-30 16.56854,0 30,13.43146 30,30 z"
+       transform="matrix(0.16666667,0,0,0.16666667,332.97633,376.73039)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
+       id="path4021-4-7"
+       sodipodi:cx="130"
+       sodipodi:cy="642.36218"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 160,642.36218 c 0,16.56855 -13.43146,30 -30,30 -16.56854,0 -30,-13.43145 -30,-30 0,-16.56854 13.43146,-30 30,-30 16.56854,0 30,13.43146 30,30 z"
+       transform="matrix(0.16666667,0,0,0.16666667,362.97633,406.73039)"
+       inkscape:export-xdpi="9.645854"
+       inkscape:export-ydpi="9.645854" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/chain.svg
===================================================================
--- /trunk/images/presets/vehicle/chain.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/chain.svg	(revision 10565)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="117.87615"
+   height="58.078815"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="chain4.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2821">
+      <stop
+         id="stop2823"
+         style="stop-color:#d3b900"
+         offset="0" />
+      <stop
+         id="stop2825"
+         style="stop-color:#fdffb8"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3015">
+      <stop
+         id="stop3017"
+         style="stop-color:#d3b900"
+         offset="0" />
+      <stop
+         id="stop3019"
+         style="stop-color:#fdffb8"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2821"
+       id="linearGradient3074"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79122639,0.79132847,-0.49627482,0.80779249,595.29906,195.27852)"
+       x1="43.924"
+       y1="116"
+       x2="6.1457"
+       y2="80.056999" />
+    <linearGradient
+       id="linearGradient3022">
+      <stop
+         id="stop3024"
+         style="stop-color:#d3b900"
+         offset="0" />
+      <stop
+         id="stop3026"
+         style="stop-color:#fdffb8"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="33.521001"
+     inkscape:cy="24.736169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3022"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-318.20685,-903.31257)">
+    <path
+       id="path1088"
+       sodipodi:nodetypes="cccccccccccccccccc"
+       style="fill:#c3b115;stroke:#000000;stroke-width:1.01582050000000000pt;fill-opacity:1"
+       d="m 365.47268,916.11412 c -5.9451,-5.89629 -13.37874,-8.75591 -20.7045,-10.35151 -6.60377,-1.29775 -13.98653,-0.77513 -19.51572,4.51425 -4.84286,4.71179 -7.055,13.0358 -6.24819,20.60167 0.94503,7.78283 5.6612,13.84091 10.84357,17.58061 6.06318,4.29986 12.903,6.69387 19.77907,7.6079 6.23886,0.71996 13.07328,-0.5785 17.85807,-6.13856 4.00136,-4.79819 5.6317,-11.34662 4.91861,-18.2487 -3.21202,1.11033 -5.99692,2.09088 -8.88286,4.24026 -1.08062,1.39626 -1.32556,3.45773 -2.80114,4.7287 -3.0647,3.38332 -7.43199,3.34989 -11.24133,2.83789 -5.54447,-1.02998 -11.16095,-2.88575 -15.92357,-6.77858 -2.71158,-2.23373 -5.28764,-5.98813 -4.7962,-10.39819 0.25889,-3.78973 2.60592,-6.91255 5.44797,-7.8243 5.33257,-1.85579 10.92373,-0.18573 16.09195,1.7524 3.10145,1.25319 5.74911,2.61821 8.34459,5.16738 2.70366,-2.81425 6.04948,-4.8157 9.35252,-6.1951 -0.86002,-1.21148 -1.5196,-2.07963 -2.52319,-3.09648 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path1089"
+       sodipodi:nodetypes="cccccccccccccccccccccc"
+       style="fill:#c3b115;stroke:#000000;stroke-width:1.01582050000000000pt;fill-opacity:1"
+       d="m 401.74299,923.12266 c -4.20052,-3.90946 -9.28559,-6.11872 -14.46752,-6.49452 -6.6287,-0.49459 -13.35739,0.60201 -19.65551,3.29848 -1.47317,0.85788 -3.51475,1.69983 -5.09258,2.87871 -3.44749,2.45522 -6.45337,5.97903 -8.67829,10.13809 -1.69172,3.27813 -2.58713,6.74619 -1.30014,10.39664 3.02216,-0.0741 6.48998,-0.49412 8.28666,-3.87429 -0.015,-2.53291 1.91379,-3.9279 3.6063,-4.80986 6.70332,-4.03491 14.13632,-5.6474 21.49961,-5.90958 2.48322,-0.0226 5.1245,0.19589 7.56664,1.12356 1.58806,0.64209 3.10804,2.30076 3.11731,4.57711 0.53053,2.73354 -1.68469,3.80418 -2.26123,5.57775 -0.22018,3.81972 2.09625,6.60735 5.07774,7.69683 2.95265,-2.54626 4.82622,-4.47619 6.32042,-8.68084 1.55159,-5.09783 0.3918,-11.48298 -3.01791,-14.91644 -0.32226,-0.35148 -0.658,-0.68289 -1.0015,-1.00164 z m -18.29068,19.86968 c -4.50246,1.04585 -7.84462,1.87146 -12.42071,1.64963 -1.52982,4.40956 -4.48648,7.50731 -7.92184,9.46291 7.58882,3.50907 15.35118,2.83541 23.15185,0.94623 1.39022,-0.14626 2.19712,-0.54644 0.94118,-1.93372 -1.67883,-3.01452 -3.49076,-6.41875 -3.75048,-10.12505 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path1100"
+       sodipodi:nodetypes="cccccccccccccccccc"
+       style="fill:#c3b115;stroke:#000000;stroke-width:1.01582050000000000pt;fill-opacity:1"
+       d="m 428.8948,908.45001 c -4.84247,-5.0574 -11.66682,-5.35257 -17.47964,-3.33998 -6.52906,2.29494 -13.56453,6.94676 -18.82858,12.32345 3.00375,0.28511 8.74115,4.16294 10.62475,6.59495 4.41716,-3.48861 9.72128,-7.53933 15.05399,-7.49823 3.22852,-0.1068 6.28184,2.79821 7.03431,6.81656 0.94225,4.81608 -1.61072,9.32498 -4.17773,12.49896 -3.91145,4.61838 -8.56608,8.20336 -13.51084,10.70943 -3.47001,1.6177 -7.75167,2.78961 -11.0584,0.009 -2.72825,-2.35537 -3.76456,-7.23784 -2.34541,-11.03204 0.0331,-1.48604 1.81295,-3.00674 1.10151,-3.78678 -0.82798,-1.48124 -4.78109,-2.58316 -8.8669,-2.52608 -2.92912,5.75539 -3.75162,11.34039 -1.60211,17.73273 2.05489,6.50915 6.49618,11.99634 12.02109,13.29252 6.41108,1.69695 12.99781,-0.89458 18.70364,-4.54646 6.87279,-4.58416 13.67147,-10.53566 17.53843,-19.35945 2.50072,-5.5584 3.1853,-12.56868 1.13382,-18.52912 -1.18182,-3.58173 -2.96584,-6.90117 -5.34193,-9.35923 z"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/chicane.svg
===================================================================
--- /trunk/images/presets/vehicle/chicane.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/chicane.svg	(revision 10565)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__chicane.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-6.7882962"
+     inkscape:cy="6.7186021"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846066,0,0,1.1346381,-204.78331,616.43253)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 5,1047.3621 -1,0 0,-2 1,0 z"
+       id="path4187"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4189"
+       d="m 5,1043.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9,1036.3621 c 0,0 -2,2 -2,4 0,2 2,4 2,4 z"
+       id="path4195"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4197"
+       d="m 3.0792093e-6,1044.3621 c 0,0 2,2 2,4 0,2 -2,4 -2,4 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/choker.svg
===================================================================
--- /trunk/images/presets/vehicle/choker.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/choker.svg	(revision 10565)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__choker.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-20.613562"
+     inkscape:cy="6.7595663"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846066,0,0,1.1346381,-204.78331,616.43253)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 5,1047.3621 -1,0 0,-2 1,0 z"
+       id="path4187"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4189"
+       d="m 5,1043.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9,1040.3621 c 0,0 -2,2 -2,4 0,2 2,4 2,4 z"
+       id="path4195"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4197"
+       d="m 0,1040.3621 c 0,0 2,2 2,4 0,2 -2,4 -2,4 z"
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/compressed_air.svg
===================================================================
--- /trunk/images/presets/vehicle/compressed_air.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/compressed_air.svg	(revision 10565)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="01.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.999999"
+     inkscape:cx="7.4935932"
+     inkscape:cy="10.49724"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-349.99999px"
+       originy="-429px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-349.99999,-607.36218)">
+    <rect
+       style="fill:#0000b3;fill-opacity:1;stroke:none"
+       id="rect2989-6"
+       width="7"
+       height="7.0000005"
+       x="350"
+       y="616.36218" />
+    <rect
+       style="fill:#00b9ff;fill-opacity:1;stroke:none"
+       id="rect3769-27"
+       width="5"
+       height="1"
+       x="360"
+       y="610.36218" />
+    <path
+       style="fill:#666666;fill-opacity:1;stroke:none"
+       d="m 357,612.36218 2,-1 0,-1 -2,-1 z"
+       id="path3771-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#666666;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 353.5,614.36218 0,-2.5 c -0.006,-0.43612 0.37464,-0.9872 1,-1 0.83333,0 1.66667,0 2.5,0"
+       id="path3852"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;stroke:#00b9ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 360,612.36218 5,1.5"
+       id="path3879"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#00b9ff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 360,609.36218 5,-1.5"
+       id="path3879-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#0000b3;fill-opacity:1;stroke:none"
+       id="path2991-8"
+       sodipodi:cx="325"
+       sodipodi:cy="616.36218"
+       sodipodi:rx="3"
+       sodipodi:ry="3"
+       d="m 328,616.36218 c 0,1.65686 -1.34315,3 -3,3 -1.65685,0 -3,-1.34314 -3,-3 0,-1.65685 1.34315,-3 3,-3 1.65685,0 3,1.34315 3,3 z"
+       transform="matrix(1.1666667,0,0,1.1666667,-25.666689,-102.22702)" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/crossing.svg
===================================================================
--- /trunk/images/presets/vehicle/crossing.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/crossing.svg	(revision 10565)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="01.svg">
+  <defs
+     id="defs3046" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="8.3073656"
+     inkscape:cy="-4.3213805"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-492,-423.14789)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect2998"
+       width="16"
+       height="7"
+       x="492"
+       y="423.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3772"
+       width="1.0000887"
+       height="0.9997701"
+       x="497"
+       y="423.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3774"
+       width="1"
+       height="1"
+       x="502"
+       y="423.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3776"
+       width="1"
+       height="2"
+       x="502"
+       y="425.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3778"
+       width="1"
+       height="2"
+       x="502"
+       y="428.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3780"
+       width="1"
+       height="2"
+       x="497"
+       y="428.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3782"
+       width="1"
+       height="2"
+       x="497"
+       y="425.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3861"
+       width="2"
+       height="1"
+       x="494"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3863"
+       width="2"
+       height="1"
+       x="504"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3865"
+       width="1"
+       height="1"
+       x="492"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3867"
+       width="1"
+       height="1"
+       x="507"
+       y="426.14789" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/crossing_island.svg
===================================================================
--- /trunk/images/presets/vehicle/crossing_island.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/crossing_island.svg	(revision 10565)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="03.svg">
+  <defs
+     id="defs3046" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="8.3073656"
+     inkscape:cy="-4.3213805"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-492,-423.14789)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect3817"
+       width="16"
+       height="7"
+       x="492"
+       y="423.14789" />
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect3819"
+       width="2"
+       height="1"
+       x="492"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3823"
+       width="2"
+       height="1"
+       x="493"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3825"
+       width="2"
+       height="1"
+       x="505"
+       y="426.14789" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path3827"
+       sodipodi:cx="654.5"
+       sodipodi:cy="731.86218"
+       sodipodi:rx="2.5"
+       sodipodi:ry="2.5"
+       d="m 657,731.86218 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       transform="translate(-156,-305.21428)" />
+    <path
+       transform="translate(-153,-305.21428)"
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path3827-1"
+       sodipodi:cx="654.5"
+       sodipodi:cy="731.86218"
+       sodipodi:rx="2.5"
+       sodipodi:ry="2.5"
+       d="m 657,731.86218 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z" />
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect3847"
+       width="4"
+       height="7"
+       x="498"
+       y="423.14789" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/crossing_ref_zebra.svg
===================================================================
--- /trunk/images/presets/vehicle/crossing_ref_zebra.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/crossing_ref_zebra.svg	(revision 10565)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="02.svg">
+  <defs
+     id="defs3046" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="8.3073656"
+     inkscape:cy="-4.3213805"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-492,-423.14789)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect3784"
+       width="16"
+       height="7"
+       x="492"
+       y="423.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3786"
+       width="6"
+       height="1"
+       x="497"
+       y="424.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3788"
+       width="6"
+       height="1"
+       x="497"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3790"
+       width="6"
+       height="1"
+       x="497"
+       y="428.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3853"
+       width="2"
+       height="1"
+       x="494"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3855"
+       width="1"
+       height="1"
+       x="492"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3857"
+       width="2"
+       height="1"
+       x="504"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3859"
+       width="1"
+       height="1"
+       x="507"
+       y="426.14789" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/crossing_traffic_signals.svg
===================================================================
--- /trunk/images/presets/vehicle/crossing_traffic_signals.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/crossing_traffic_signals.svg	(revision 10565)
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6"
+   height="11"
+   id="svg3850"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="traffic_signal.svg">
+  <defs
+     id="defs3852" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.621652"
+     inkscape:cy="3.4019405"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3877"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="-1.7382813e-005px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1041.3622)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3804-1"
+       width="6"
+       height="11"
+       x="0"
+       y="1041.3622"
+       ry="2" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3024-7"
+       sodipodi:cx="638"
+       sodipodi:cy="709.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,709.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-695.76191,267.44175)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3798-0"
+       sodipodi:cx="638"
+       sodipodi:cy="719.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,719.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-695.7619,261.48938)" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/crossing_unmarked.svg
===================================================================
--- /trunk/images/presets/vehicle/crossing_unmarked.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/crossing_unmarked.svg	(revision 10565)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="7"
+   id="svg3044"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 2">
+  <defs
+     id="defs3046" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="0.21642479"
+     inkscape:cy="-4.9879976"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="463"
+     inkscape:window-height="453"
+     inkscape:window-x="150"
+     inkscape:window-y="150"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata3049">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-492,-423.14789)">
+    <rect
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       id="rect3016"
+       width="16"
+       height="7"
+       x="492"
+       y="423.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3018"
+       width="2"
+       height="1"
+       x="493"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3020"
+       width="2"
+       height="1"
+       x="496"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3022"
+       width="2"
+       height="1"
+       x="499"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3024"
+       width="2"
+       height="1"
+       x="502"
+       y="426.14789" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect3026"
+       width="2"
+       height="1"
+       x="505"
+       y="426.14789" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/cushion.svg
===================================================================
--- /trunk/images/presets/vehicle/cushion.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/cushion.svg	(revision 10565)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__cushion.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-25.425035"
+     inkscape:cy="8.1568954"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846066,0,0,1.1346381,-204.78331,616.43253)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <rect
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4156"
+       width="2"
+       height="4"
+       x="6"
+       y="1042.3621" />
+    <path
+       class="st5"
+       d="m 5,1047.3621 -1,0 0,-2 1,0 z"
+       id="path4187"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4189"
+       d="m 5,1043.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <rect
+       y="1042.3621"
+       x="1"
+       height="4"
+       width="2"
+       id="rect4191"
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/hump.svg
===================================================================
--- /trunk/images/presets/vehicle/hump.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/hump.svg	(revision 10565)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__hump_9.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="1.8121138"
+     inkscape:cy="7.2926704"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846053,0,0,1.1346381,-204.78305,616.43414)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1038.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5,1041.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5,1049.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1052.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4154"
+       width="9"
+       height="6.0000396"
+       x="2.3607492e-006"
+       y="1041.3621" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/island.svg
===================================================================
--- /trunk/images/presets/vehicle/island.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/island.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="11"
+   height="16"
+   viewBox="0 0 11 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__island.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="1.6363787"
+     inkscape:cy="9.3284457"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4225"
+       d="m 9,1036.3621 c 0,0 1.999935,4 1.999935,8 0,4 -1.999935,8 -1.999935,8 l -9,0 0,-16 z"
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       sodipodi:nodetypes="cscccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4,1040.3621 c 0,0 2,2 2,4 0,2 -2,4 -2,4 z"
+       id="path4195"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/junction.svg
===================================================================
--- /trunk/images/presets/vehicle/junction.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/junction.svg	(revision 10565)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="named_junction.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="-113.62735"
+     inkscape:cy="127.1975"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4149"
+       d="M 4.9999994e-7,1044.8621 15,1044.8621"
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#808080;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 7.5,1037.3621 0,15"
+       id="path4147"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4155"
+       cx="7.5"
+       cy="1044.8621"
+       r="2.5" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5,1037.3621 0,2"
+       id="path4151"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4153"
+       d="m 7.5,1040.3621 0,2"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4156"
+       d="m 7.5,1047.3621 0,2"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5,1050.3621 0,2"
+       id="path4158"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4160"
+       d="m 15,1044.8621 -2,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12,1044.8621 -2,0"
+       id="path4162"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,1044.8621 -2,0"
+       id="path4164"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4166"
+       d="m 2,1044.8621 -2,0"
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/kerb.svg
===================================================================
--- /trunk/images/presets/vehicle/kerb.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/kerb.svg	(revision 10565)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="kerb2.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="32.281141"
+     inkscape:cy="-21.23972"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     borderlayer="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-334.84375px"
+       originy="-479.73718px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-334.84375,-558.625)">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.57555842;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 335.30336,572.28073 4.11304,0 0,-3.57957 -1.22303,-3.52309 -0.83349,-0.0564 -2.05652,0 z"
+       id="path2987"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:#000000;stroke-width:0.57555842;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 335.13153,565.17807 11.31089,-6.26427 c 1.66835,0.0118 2.4437,-0.13232 3.08481,0.8949 l 1.02826,2.68468 0,3.57959 -11.31089,6.26425 0,-3.57957 -1.02828,-2.68468 c -0.4803,-1.25403 -1.65447,-0.8949 -3.08479,-0.8949 z"
+       id="path3777"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccsc" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:0.47963202;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 339.2446,568.75765 11.31089,-6.26427"
+       id="path3757"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/milestone.svg
===================================================================
--- /trunk/images/presets/vehicle/milestone.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/milestone.svg	(revision 10565)
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10"
+   height="16"
+   viewBox="0 0 10 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__milestone2.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="90.509668"
+     inkscape:cx="2.2900263"
+     inkscape:cy="4.8427719"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:snap-page="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+    <sodipodi:guide
+       position="662.00004,-146.00001"
+       orientation="1,0"
+       id="guide4273" />
+    <sodipodi:guide
+       position="652.00004,-148.00001"
+       orientation="1,0"
+       id="guide4275" />
+    <sodipodi:guide
+       position="650.00004,-142.00001"
+       orientation="0,1"
+       id="guide4277" />
+    <sodipodi:guide
+       position="656.00004,-174.00001"
+       orientation="0,1"
+       id="guide4279" />
+    <sodipodi:guide
+       position="657.48606,-176.99998"
+       orientation="1,0"
+       id="guide4283" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 5,1 A 4,4 0 0 0 1,5 L 1,15 9,15 9,5 A 4,4 0 0 0 5,1 Z"
+       transform="translate(-4.7683724e-7,1036.3621)"
+       id="circle4377"
+       inkscape:connector-curvature="0" />
+    <circle
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4348"
+       cx="5"
+       cy="1041.3621"
+       r="4" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none"
+       d="m 657.32083,1187.3629 c -0.46092,0 -0.92605,0.034 -1.39423,0.09 -16.366,3.2398 -9.73707,20.3533 -11.05691,32.2739 0.007,7.7011 6.59052,13.4062 14.19453,12.5508 16.36601,-3.37 9.74065,-20.1946 11.05675,-32.2737 0.0455,-7.1342 -5.88632,-12.7075 -12.80014,-12.6408 z m 0.24197,6.313 c 3.4452,0.026 6.21492,2.7762 6.20804,6.3285 l 0,20.0962 -0.0747,0.8222 -0.22416,0.7469 -0.29889,0.747 -0.37344,0.6709 c -0.94381,1.6214 -2.72557,2.6584 -4.55716,2.914 -1.83782,0.1898 -3.76286,-0.3932 -5.08022,-1.7182 -1.59852,-1.5277 -1.7879,-2.4868 -2.01696,-4.5568 l 0,-19.7229 0.0747,-0.4475 0.0746,-0.7469 0.14945,-0.7468 0.29888,-0.7478 0.37343,-0.7469 c 1.28871,-1.6619 2.44311,-2.4977 4.55733,-2.8387 0.30039,-0.038 0.5972,-0.055 0.88916,-0.053 z"
+       id="path4264"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 667,1199.3621 0,22 c 0,5 -4.51387,8 -9.51398,8 -5,0 -9.48614,-3 -9.48614,-8 0,-5 -1.2e-4,-16.8236 0,-22 1.2e-4,-5 4.48602,-9 9.48614,-9 5,0 9.51398,4 9.51398,9 z"
+       id="path4271"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sszsszs" />
+    <rect
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4346"
+       width="8"
+       height="10"
+       x="1"
+       y="1041.3621"
+       rx="3.9512728e-005"
+       ry="3.9512728e-005" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 3.5071212,1043.8555 2.9929026,0 -1.9952684,5"
+       id="path4199"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/motorway_junction.svg
===================================================================
--- /trunk/images/presets/vehicle/motorway_junction.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/motorway_junction.svg	(revision 10565)
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__motorway_junction2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="9.7451896"
+     inkscape:cy="9.6258065"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254-5"
+       width="16"
+       height="16"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2"
+       ry="2" />
+    <rect
+       rx="1.8715348"
+       y="1036.876"
+       x="0.51386845"
+       height="15"
+       width="15"
+       id="rect4217"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.51417869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 4,1039.3621 1,0 0,10 -4,0 z"
+       style="fill:#ffffff;fill-opacity:1"
+       id="path4828"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4224"
+       style="fill:#ffffff;fill-opacity:1"
+       d="m 7,1039.3621 -1,0 0,10 4,0 z"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9,1039.3621 5,0 c 0,0 0.635471,-0.048 0.878906,0.332 0.257216,0.4017 -0.132812,0.9532 -0.132812,0.9532 l -2.652344,4.0117 c -1.064693,1.4403 -0.333208,-3.0618 -0.605347,-3.3829 -0.470721,-0.5555 -4.3876174,-1.914 -2.4884039,-1.914 z"
+       id="path4226"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scscccs" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.1093761,1042.8152 c 0,0 2.4710873,-1.9092 4.4687509,-1.8125 l 0.734375,0.8125 c -2.7561583,0.657 -4.5781258,3.9688 -4.5781258,3.9688 z"
+       id="path4228"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/parking/park_ride.svg
===================================================================
--- /trunk/images/presets/vehicle/parking/park_ride.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/parking/park_ride.svg	(revision 10565)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="15.981307"
+   height="14.98562"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="05.svg">
+  <metadata
+     id="metadata13">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="31.466667"
+     inkscape:cx="13.718139"
+     inkscape:cy="3.6026643"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3756"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="3.6328964e-009px"
+       originy="0.0009137265px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4" />
+  <path
+     d="m 13.497407,3.6698769e-4 0,0.001013002 -11.0739908,0 0,0.001013 -1.77640764,0 C 0.22548703,-0.01492762 -0.0151026,0.2549564 7.3595251e-4,0.68677083 l 0,13.65077317 C 0.0024069,14.629104 0.13436079,14.97854 0.56300431,14.98562 l 1.83913139,0 0.081764,0 11.0135073,-0.002 0,10e-4 1.919775,0 c 0.428644,-0.0071 0.56172,-0.356516 0.563389,-0.647641 l 0,-13.65181579 c 0.01584,-0.43181443 -0.22475,-0.70167819 -0.646272,-0.68437807231 z"
+     style="fill:#154889;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path3661"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccccccccc" />
+  <path
+     d="m 0.0456923,3.0207901 15.8632777,0 c 0,-0.97095 -0.521106,-1.83136 -1.327292,-2.02616998 l -13.2086937,0 C 0.53530805,1.1767701 0.0456923,2.0522001 0.0456923,3.0207901 z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path19064"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 6.027495,6.9400901 1.0058994,0 8e-7,-0.97756 1.0100146,0.005 0.00162,0.97215 1.0045944,0 0,1.05293 -1.0045944,0 -0.00284,0.96903 -1.0101067,-0.005 0.0013,-0.96417 -1.0058994,0 0,-1.05293 z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path19965"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 0.04117773,12.00261 15.86327827,0 c 0,0.96017 -0.521106,1.81105 -1.327292,2.0037 l -13.2086943,0 C 0.53079347,13.82619 0.04117773,12.96046 0.04117773,12.00261 z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path19953"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 1.0505725,3.9237801 0,7.0839299 0.9054965,0 0,-2.7497199 1.6194746,0 c 2.4261575,-0.60821 1.9527779,-4.05181 0.050557,-4.33603 l -2.5755315,0.002 z m 0.9054965,1.04907 1.5275459,0 c 0.9797811,0.41444 1.1206673,1.6721 0.078136,2.22155 l -1.6056852,0 0,-2.22155 z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path20852"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 10.019035,3.9275801 0,7.0914699 1.081935,0.002 0,-3.0493099 1.359262,0 1.4961,3.0456899 1.266213,0 -1.589151,-3.1146699 c 1.733734,-0.67529 1.952403,-3.35625 -0.403217,-3.96773 l -3.211142,-0.008 z m 1.081935,0.9874 1.904792,0 c 1.311898,0.39391 1.101513,1.65265 0.05839,2.10003 l -1.963176,0 0,-2.10003 z"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path22626"
+     inkscape:connector-curvature="0" />
+</svg>
Index: /trunk/images/presets/vehicle/parking/parking_space.svg
===================================================================
--- /trunk/images/presets/vehicle/parking/parking_space.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/parking/parking_space.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16.000114"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="02.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="8.3312618"
+     inkscape:cy="5.4156202"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-390px"
+       originy="-484.99989px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-390,-551.36218)">
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       id="rect2987"
+       width="16"
+       height="16"
+       x="390"
+       y="551.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2989"
+       width="2"
+       height="12"
+       x="392"
+       y="555.36218"
+       ry="0" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2991"
+       width="1.9999964"
+       height="12.000114"
+       x="402"
+       y="555.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2993"
+       width="4"
+       height="2"
+       x="391"
+       y="555.36218" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       id="rect2995"
+       width="4"
+       height="2"
+       x="401"
+       y="555.36218" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/passing_place.svg
===================================================================
--- /trunk/images/presets/vehicle/passing_place.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/passing_place.svg	(revision 10565)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="11"
+   viewBox="0 0 16 11"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__passing_place2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254835"
+     inkscape:cx="6.9728921"
+     inkscape:cy="3.1745323"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1041.3621)">
+    <g
+       id="g3382"
+       transform="matrix(0,-0.85169118,-1.1348835,0,436.02225,1173.8632)"
+       style="fill:#ffffff;fill-opacity:1">
+      <path
+         style="fill:#ffffff;fill-opacity:1"
+         d="m 147.89999,370.10001 6.5,0 0,14.1 -6.5,0 0,-2.64803 -4.41064,-1.71343 0.0264,-5.26615 4.38421,-1.82122 z"
+         id="XMLID_61_"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16,1047.8621 -2.999998,0 -2.984376,4 -4.0468754,0 -2.9687505,-4 -3.00000057683724,0"
+       id="path4351"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M -4.7683724e-7,1041.8621 16,1041.8621"
+       id="path4208"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/rest_area.svg
===================================================================
--- /trunk/images/presets/vehicle/rest_area.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/rest_area.svg	(revision 10565)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__rest_area3.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="10.860798"
+     inkscape:cy="7.7809326"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254-5"
+       width="16"
+       height="16"
+       x="-5.2452083e-006"
+       y="1036.3621"
+       rx="2"
+       ry="2" />
+    <rect
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:1.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4322"
+       width="15"
+       height="15"
+       x="0.49176642"
+       y="1036.8539"
+       rx="1.6237757"
+       ry="1.6237757" />
+    <g
+       id="g4330">
+      <path
+         style="fill:#ffffff;fill-opacity:1"
+         id="polyline3053"
+         d="m 6,1049.3621 2,0 0,1.4864 1,0 -1e-7,-1.4864 2,0 0,-1 -5,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#ffffff;fill-opacity:1"
+         id="path3055"
+         d="m 12,1047.3621 -2,0 1.500001,-2 -1,0 1.5,-2 -1,0 1.5,-2 1.5,2 -1,0 1.5,2 -1,0 1.5,2 -2,0 0,3.4864 -1,0 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="text5426"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:458.69091797px;line-height:100%;font-family:'DIN 1451 Mittelschrift';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 3.5321082,1039.7267 0,3.9634 2.7658333,0 c 0.6914515,0 1.2072343,-0.2081 1.5473488,-0.6243 0.3400995,-0.4159 0.5101528,-0.8683 0.5101609,-1.3575 -8.1e-6,-0.742 -0.2670341,-1.2873 -0.8010792,-1.6358 -0.3429254,-0.2305 -0.7842216,-0.3458 -1.3238898,-0.3458 z m -1.8635646,11.1218 0,-12.8841 4.4607497,0 c 0.4778305,0 0.9373973,0.05 1.3787005,0.1517 0.4412888,0.102 0.9008549,0.3373 1.3786994,0.7082 0.3710183,0.287 0.6858284,0.6818 0.9444307,1.185 0.2585851,0.5031 0.3878821,1.0864 0.3878911,1.7497 -9e-6,0.8769 -0.3274679,1.7116 -0.9823758,2.5043 -0.6549262,0.7928 -1.6120047,1.1891 -2.8712384,1.1891 l -2.8332926,0 0,5.3961 z"
+         sodipodi:nodetypes="ccscccscccscccccsccc" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/city_limit.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/city_limit.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/city_limit.svg	(revision 10565)
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_sign__city_limit3.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="-0.87664197"
+     inkscape:cy="10.598224"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#f0c900;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4360"
+       width="15.5"
+       height="10.5"
+       x="0.25"
+       y="1036.6121"
+       ry="1.6572816" />
+    <g
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text4362"
+       transform="matrix(0.86368746,0,0,0.86368746,1.0902142,137.09815)">
+      <path
+         d="m 6.8139168,1047.7859 q 0,0.9 -0.28,1.57 -0.2800001,0.66 -0.7900002,1.1 -0.5100001,0.43 -1.2200002,0.65 -0.7100002,0.21 -1.5600003,0.21 -0.4200001,0 -0.9300002,-0.04 -0.5000001,-0.03 -0.9100002,-0.13 l 0,-6.72 q 0.4100001,-0.1 0.9100002,-0.13 0.5100001,-0.04 0.9300002,-0.04 0.8500001,0 1.5600003,0.22 0.7100001,0.21 1.2200002,0.65 0.5100001,0.43 0.7900002,1.1 0.28,0.66 0.28,1.56 z m -3.7700007,2.68 q 1.3800003,0 2.0600004,-0.7 0.6800001,-0.71 0.6800001,-1.98 0,-1.27 -0.6800001,-1.97 -0.6800001,-0.71 -2.0600004,-0.71 -0.4100001,0 -0.6400001,0.01 -0.2200001,0.01 -0.3100001,0.02 l 0,5.3 q 0.09,0.01 0.3100001,0.02 0.23,0.01 0.6400001,0.01 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.00000191px;font-family:Ubuntu"
+         id="path4423"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 9.1228236,1051.2559 -0.93,0 0,-5.2 0.93,0 0,5.2 z m -0.47,-6.14 q -0.25,0 -0.43,-0.16 -0.17,-0.17 -0.17,-0.45 0,-0.28 0.17,-0.44 0.18,-0.17 0.43,-0.17 0.25,0 0.42,0.17 0.18,0.16 0.18,0.44 0,0.28 -0.18,0.45 -0.17,0.16 -0.42,0.16 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.00000191px;font-family:Ubuntu"
+         id="path4425"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m 14.871887,1051.1059 q -0.32,0.08 -0.85,0.17 -0.52,0.09 -1.21,0.09 -0.6,0 -1.01,-0.17 -0.41,-0.18 -0.66,-0.5 -0.25,-0.32 -0.36,-0.75 -0.11,-0.44 -0.11,-0.97 l 0,-2.92 0.93,0 0,2.72 q 0,0.95 0.3,1.36 0.3,0.41 1.01,0.41 0.15,0 0.31,-0.01 0.16,-0.01 0.3,-0.02 0.14,-0.02 0.25,-0.03 0.12,-0.02 0.17,-0.04 l 0,-4.39 0.93,0 0,5.05 z"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.00000191px;font-family:Ubuntu"
+         id="path4427"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4263"
+       width="2"
+       height="5"
+       x="7"
+       y="1047.3621"
+       ry="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/give_way.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/give_way.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/give_way.svg	(revision 10565)
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="15"
+   viewBox="0 0 16 15"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__give_way2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="10.7423"
+     inkscape:cy="6.8371201"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3621)">
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path4210"
+       d="m 0.99993,1038.9 14,0 -7,12.2976 z"
+       style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ee1c23;stroke-width:1.7;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.7127388,1039.3097 12.5745242,0 -6.287262,11.1049 z"
+       id="path4208"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/maxspeed.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/maxspeed.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/maxspeed.svg	(revision 10565)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_sign__maxspeed.svg">
+  <defs
+     id="defs4266">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern" />
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       id="EMFhbasepattern-2" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="5.0489532"
+     inkscape:cy="7.81344"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:snap-page="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-grids="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+    <sodipodi:guide
+       position="662.00004,-146.00001"
+       orientation="1,0"
+       id="guide4273" />
+    <sodipodi:guide
+       position="652.00004,-148.00001"
+       orientation="1,0"
+       id="guide4275" />
+    <sodipodi:guide
+       position="650.00004,-142.00001"
+       orientation="0,1"
+       id="guide4277" />
+    <sodipodi:guide
+       position="656.00004,-174.00001"
+       orientation="0,1"
+       id="guide4279" />
+    <sodipodi:guide
+       position="657.48606,-176.99998"
+       orientation="1,0"
+       id="guide4283" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4315"
+       cx="8"
+       cy="1044.3621"
+       r="8" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.92387849;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 11.634905,1042.8175 0,3.2262 c 0,0.7333 -0.661947,1.1733 -1.3952,1.1733 -0.733254,0 -1.3911168,-0.44 -1.3911168,-1.1733 0,-0.7333 -1.79e-5,-2.4671 0,-3.2262 1.74e-5,-0.7332 0.6578628,-1.3199 1.3911168,-1.3199 0.733253,0 1.3952,0.5867 1.3952,1.3199 z"
+       id="path4271-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sszsszs" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none"
+       d="m 5.8378906,4.7363281 -1.796875,3.59375 c -0.066003,0.1667 -0.2148437,0.5342907 -0.2148437,0.8378907 -0.029575,0.5693998 0.091255,1.0140622 0.4472656,1.4765622 0.7272679,0.8256 1.9339375,0.918029 2.7519531,0.173829 C 7.6977325,10.28166 7.757444,8.8691811 7.3808594,8.1757812 6.968269,7.5014814 6.222665,7.2521907 5.484375,7.5253906 L 6.8847656,4.7363281 Z M 5.8066406,8.234375 C 6.2871077,8.27945 6.7353466,8.6845783 6.6425781,9.4550781 6.5727722,10.782678 4.6124976,10.685468 4.7792969,9.1679688 4.8129141,8.5036689 5.3261735,8.1893 5.8066406,8.234375 Z"
+       transform="translate(-4.7683724e-7,1036.3621)"
+       id="path4312"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccsccs" />
+    <path
+       style="fill:#000000;fill-rule:evenodd;stroke:none"
+       d="m 657.32083,1187.3629 c -0.46092,0 -0.92605,0.034 -1.39423,0.09 -16.366,3.2398 -9.73707,20.3533 -11.05691,32.2739 0.007,7.7011 6.59052,13.4062 14.19453,12.5508 16.36601,-3.37 9.74065,-20.1946 11.05675,-32.2737 0.0455,-7.1342 -5.88632,-12.7075 -12.80014,-12.6408 z m 0.24197,6.313 c 3.4452,0.026 6.21492,2.7762 6.20804,6.3285 l 0,20.0962 -0.0747,0.8222 -0.22416,0.7469 -0.29889,0.747 -0.37344,0.6709 c -0.94381,1.6214 -2.72557,2.6584 -4.55716,2.914 -1.83782,0.1898 -3.76286,-0.3932 -5.08022,-1.7182 -1.59852,-1.5277 -1.7879,-2.4868 -2.01696,-4.5568 l 0,-19.7229 0.0747,-0.4475 0.0746,-0.7469 0.14945,-0.7468 0.29888,-0.7478 0.37343,-0.7469 c 1.28871,-1.6619 2.44311,-2.4977 4.55733,-2.8387 0.30039,-0.038 0.5972,-0.055 0.88916,-0.053 z"
+       id="path4264"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 667.00012,1199.3621 0,22 c 0,5.0001 -4.51387,8 -9.51398,8 -5.00012,0 -9.48614,-3 -9.48614,-8 0,-5 -1.2e-4,-16.8236 0,-22 1.2e-4,-5 4.48602,-9 9.48614,-9 5.00011,0 9.51398,4 9.51398,9 z"
+       id="path4271"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sszsszs" />
+    <ellipse
+       cy="1044.3621"
+       cx="8"
+       id="circle4317"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#c1121c;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       rx="6.5813241"
+       ry="6.5812936" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/maxspeed_none.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/maxspeed_none.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/maxspeed_none.svg	(revision 10565)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="600"
+   height="600"
+   id="svg1980"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   version="1.0"
+   sodipodi:docbase="/home/d0ktorz"
+   sodipodi:docname="Zeichen 278.svg">
+  <defs
+     id="defs1982" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="390.27652"
+     inkscape:cy="148.50728"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="600px"
+     height="600px"
+     inkscape:window-width="990"
+     inkscape:window-height="584"
+     inkscape:window-x="2"
+     inkscape:window-y="74" />
+  <metadata
+     id="metadata1985">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3771"
+       transform="translate(1.374794,11.86118)">
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:black;stroke-opacity:1"
+         id="path10"
+         d="M 590.68796,288.07677 C 589.79109,140.65833 481.40336,16.725056 334.97912,-1.4206743 C 168.02447,-22.771464 18.137934,102.18382 7.1044943,269.72247 C -3.0251357,438.0815 130.10614,579.29842 298.68765,580.07708 C 460.66439,579.04118 589.56862,450.10913 590.68796,288.07677" />
+      <path
+         id="path14"
+         d="M 590.68796,288.07677 L 589.85367,269.72247 M 589.85367,269.72247 L 585.26509,233.431 M 585.26509,233.431 L 576.08794,197.97383 M 576.08794,197.97383 L 562.73935,163.76808 M 562.73935,163.76808 L 545.21934,131.64804 M 545.21934,131.64804 L 523.52789,102.03086 M 523.52789,102.03086 L 498.49929,75.333696 M 498.49929,75.333696 L 470.13355,51.973666 M 470.13355,51.973666 L 439.26494,32.367936 M 439.26494,32.367936 L 406.31062,16.516486 M 406.31062,16.516486 L 371.27059,5.2536157 M 371.27059,5.2536157 L 334.97912,-1.4206743 M 334.97912,-1.4206743 L 298.68765,-3.9235343 M 298.68765,-3.9235343 L 261.97904,-1.4206743 M 261.97904,-1.4206743 L 226.10472,5.2536157 M 226.10472,5.2536157 L 191.06468,16.516486 M 191.06468,16.516486 L 158.11036,32.367936 M 158.11036,32.367936 L 127.24176,51.973666 M 127.24176,51.973666 L 98.876024,75.333696 M 98.876024,75.333696 L 73.847424,102.03086 M 73.847424,102.03086 L 52.155974,131.64804 M 52.155974,131.64804 L 34.635944,163.76808 M 34.635944,163.76808 L 20.870224,197.97383 M 20.870224,197.97383 L 11.693064,233.431 M 11.693064,233.431 L 7.1044943,269.72247 M 7.1044943,269.72247 L 7.1044943,306.43108 M 7.1044943,306.43108 L 11.693064,342.72254 M 11.693064,342.72254 L 20.870224,378.17972 M 20.870224,378.17972 L 34.635944,412.38548 M 34.635944,412.38548 L 52.155974,444.50551 M 52.155974,444.50551 L 73.847424,474.12268 M 73.847424,474.12268 L 98.876024,500.81985 M 98.876024,500.81985 L 127.24176,524.17988 M 127.24176,524.17988 L 158.11036,543.78561 M 158.11036,543.78561 L 191.06468,559.21992 M 191.06468,559.21992 L 226.10472,570.89993 M 226.10472,570.89993 L 261.97904,577.57422 M 261.97904,577.57422 L 298.68765,580.07708 M 298.68765,580.07708 L 334.97912,577.57422 M 334.97912,577.57422 L 371.27059,570.89993 M 371.27059,570.89993 L 406.31062,559.21992 M 406.31062,559.21992 L 439.26494,543.78561 M 439.26494,543.78561 L 470.13355,524.17988 M 470.13355,524.17988 L 498.49929,500.81985 M 498.49929,500.81985 L 523.52789,474.12268 M 523.52789,474.12268 L 545.21934,444.50551 M 545.21934,444.50551 L 562.73935,412.38548 M 562.73935,412.38548 L 576.08794,378.17972 M 576.08794,378.17972 L 585.26509,342.72254 M 585.26509,342.72254 L 589.85367,306.43108 M 589.85367,306.43108 L 590.68796,288.07677" />
+      <path
+         style="fill:black;fill-rule:evenodd;stroke:none"
+         id="path16"
+         d="M 580.67652,288.07677 C 581.13537,146.35929 474.68736,25.756216 334.14483,8.1736257 C 172.97457,-12.600114 26.890994,108.39925 17.115934,270.55676 C 6.7082043,432.19283 136.41891,570.80259 298.68765,570.06564 C 454.10134,570.66354 581.00328,443.31666 580.67652,288.07677" />
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+         id="path18"
+         d="M 445.52209,64.487966 C 197.85021,-89.451814 -78.840936,187.23933 75.098854,434.91121 L 445.52209,64.487966" />
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+         id="path20"
+         d="M 456.78496,71.996546 L 460.9564,75.333696 L 464.71068,78.253696 L 88.864574,454.0998 L 85.944574,450.34552 L 82.607424,446.17408 L 456.78496,71.996546" />
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+         id="path22"
+         d="M 475.5564,87.013706 L 479.3107,90.767986 L 483.06499,94.105136 L 104.71602,472.45412 L 101.37887,468.69982 L 97.624594,464.94553 L 475.5564,87.013706" />
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+         id="path24"
+         d="M 499.33357,111.20802 L 492.65928,103.69944 L 114.31031,482.04841 L 121.81889,488.7227 L 499.33357,111.20802" />
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+         id="path26"
+         d="M 514.76788,129.97947 L 511.43073,125.80803 L 508.51072,121.63661 L 132.24747,497.89985 L 136.41891,500.81985 L 140.59034,504.157 L 514.76788,129.97947" />
+      <path
+         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+         id="path28"
+         d="M 522.27646,141.24234 C 676.18843,388.64307 399.2609,665.57755 151.85321,511.66558 L 522.27646,141.24234" />
+      <path
+         style="fill:#999;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         id="path30"
+         d="M 203.99612,144.99662 L 250.29903,144.99662 L 188.97896,267.63675 C 205.78289,261.15018 225.09662,260.58008 241.53902,268.47104 L 209.83612,299.75678 C 176.67323,291.7824 153.77207,318.66033 158.11036,351.48256 L 124.32175,385.27117 C 117.98813,370.75458 116.36127,354.65285 117.23032,338.96826 L 117.23032,335.21397 L 118.06461,327.70539 L 119.31604,320.61395 L 121.40175,313.10537 L 124.32175,306.01394 L 125.99033,302.67679 L 203.99612,144.99662 z M 137.67034,405.71119 L 136.00176,403.62547 L 132.66461,399.87118 L 131.41319,397.36831 L 161.44751,367.75114 L 162.2818,369.00257 L 163.53323,372.33972 L 165.61893,375.25972 L 166.45322,376.51115 L 137.67034,405.71119 z M 156.02464,421.14548 L 153.52179,419.89405 L 149.35035,416.97406 L 147.26463,415.30548 L 176.46466,386.10544 L 184.80753,390.27688 L 186.47611,390.69403 L 156.02464,421.14548 z M 179.38467,431.15692 L 176.8818,430.32263 L 171.45895,428.65407 L 168.53894,427.81978 L 203.99612,392.3626 L 206.08184,391.94546 L 210.67041,391.11117 L 219.01329,387.77402 L 222.76757,385.27117 L 226.52186,382.35116 L 232.36186,375.67686 L 234.86472,371.50544 L 236.95044,367.75114 L 238.20187,363.16257 L 239.45331,358.99114 L 239.87045,356.48827 L 279.9162,316.44252 L 280.33335,319.77967 L 280.75049,325.61967 L 280.75049,329.79111 L 179.38467,431.15692 z M 211.92184,432.40835 L 204.41327,433.65978 L 196.48755,433.65978 L 280.75049,349.39684 L 280.75049,355.23684 L 280.33335,361.494 L 279.9162,364.83114 L 211.92184,432.40835 z M 242.79044,420.72834 L 268.23619,395.69975 C 261.81914,405.84328 253.02437,414.45034 242.79044,420.72834 z M 239.87045,337.29968 L 239.87045,335.21397 L 239.03616,331.04253 L 238.20187,327.28825 L 237.36759,325.20253 L 269.90476,292.66535 L 271.57334,294.75107 L 274.0762,299.75678 L 275.32762,301.8425 L 239.87045,337.29968 z M 230.27615,313.10537 L 229.44187,311.4368 L 226.939,308.93395 L 224.43614,306.84823 L 223.18471,306.01394 L 253.63617,275.56248 L 255.72189,276.8139 L 259.47618,280.15105 L 261.5619,281.81963 L 230.27615,313.10537 z M 329.13911,180.4538 C 336.61293,168.77379 343.71132,163.00331 354.58485,155.00807 L 329.13911,180.4538 z M 316.62481,226.75671 L 316.62481,220.91671 L 317.04196,214.65955 L 317.4591,211.32241 L 385.45345,143.32806 L 387.95631,142.91091 L 392.96204,142.49377 L 400.88776,142.49377 L 316.62481,226.75671 z M 316.62481,260.54532 L 316.62481,246.36244 L 417.57348,144.99662 L 420.49349,145.83091 L 425.91636,147.49948 L 428.83635,148.33377 L 393.37918,183.79095 L 391.29346,183.79095 L 386.70488,185.04238 L 378.36202,188.37952 L 374.60773,190.88239 L 370.85344,193.80239 L 365.01343,200.47668 L 362.51057,204.23097 L 360.42486,208.40241 L 359.17343,212.99098 L 357.922,217.16242 L 357.50485,219.24814 L 316.62481,260.54532 z M 316.62481,294.33393 L 316.62481,279.73391 L 357.50485,238.85387 L 357.50485,253.45389 L 316.62481,294.33393 z M 316.62481,327.70539 L 316.62481,313.52252 L 357.50485,272.64248 L 357.50485,287.24248 L 316.62481,327.70539 z M 316.62481,347.31112 L 357.50485,306.43108 C 355.02981,343.17445 350.2257,389.10193 398.38489,392.77974 C 410.41948,392.75193 422.21769,387.25259 429.67064,377.76258 L 432.59065,373.59115 L 435.09351,369.41972 L 437.17923,364.41399 L 438.43066,359.40828 L 438.8478,354.40256 L 439.26494,351.8997 L 439.26494,224.67099 L 473.05354,190.88239 L 474.72212,194.63668 L 477.22498,202.97954 L 478.89355,211.32241 L 479.72784,220.08242 L 480.14498,224.25385 L 480.14498,351.8997 L 479.72784,356.90542 L 478.47641,367.334 C 473.16478,394.86546 454.54629,417.51634 428.41921,427.81978 C 372.66801,449.61552 313.37109,406.97652 316.62481,347.31112 z M 435.9278,208.40241 L 435.09351,206.73384 L 433.84208,203.81383 L 431.75636,200.89382 L 430.92207,199.22525 L 459.70496,170.44237 L 461.37353,172.11094 L 464.29354,176.28238 L 465.96211,178.36809 L 435.9278,208.40241 z M 420.49349,190.0481 L 419.24206,189.21381 L 412.56777,185.87667 L 410.89919,185.45953 L 441.35065,155.00807 L 443.43637,156.25949 L 448.02495,159.1795 L 450.11067,160.84807 L 420.49349,190.0481" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/mini_roundabout_left.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/mini_roundabout_left.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/mini_roundabout_left.svg	(revision 10565)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mini_roundabout_left.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="7.2552813"
+     inkscape:cy="9.7422512"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <ellipse
+       cx="-8.000001"
+       cy="1044.3621"
+       style="fill:#ffffff;stroke:#000000;stroke-width:0.05693951px"
+       id="circle4"
+       rx="7.9715319"
+       ry="7.9715323"
+       transform="scale(-1,1)" />
+    <g
+       id="g4140"
+       transform="matrix(-0.95565069,0,0,0.95565069,15.645207,46.316621)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1883"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 15.473773,1044.362 a 7.473766,7.4737665 0 0 1 -14.94753137,0 7.473766,7.4737665 0 1 1 14.94753137,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2806"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 3.2007794,1045.9956 1.8789881,-1.9111 -0.00863,-1.1154 -1.3830885,1.3524 c -0.045876,-2.1633 1.8168783,-3.9802 3.5664448,-4.2139 l -0.1550028,-0.936 c -3.0719145,0.608 -4.3090049,3.0094 -4.3681119,5.1419 l -1.3962344,-1.3574 -0.00637,1.1599 1.8719852,1.8796 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3753"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 11.819626,1047.7035 -2.5971756,-0.6612 -0.9593787,0.569 1.8648633,0.514 c -1.8459758,1.1289 -4.3536894,0.4343 -5.4365024,-0.9596 l -0.7306829,0.6052 c 2.0720634,2.348 4.7698086,2.2077 6.6420313,1.185 l -0.469823,1.8898 1.005388,-0.5785 0.68128,-2.5637 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3755"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 8.9807164,1039.4097 0.7321898,2.5782 0.9738458,0.5439 -0.491799,-1.8708 c 1.903114,1.0296 2.561547,3.5471 1.899717,5.1833 l 0.890273,0.3281 c 0.990166,-2.9708 -0.485704,-5.2334 -2.310139,-6.3391 l 1.870232,-0.5425 -1.005139,-0.5791 -2.5591806,0.698 z" />
+      <ellipse
+         ry="1.4999396"
+         rx="1.5000004"
+         cy="1044.3621"
+         cx="8.000001"
+         id="path4165"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/mini_roundabout_right.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/mini_roundabout_right.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/mini_roundabout_right.svg	(revision 10565)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mini_roundabout2.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="-0.91293923"
+     inkscape:cy="5.3962327"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="false"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <ellipse
+       cx="8.000001"
+       cy="1044.3621"
+       style="fill:#ffffff;stroke:#000000;stroke-width:0.05693951px"
+       id="circle4"
+       rx="7.9715319"
+       ry="7.9715323" />
+    <g
+       id="g4140"
+       transform="matrix(0.95565069,0,0,0.95565069,0.3547948,46.316634)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1883"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         d="m 15.473773,1044.362 a 7.473766,7.4737665 0 0 1 -14.94753137,0 7.473766,7.4737665 0 1 1 14.94753137,0 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2806"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 3.2007794,1045.9956 1.8789881,-1.9111 -0.00863,-1.1154 -1.3830885,1.3524 c -0.045876,-2.1633 1.8168783,-3.9802 3.5664448,-4.2139 l -0.1550028,-0.936 c -3.0719145,0.608 -4.3090049,3.0094 -4.3681119,5.1419 l -1.3962344,-1.3574 -0.00637,1.1599 1.8719852,1.8796 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3753"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 11.819626,1047.7035 -2.5971756,-0.6612 -0.9593787,0.569 1.8648633,0.514 c -1.8459758,1.1289 -4.3536894,0.4343 -5.4365024,-0.9596 l -0.7306829,0.6052 c 2.0720634,2.348 4.7698086,2.2077 6.6420313,1.185 l -0.469823,1.8898 1.005388,-0.5785 0.68128,-2.5637 z" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3755"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 8.9807164,1039.4097 0.7321898,2.5782 0.9738458,0.5439 -0.491799,-1.8708 c 1.903114,1.0296 2.561547,3.5471 1.899717,5.1833 l 0.890273,0.3281 c 0.990166,-2.9708 -0.485704,-5.2334 -2.310139,-6.3391 l 1.870232,-0.5425 -1.005139,-0.5791 -2.5591806,0.698 z" />
+      <ellipse
+         ry="1.4999396"
+         rx="1.5000004"
+         cy="1044.3621"
+         cx="8.000001"
+         id="path4165"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/restrictions.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/restrictions.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/restrictions.svg	(revision 10565)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="restrictions.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="0.26738697"
+     inkscape:cy="9.1870644"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="false"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.04587146;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path32"
+       d="m 15.977067,1044.3621 c 0,1.4685 -0.333951,2.7167 -1.068564,3.9889 -0.733974,1.2715 -1.648145,2.1856 -2.919605,2.9196 -1.272188,0.7346 -2.5203999,1.0685 -3.9888974,1.0685 -1.4684976,0 -2.7167086,-0.3339 -3.9882598,-1.0685 -1.2720966,-0.734 -2.1856522,-1.6481 -2.920242,-2.9196 -0.73390729,-1.2722 -1.06856354,-2.5204 -1.06856354,-3.9889 0,-1.4685 0.33465625,-2.7167 1.06856354,-3.9883 0.7345898,-1.272 1.6481454,-2.1857 2.920242,-2.9202 1.2715512,-0.7339 2.5197622,-1.0686 3.9882598,-1.0686 1.4684975,0 2.7167094,0.3347 3.9888974,1.0686 1.27146,0.7345 2.185631,1.6482 2.919605,2.9202 0.734613,1.2716 1.068564,2.5198 1.068564,3.9883 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#ff0000;stroke-width:1.90915775;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path36"
+       d="m 14.723682,1044.3621 c 0,1.2378 -0.281688,2.2897 -0.900563,3.3616 -0.618944,1.0724 -1.389068,1.8426 -2.461552,2.4616 -1.071846,0.6188 -2.1236807,0.9004 -3.3615664,0.9004 -1.2378875,0 -2.2897208,-0.2816 -3.3622045,-0.9004 -1.0718466,-0.619 -1.8419691,-1.3892 -2.460913,-2.4616 -0.6188757,-1.0719 -0.9005633,-2.1238 -0.9005633,-3.3616 0,-1.2379 0.2816876,-2.2897 0.9005633,-3.3623 0.6189439,-1.0717 1.3890664,-1.8418 2.460913,-2.4608 1.0724837,-0.619 2.124317,-0.9006 3.3622045,-0.9006 1.2378857,0 2.2897204,0.2816 3.3615664,0.9006 1.072484,0.619 1.842608,1.3891 2.461552,2.4608 0.618875,1.0726 0.900563,2.1244 0.900563,3.3623 z" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/roundabout_left.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/roundabout_left.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/roundabout_left.svg	(revision 10565)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="roundabout_left.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="1.9058892"
+     inkscape:cy="7.871201"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <ellipse
+       cx="-8.000001"
+       cy="1044.3621"
+       style="fill:#ffffff;stroke:#000000;stroke-width:0.05693951px"
+       id="circle4"
+       rx="7.9715319"
+       ry="7.9715323"
+       transform="scale(-1,1)" />
+    <path
+       d="m 0.52622891,1044.362 a 7.473766,7.4737665 0 0 0 14.94753109,0 7.473766,7.4737665 0 1 0 -14.94753109,0 z"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path1883"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 12.799223,1045.9956 -1.878989,-1.9111 0.0086,-1.1154 1.383089,1.3524 c 0.04588,-2.1633 -1.816878,-3.9802 -3.5664449,-4.2139 l 0.1550028,-0.936 c 3.0719141,0.608 4.3090051,3.0094 4.3681121,5.1419 l 1.396234,-1.3574 0.0064,1.1599 -1.871985,1.8796 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path2806"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 4.1803759,1047.7035 2.5971756,-0.6612 0.9593787,0.569 -1.8648633,0.514 c 1.8459758,1.1289 4.3536891,0.4343 5.4365021,-0.9596 l 0.730683,0.6052 c -2.0720632,2.348 -4.7698084,2.2077 -6.6420311,1.185 l 0.469823,1.8898 -1.005388,-0.5785 -0.68128,-2.5637 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3753"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 7.0192855,1039.4097 -0.7321898,2.5782 -0.9738458,0.5439 0.491799,-1.8708 c -1.903114,1.0296 -2.561547,3.5471 -1.899717,5.1833 l -0.890273,0.3281 c -0.990166,-2.9708 0.485704,-5.2334 2.310139,-6.3391 l -1.870232,-0.5425 1.005139,-0.5791 2.5591806,0.698 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3755"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/roundabout_right.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/roundabout_right.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/roundabout_right.svg	(revision 10565)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="roundabout.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="13.032322"
+     inkscape:cy="8.9063726"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-others="true"
+     inkscape:snap-global="true"
+     inkscape:snap-center="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <ellipse
+       cx="8.000001"
+       cy="1044.3621"
+       style="fill:#ffffff;stroke:#000000;stroke-width:0.05693951px"
+       id="circle4"
+       rx="7.9715319"
+       ry="7.9715323" />
+    <path
+       d="m 15.473773,1044.362 a 7.473766,7.4737665 0 0 1 -14.94753137,0 7.473766,7.4737665 0 1 1 14.94753137,0 z"
+       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path1883"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 3.2007794,1045.9956 1.8789881,-1.9111 -0.00863,-1.1154 -1.3830885,1.3524 c -0.045876,-2.1633 1.8168783,-3.9802 3.5664448,-4.2139 l -0.1550028,-0.936 c -3.0719145,0.608 -4.3090049,3.0094 -4.3681119,5.1419 l -1.3962344,-1.3574 -0.00637,1.1599 1.8719852,1.8796 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path2806"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 11.819626,1047.7035 -2.5971756,-0.6612 -0.9593787,0.569 1.8648633,0.514 c -1.8459758,1.1289 -4.3536894,0.4343 -5.4365024,-0.9596 l -0.7306829,0.6052 c 2.0720634,2.348 4.7698086,2.2077 6.6420313,1.185 l -0.469823,1.8898 1.005388,-0.5785 0.68128,-2.5637 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3753"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 8.9807164,1039.4097 0.7321898,2.5782 0.9738458,0.5439 -0.491799,-1.8708 c 1.903114,1.0296 2.561547,3.5471 1.899717,5.1833 l 0.890273,0.3281 c 0.990166,-2.9708 -0.485704,-5.2334 -2.310139,-6.3391 l 1.870232,-0.5425 -1.005139,-0.5791 -2.5591806,0.698 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3755"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/speed_camera.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/speed_camera.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/speed_camera.svg	(revision 10565)
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="14"
+   viewBox="0 0 16 14"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__speed_camera.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="6.4966037"
+     inkscape:cy="-12.252009"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="false"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1038.3621)">
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4360"
+       width="16"
+       height="11"
+       x="-4.7683727e-007"
+       y="1041.3621"
+       ry="2" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4219"
+       cx="5.5"
+       cy="1046.8621"
+       r="3" />
+    <rect
+       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4209"
+       width="6"
+       height="4"
+       x="8"
+       y="1038.3621"
+       ry="1" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4207"
+       width="4"
+       height="2"
+       x="9"
+       y="1039.3621"
+       ry="1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/restriction/stop.svg
===================================================================
--- /trunk/images/presets/vehicle/restriction/stop.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/restriction/stop.svg	(revision 10565)
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__stop2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="64"
+     inkscape:cx="8.3175116"
+     inkscape:cy="8.1344046"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <path
+       id="path11065"
+       style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+       d="M 0.33858979,1048.0149 C 0.15507532,1047.8313 -4.7683724e-7,1047.4582 -4.7683724e-7,1047.2001 l 0,-5.676 c 0,-0.258 0.15507579683724,-0.6312 0.33859026683724,-0.8148 l 4.00839351,-4.0088 c 0.1832714,-0.1834 0.5585646,-0.3384 0.819617,-0.3384 l 5.6619687,0 c 0.260809,0 0.636346,0.155 0.819617,0.3384 l 4.008393,4.0088 c 0.183514,0.1836 0.33859,0.5568 0.33859,0.8146 l 0,5.6762 c 0,0.2581 -0.155076,0.631 -0.33859,0.8148 l -4.008393,4.009 c -0.183514,0.1832 -0.558808,0.3382 -0.81986,0.3382 l -5.6617257,-2e-4 c -0.2610524,0 -0.6363456,-0.1548 -0.819617,-0.338 l -4.00839351,-4.009 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path10312"
+       style="fill:#ee1c23;fill-rule:nonzero;stroke:none"
+       d="m 0.97021708,1047.2613 0,-5.8244 4.11760982,-4.1183 5.8234081,0 4.117849,4.1183 0,5.8242 -4.117849,4.1184 -5.8234081,0 -4.11760982,-4.1182"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path10314"
+       style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+       d="m 8.0274364,1042.7657 c 0,-0.9769 0.7505385,-1.4651 1.4585192,-1.4651 0.7079814,0 1.4587824,0.4882 1.4587824,1.4651 l 0,3.1656 c 0,0.9766 -0.750801,1.4647 -1.4587824,1.4647 -0.7079807,0 -1.4585192,-0.4881 -1.4585192,-1.4647 l 0,-3.1656 z m 0.8700677,3.1656 c 0,0.4126 0.2729469,0.606 0.5884515,0.606 0.3157674,0 0.5887144,-0.1934 0.5887144,-0.606 l 0,-3.1656 c 0,-0.4126 -0.272947,-0.6063 -0.5887144,-0.6063 -0.3155046,0 -0.5884515,0.1937 -0.5884515,0.6063 l 0,3.1656"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path10316"
+       style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+       d="m 11.911315,1041.3383 1.305101,0 c 0.477854,0 0.827509,0.1092 1.125939,0.4212 0.298691,0.3114 0.392475,0.6902 0.392475,1.4058 0,0.5222 -0.04256,0.9922 -0.247464,1.3204 -0.238796,0.3874 -0.622602,0.6232 -1.262281,0.6232 l -0.443704,0 0,2.224 -0.870066,0 0,-5.9946 z m 0.870066,2.9622 0.417958,0 c 0.707982,0 0.716652,-0.5289 0.716652,-1.1266 0,-0.5644 0,-1.0273 -0.682499,-1.0273 l -0.452111,0 0,2.1539"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path10318"
+       style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+       d="m 6.0177719,1042.1604 -0.9181421,0 0,-0.8084 2.7063516,0 0,0.8084 -0.918142,0 0,5.1863 -0.8700675,0 0,-5.1863"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path10320"
+       style="fill:#ffffff;fill-rule:nonzero;stroke:none"
+       d="m 3.4437736,1044.6913 c -0.7079806,0 -1.4241051,-0.486 -1.4241051,-1.4629 l 0,-0.488 c 0,-0.9765 0.750801,-1.4647 1.4587817,-1.4647 0.7079807,0 1.4585191,0.4882 1.4585191,1.4647 l -0.8700677,0 c 0,-0.4122 -0.2729468,-0.606 -0.5884514,-0.606 -0.3157672,0 -0.5887141,0.1938 -0.5887141,0.606 l 0,0.488 c 0,0.4125 0.2382703,0.6033 0.5540375,0.6033 l 0.052015,0.011 c 0.7079808,0 1.4325117,0.4822 1.4325117,1.4588 l 0,0.6627 c 0,0.9767 -0.7505383,1.4651 -1.4585189,1.4651 -0.7079808,0 -1.458782,-0.4884 -1.458782,-1.4651 l 0.8700677,0 c 0,0.4126 0.272947,0.606 0.5887143,0.606 0.3155046,0 0.5884514,-0.1934 0.5884514,-0.606 l 0,-0.6627 c 0,-0.4123 -0.2729468,-0.6061 -0.5884514,-0.6061 l -0.026007,6e-4"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/rumble_strip.svg
===================================================================
--- /trunk/images/presets/vehicle/rumble_strip.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/rumble_strip.svg	(revision 10565)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__rumble_strip.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="-41.808605"
+     inkscape:cy="15.624716"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846066,0,0,1.1346381,-204.78325,616.43414)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3653 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5,1043.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5,1047.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3653 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7-4"
+       d="m 9,1047.3621 -3,0 0,-1 3,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 9,1049.3621 -3,0 0,-1 3,0 z"
+       id="path4173"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4175"
+       d="m 9,1051.3621 -3,0 0,-1 3,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 3,1042.3621 -3,0 0,-1 3,0 z"
+       id="path4177"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4179"
+       d="m 3,1040.3621 -3,0 0,-1 3,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 3,1038.3621 -3,0 0,-1 3,0 z"
+       id="path4181"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#000000;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4147"
+       d="m 3,1044.3621 -3,0 0,-1 3,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 9,1045.3621 -3,0 0,-1 3,0 z"
+       id="path4149"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/services.svg
===================================================================
--- /trunk/images/presets/vehicle/services.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/services.svg	(revision 10565)
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__motorway_junction.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.80000001"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.80000001"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.80000001"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="8.8855832"
+     inkscape:cy="10.815338"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4254-5"
+       width="16"
+       height="16"
+       x="-4.7683727e-007"
+       y="1036.3621"
+       rx="2"
+       ry="2" />
+    <rect
+       rx="1.8715348"
+       y="1036.876"
+       x="0.51386845"
+       height="14.972305"
+       width="14.97227"
+       id="rect4217"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       id="g4230"
+       transform="translate(1.1499033,-0.35440876)">
+      <g
+         id="XMLID_4_"
+         style="fill:#000000"
+         transform="matrix(0.07422091,0,0,0.07422091,6.6867444,1040.9887)">
+        <g
+           id="g1954"
+           style="fill:#000000">
+          <path
+             sodipodi:nodetypes="ccccccc"
+             inkscape:connector-curvature="0"
+             id="path1956"
+             style="fill:#ffffff;fill-opacity:1"
+             d="m 100.25,91.111 c 2.31808,2.318083 -6.552046,11.72595 -9.139,9.139 L 40.787555,47.528226 c 0,0 -3.033158,-3.581623 -7.640555,1.025774 L 5.471,20.356 C -7.671994,7.213006 3.0014474,-3.8990087 7.4948624,0.59440624 Z" />
+          <path
+             sodipodi:nodetypes="acccccsccsccsccsccsccsccca"
+             inkscape:connector-curvature="0"
+             id="path1958"
+             style="fill:#ffffff;fill-opacity:1"
+             d="m 81.189,35.237 c -3.405243,2.041853 -9.363961,-0.368207 -11.740962,2.008337 L 57.952,48.552 51.685,42.025 63.435,30.275 C 66.239352,27.470648 63.53552,21.645656 65.524,18.004 71.037953,9.2107244 87.899744,-1.1342555 89.284,0.25 90.772572,1.7385721 86.15,5.733 86.15,5.733 l -9.508561,8.71911 c 0,0 -4.102961,3.740345 -3.026589,4.90837 1.101122,1.194883 5.17152,-3.02444 5.17152,-3.02444 l 8.877,-8.9296296 c 0,0 3.972117,-4.7114218 5.27563,-3.5014104 1.329158,1.2338167 -3.395,5.222 -3.395,5.222 l -8.66648,8.662179 c 0,0 -4.702751,4.261506 -3.71293,5.331561 1.091356,1.179821 5.43682,-3.54859 5.43682,-3.54859 L 91.371,10.693 c 0,0 4.104772,-4.4048219 5.223,-3.133 1.029329,1.1707114 -3.395,5.222 -3.395,5.222 l -8.92963,8.50859 c 0,0 -4.75356,3.831021 -3.55289,5.06626 C 81.776708,27.447603 85.888,23.226 85.888,23.226 l 8.877,-8.877 c 0,0 3.850116,-4.6022378 5.22415,-3.33922 C 102.38294,13.403572 89.955762,29.980272 81.189,35.237 Z" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path1960"
+             style="fill:#ffffff;fill-opacity:1"
+             d="M 42.286,51.425 48.628419,57.805129 9.388,100.25 C 5.8258038,103.8122 -3.109231,94.209231 0.25,90.85 Z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(1.3087815,0,0,1.3087815,-12.188936,-326.89621)"
+         id="g4256">
+        <path
+           sodipodi:nodetypes="csssccc"
+           inkscape:connector-curvature="0"
+           d="m 13.959108,1050.882 0,-5.5689 c 0,-0.1115 -0.0646,-0.2079 -0.186101,-0.2079 l -2.695906,0 c -0.139141,0 -0.277865,0.1005 -0.277865,0.2612 l -0.0031,5.514 z"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path1897" />
+        <path
+           sodipodi:nodetypes="cccccccccc"
+           inkscape:connector-curvature="0"
+           d="m 10.811968,1046.8825 -0.262811,0 c 0,0 0.156147,2.3898 -0.0055,3.4457 -0.411999,1.0379 -1.7451403,0.5611 -1.5558515,-0.4488 0.4157448,-1.0017 0.9987027,-1.6796 1.2888405,-2.8613 l 0.02583,0.8784 c 0,0 -0.7217719,1.4005 -1.0790229,2.1464 -0.030096,0.6888 0.7891539,0.9156 1.0457379,0.1764 0.114343,-1.294 -0.0043,-2.7044 -0.0065,-4.0565 0,-0.4099 0.350708,-0.5431 0.537413,-0.5196"
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path1899" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 11.343882,1045.8422 -0.0091,1.3366 c 0,0.1077 0.08634,0.1817 0.186372,0.1817 l 1.731897,0 c 0.105071,0 0.154551,-0.067 0.154551,-0.1591 l 0,-1.3592 c 0,-0.1312 -0.07519,-0.1704 -0.170462,-0.1704 l -1.720532,0 c -0.0986,0 -0.172735,0.059 -0.172735,0.1659 z"
+           style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path1901" />
+      </g>
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/spikes.svg
===================================================================
--- /trunk/images/presets/vehicle/spikes.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/spikes.svg	(revision 10565)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="8"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="15.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="44.8"
+     inkscape:cx="6.4592619"
+     inkscape:cy="4.2969784"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-361px"
+       originy="-385px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-361,-659.36218)">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 361,667.36218 2.5,-8 2.5,8 z"
+       id="path2989"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 366,667.36218 2.5,-8 2.5,8 z"
+       id="path2989-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 371,667.36218 2.5,-8 2.5,8 z"
+       id="path2989-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       d="m 361,667.36218 2.5,-5.05357 2.5,5.05357 z"
+       id="path2989-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       d="m 366,667.36218 2.5,-5.05357 2.5,5.05357 z"
+       id="path2989-1-9"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#999999;fill-opacity:1;stroke:none"
+       d="m 371,667.36218 2.5,-5.05357 2.5,5.05357 z"
+       id="path2989-7-4"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/stile.svg
===================================================================
--- /trunk/images/presets/vehicle/stile.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/stile.svg	(revision 10565)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="cattle_grid.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="2.3970333"
+     inkscape:cy="-1.8865791"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-650px"
+       originy="-370px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-650,-666.36218)">
+    <rect
+       style="fill:#45d749;fill-opacity:1;stroke:none"
+       id="rect3006"
+       width="16"
+       height="16"
+       x="650"
+       y="666.36218" />
+    <g
+       id="g3008"
+       style="fill:#5f5100;fill-opacity:1">
+      <rect
+         ry="0"
+         y="666.36218"
+         x="657"
+         height="16"
+         width="2"
+         id="rect2998"
+         style="fill:#5f5100;fill-opacity:1;stroke:none" />
+      <rect
+         y="676.36218"
+         x="650"
+         height="1.9998977"
+         width="15.999958"
+         id="rect3000"
+         style="fill:#5f5100;fill-opacity:1;stroke:none" />
+      <rect
+         y="678.36218"
+         x="652"
+         height="4"
+         width="1"
+         id="rect3002"
+         style="fill:#5f5100;fill-opacity:1;stroke:none" />
+      <rect
+         y="678.36218"
+         x="663"
+         height="4"
+         width="1"
+         id="rect3004"
+         style="fill:#5f5100;fill-opacity:1;stroke:none" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/table.svg
===================================================================
--- /trunk/images/presets/vehicle/table.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/table.svg	(revision 10565)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__table.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-7.6439145"
+     inkscape:cy="13.095306"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846066,0,0,1.1346381,-204.78325,616.43414)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1040.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1050.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <rect
+       style="opacity:1;fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4156"
+       width="9"
+       height="6"
+       x="0"
+       y="1041.3621" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7-4"
+       d="m 8.000001,1046.3621 -1,0 0,-4 1,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 2,1046.3621 -1,0 0,-4 1,0 z"
+       id="path4177"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path4179"
+       d="m 4,1046.3621 -1,0 0,-4 1,0 z"
+       class="st5" />
+    <path
+       class="st5"
+       d="m 6,1046.3621 -1,0 0,-4 1,0 z"
+       id="path4181"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       class="st5"
+       d="m 5,1037.3621 -1,0 0,-1 1,0 z"
+       id="path4183"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       class="st5"
+       d="m 5,1052.3621 -1,0 0,-1 1,0 z"
+       id="path4185"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;fill-opacity:1"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_calming.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_calming.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_calming.svg	(revision 10565)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_calming__yes.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="-1.063307"
+     inkscape:cy="13.321318"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382-2"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78324,616.43072)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_-9"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9"
+       d="m 5,1042.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-7"
+       d="m 5,1048.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4143"
+       width="9"
+       height="2"
+       x="-4.7683722e-007"
+       y="1043.3621" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.00000048;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       d="m 11.236234,1039.306 c -0.77002,0.017 -1.5671119,0.7072 -1.4897799,2.2195 l -1.7457337,-0.017 c -0.03222,-2.2242 1.025932,-3.0492 1.5484917,-3.2969 0.4994209,-0.2368 1.1335729,-0.3622 1.7510069,-0.3622 0.738027,0 1.340991,0.094 1.80889,0.2787 0.4679,0.1843 0.848973,0.4225 1.133571,0.7101 0.284599,0.2877 0.482371,0.6113 0.593316,0.9664 0.110946,0.3551 0.164006,0.6967 0.164006,1.0203 0,0.409 -0.082,0.7731 -0.250832,1.0922 -0.16883,0.3191 -0.37625,0.6158 -0.622259,0.8944 -0.246009,0.2787 -0.516136,0.5394 -0.815206,0.7956 -0.29907,0.2517 -0.569197,0.5124 -0.815207,0.7821 -0.246009,0.2697 -0.453428,0.5663 -0.622258,0.8854 -0.168829,0.3191 -0.250833,0.6742 -0.250833,1.0743 l 0,0.1977 c 0,0.072 0.0048,0.1394 0.0193,0.1978 l -1.504996,0 c -0.05306,-0.2382 -0.07718,-0.4944 -0.07718,-0.7596 0,-0.3866 0.07236,-0.7326 0.221891,-1.0473 0.149535,-0.3146 0.337659,-0.6068 0.569197,-0.8764 0.231538,-0.2697 0.477547,-0.5214 0.733204,-0.7596 0.255656,-0.2338 0.501665,-0.472 0.738027,-0.7102 0.231538,-0.2382 0.424486,-0.4944 0.569197,-0.7596 0.149535,-0.2652 0.221891,-0.5528 0.221891,-0.8675 0,-0.5079 -0.173654,-0.9169 -0.52096,-1.236 -0.342484,-0.3101 -0.686455,-0.4366 -1.356739,-0.4221 z m 1.052845,10.3643 c 0,0.3236 -0.115769,0.6068 -0.347307,0.845 -0.231538,0.2382 -0.549902,0.3596 -0.95027,0.3596 -0.400368,0 -0.718732,-0.1214 -0.95027,-0.3596 -0.02286,-0.024 -0.02703,-0.016 -0.044138,-0.041 l 2.346e-4,-1.6044 c 0.024147,-0.034 0.0099,-0.011 0.043904,-0.05 0.220586,-0.2484 0.549902,-0.3595 0.95027,-0.3595 0.400368,0 0.713909,0.1213 0.95027,0.3595 0.231538,0.2383 0.347307,0.5214 0.347307,0.8495 z"
+       class="st1"
+       id="path4148"
+       sodipodi:nodetypes="sccsssssssscssssccssscccscssssssccscss" />
+    <g
+       id="XMLID_135_"
+       transform="matrix(0.04823708,0,0,0.04494685,-1.6321415,1026.0193)"
+       style="fill:#000000">
+      <path
+         style="fill:#000000"
+         inkscape:connector-curvature="0"
+         d="m 266.77352,295.60834 c -15.96324,0.36944 -32.48768,15.73538 -30.88452,49.38093 l -36.19071,-0.38025 C 199.03031,295.12395 220.9668,276.76971 231.8,271.25733 242.15344,265.98907 255.3,263.2 268.1,263.2 c 15.3,0 27.8,2.1 37.5,6.2 9.7,4.1 17.6,9.4 23.5,15.8 5.9,6.4 10,13.6 12.3,21.5 2.3,7.9 3.4,15.5 3.4,22.7 0,9.1 -1.7,17.2 -5.2,24.3 -3.5,7.1 -7.8,13.7 -12.9,19.9 -5.1,6.2 -10.7,12 -16.9,17.7 -6.2,5.6 -11.8,11.4 -16.9,17.4 -5.1,6 -9.4,12.6 -12.9,19.7 -3.5,7.1 -5.2,15 -5.2,23.9 l 0,4.4 c 0,1.6 0.1,3.1 0.4,4.4 l -31.2,0 c -1.1,-5.3 -1.6,-11 -1.6,-16.9 0,-8.6 1.5,-16.3 4.6,-23.3 3.1,-7 7,-13.5 11.8,-19.5 4.8,-6 9.9,-11.6 15.2,-16.9 5.3,-5.2 10.4,-10.5 15.3,-15.8 4.8,-5.3 8.8,-11 11.8,-16.9 3.1,-5.9 4.6,-12.3 4.6,-19.3 0,-11.3 -3.6,-20.4 -10.8,-27.5 -7.1,-6.9 -14.23086,-9.71326 -28.12648,-9.39166 z M 288.6,526.2 c 0,7.2 -2.4,13.5 -7.2,18.8 -4.8,5.3 -11.4,8 -19.7,8 -8.3,0 -14.9,-2.7 -19.7,-8 -4.8,-5.3 -7.2,-11.6 -7.2,-18.8 0,-7.2 2.4,-13.5 7.2,-18.9 4.8,-5.3 11.4,-8 19.7,-8 8.3,0 14.8,2.7 19.7,8 4.8,5.3 7.2,11.6 7.2,18.9 z"
+         class="st1"
+         id="XMLID_140_-7"
+         sodipodi:nodetypes="sccsssssssscssssccssscccscsssssscscs" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_mirror.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_mirror.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_mirror.svg	(revision 10565)
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="14"
+   height="16"
+   viewBox="0 0 14 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="traffic_sign__traffic_mirror.svg">
+  <defs
+     id="defs4266">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4321">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop4291" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4293" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4321"
+       id="radialGradient4665"
+       cx="3.6456184"
+       cy="1043.9417"
+       fx="3.6456184"
+       fy="1043.9417"
+       r="8"
+       gradientTransform="matrix(0.37498993,-0.74999645,1.5206994,0.76033289,-1585.8884,251.3531)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32"
+     inkscape:cx="8.1603866"
+     inkscape:cy="7.5582424"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4262"
+       width="4"
+       height="6"
+       x="5"
+       y="1046.3621"
+       rx="0"
+       ry="4.0764426e-005" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2.0000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4260"
+       width="12"
+       height="8"
+       x="1"
+       y="1037.3621"
+       rx="1.65728"
+       ry="1.65728" />
+    <rect
+       style="opacity:1;fill:url(#radialGradient4665);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4360"
+       width="11"
+       height="7"
+       x="1.5"
+       y="1037.8621"
+       ry="1.6572816"
+       rx="1.6572815" />
+    <g
+       id="g3382-9"
+       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
+       style="fill:#000000;fill-opacity:1" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4263"
+       width="2"
+       height="8"
+       x="6"
+       y="1044.3621"
+       ry="0" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_signals.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_signals.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_signals.svg	(revision 10565)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="6"
+   height="16"
+   id="svg3850"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="traffic_signal_crossing_island.svg">
+  <defs
+     id="defs3852" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.621652"
+     inkscape:cy="3.4019579"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3877"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="4.5474735e-013px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3927"
+       transform="translate(0,1.7382813e-5)">
+      <rect
+         ry="2"
+         y="1036.3622"
+         x="0"
+         height="16"
+         width="6"
+         id="rect3804"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,262.44169)"
+         d="m 640,709.36218 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="709.36218"
+         sodipodi:cx="638"
+         id="path3024"
+         style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,261.9655)"
+         d="m 640,714.36218 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="714.36218"
+         sodipodi:cx="638"
+         id="path3796"
+         style="fill:#ffff00;fill-opacity:1;stroke:#ffd600;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.76189,261.48932)"
+         d="m 640,719.36218 a 2,2 0 1 1 -4,0 2,2 0 1 1 4,0 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="719.36218"
+         sodipodi:cx="638"
+         id="path3798"
+         style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_signals_crossing.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_signals_crossing.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_signals_crossing.svg	(revision 10565)
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3850"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="traffic_signal_crossing_traffic_signal.svg">
+  <defs
+     id="defs3852" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="10.872455"
+     inkscape:cy="4.2485601"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3877"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="4.5474735e-013px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3933"
+       transform="translate(0,1.7382813e-5)">
+      <rect
+         y="1045.3193"
+         x="0"
+         height="7"
+         width="16"
+         id="rect2998"
+         style="fill:#999999;fill-opacity:1;stroke:none" />
+      <rect
+         y="1045.3193"
+         x="5"
+         height="0.9997701"
+         width="1.0000887"
+         id="rect3772"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1045.3193"
+         x="10"
+         height="1"
+         width="1"
+         id="rect3774"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1047.3193"
+         x="10"
+         height="2"
+         width="1"
+         id="rect3776"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1050.3193"
+         x="10"
+         height="2"
+         width="1"
+         id="rect3778"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1050.3193"
+         x="5"
+         height="2"
+         width="1"
+         id="rect3780"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1047.3193"
+         x="5"
+         height="2"
+         width="1"
+         id="rect3782"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1048.3193"
+         x="1.9999999"
+         height="1"
+         width="2"
+         id="rect3861"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1048.3193"
+         x="12"
+         height="1"
+         width="2"
+         id="rect3863"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1048.3193"
+         x="0"
+         height="1"
+         width="1"
+         id="rect3865"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1048.3193"
+         x="15"
+         height="1"
+         width="1"
+         id="rect3867"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g3927"
+       transform="translate(0,1.7382813e-5)">
+      <rect
+         ry="2"
+         y="1036.3622"
+         x="0"
+         height="16"
+         width="6"
+         id="rect3804"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,262.44169)"
+         d="m 640,709.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="709.36218"
+         sodipodi:cx="638"
+         id="path3024"
+         style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,261.9655)"
+         d="m 640,714.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="714.36218"
+         sodipodi:cx="638"
+         id="path3796"
+         style="fill:#ffff00;fill-opacity:1;stroke:#ffd600;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.76189,261.48932)"
+         d="m 640,719.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="719.36218"
+         sodipodi:cx="638"
+         id="path3798"
+         style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_signals_crossing_island.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_signals_crossing_island.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_signals_crossing_island.svg	(revision 10565)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3850"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="traffic_signal_crossing_ref_zebra.svg">
+  <defs
+     id="defs3852" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.621652"
+     inkscape:cy="3.4019579"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3877"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="4.5474735e-013px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g4031"
+       transform="translate(-19.5,3.7500174)">
+      <rect
+         y="1041.6122"
+         x="19.5"
+         height="7"
+         width="16"
+         id="rect3817"
+         style="fill:#999999;fill-opacity:1;stroke:none" />
+      <rect
+         y="1044.6122"
+         x="19.5"
+         height="1"
+         width="2"
+         id="rect3819"
+         style="fill:#999999;fill-opacity:1;stroke:none" />
+      <rect
+         y="1044.6122"
+         x="20.5"
+         height="1"
+         width="2"
+         id="rect3823"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1044.6122"
+         x="32.5"
+         height="1"
+         width="2"
+         id="rect3825"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <path
+         transform="translate(-628.5,313.25004)"
+         d="m 657,731.86218 c 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 1.38071,0 2.5,1.11929 2.5,2.5 z"
+         sodipodi:ry="2.5"
+         sodipodi:rx="2.5"
+         sodipodi:cy="731.86218"
+         sodipodi:cx="654.5"
+         id="path3827"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         d="m 657,731.86218 c 0,1.38071 -1.11929,2.5 -2.5,2.5 -1.38071,0 -2.5,-1.11929 -2.5,-2.5 0,-1.38071 1.11929,-2.5 2.5,-2.5 1.38071,0 2.5,1.11929 2.5,2.5 z"
+         sodipodi:ry="2.5"
+         sodipodi:rx="2.5"
+         sodipodi:cy="731.86218"
+         sodipodi:cx="654.5"
+         id="path3827-1"
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         sodipodi:type="arc"
+         transform="translate(-625.5,313.25004)" />
+      <rect
+         y="1041.6122"
+         x="25.5"
+         height="7"
+         width="4"
+         id="rect3847"
+         style="fill:#999999;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g3927"
+       transform="translate(0,1.7382813e-5)">
+      <rect
+         ry="2"
+         y="1036.3622"
+         x="0"
+         height="16"
+         width="6"
+         id="rect3804"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,262.44169)"
+         d="m 640,709.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="709.36218"
+         sodipodi:cx="638"
+         id="path3024"
+         style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,261.9655)"
+         d="m 640,714.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="714.36218"
+         sodipodi:cx="638"
+         id="path3796"
+         style="fill:#ffff00;fill-opacity:1;stroke:#ffd600;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.76189,261.48932)"
+         d="m 640,719.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="719.36218"
+         sodipodi:cx="638"
+         id="path3798"
+         style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_signals_crossing_ref_zebra.svg	(revision 10565)
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3850"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="traffic_signal_crossing.svg">
+  <defs
+     id="defs3852" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="38.544379"
+     inkscape:cy="5.0923131"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3877"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="4.5474735e-013px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g3985"
+       transform="translate(-24.4375,-0.68748262)">
+      <rect
+         y="1046.0497"
+         x="24.4375"
+         height="7"
+         width="16"
+         id="rect3784"
+         style="fill:#999999;fill-opacity:1;stroke:none" />
+      <rect
+         y="1047.0497"
+         x="29.4375"
+         height="1"
+         width="6"
+         id="rect3786"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1049.0497"
+         x="29.4375"
+         height="1"
+         width="6"
+         id="rect3788"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1051.0497"
+         x="29.4375"
+         height="1"
+         width="6"
+         id="rect3790"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1049.0497"
+         x="26.4375"
+         height="1"
+         width="2"
+         id="rect3853"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1049.0497"
+         x="24.4375"
+         height="1"
+         width="1"
+         id="rect3855"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1049.0497"
+         x="36.4375"
+         height="1"
+         width="2"
+         id="rect3857"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+      <rect
+         y="1049.0497"
+         x="39.4375"
+         height="1"
+         width="1"
+         id="rect3859"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    </g>
+    <g
+       id="g3927"
+       transform="translate(0,1.7382813e-5)">
+      <rect
+         ry="2"
+         y="1036.3622"
+         x="0"
+         height="16"
+         width="6"
+         id="rect3804"
+         style="fill:#000000;fill-opacity:1;stroke:none" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,262.44169)"
+         d="m 640,709.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="709.36218"
+         sodipodi:cx="638"
+         id="path3024"
+         style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.7619,261.9655)"
+         d="m 640,714.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="714.36218"
+         sodipodi:cx="638"
+         id="path3796"
+         style="fill:#ffff00;fill-opacity:1;stroke:#ffd600;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0952381,0,0,1.0952381,-695.76189,261.48932)"
+         d="m 640,719.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="719.36218"
+         sodipodi:cx="638"
+         id="path3798"
+         style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg
===================================================================
--- /trunk/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/traffic_signals_crossing_traffic_signals.svg	(revision 10565)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="12"
+   height="16"
+   id="svg3850"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="New document 4">
+  <defs
+     id="defs3852" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="28.262369"
+     inkscape:cy="29.50151"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3877"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="0px"
+       originy="0px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3855">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3804"
+       width="6"
+       height="16"
+       x="0"
+       y="1036.3622"
+       ry="2" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3024"
+       sodipodi:cx="638"
+       sodipodi:cy="709.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,709.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-695.7619,262.44169)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffff00;fill-opacity:1;stroke:#ffd600;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3796"
+       sodipodi:cx="638"
+       sodipodi:cy="714.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,714.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-695.7619,261.9655)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3798"
+       sodipodi:cx="638"
+       sodipodi:cy="719.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,719.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-695.76189,261.48932)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="rect3804-1"
+       width="6"
+       height="11"
+       x="6"
+       y="1041.3622"
+       ry="2" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ff0000;fill-opacity:1;stroke:#b20505;stroke-width:0.2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3024-7"
+       sodipodi:cx="638"
+       sodipodi:cy="709.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,709.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-689.7619,267.44172)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#00ff00;fill-opacity:1;stroke:#00b200;stroke-width:0.2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3798-0"
+       sodipodi:cx="638"
+       sodipodi:cy="719.36218"
+       sodipodi:rx="2"
+       sodipodi:ry="2"
+       d="m 640,719.36218 c 0,1.10457 -0.89543,2 -2,2 -1.10457,0 -2,-0.89543 -2,-2 0,-1.10457 0.89543,-2 2,-2 1.10457,0 2,0.89543 2,2 z"
+       transform="matrix(1.0952381,0,0,1.0952381,-689.76189,261.48935)" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/turning_circle.svg
===================================================================
--- /trunk/images/presets/vehicle/turning_circle.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/turning_circle.svg	(revision 10565)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="12"
+   viewBox="0 0 16 12"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__turning_circle2.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="9.8027027"
+     inkscape:cy="5.2015579"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1040.3621)">
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4221"
+       cx="6"
+       cy="1046.3621"
+       rx="5.5"
+       ry="5.5" />
+    <g
+       id="g3382"
+       transform="matrix(0,0.61538806,-0.42566328,0,179.53891,948.34619)"
+       style="fill:#ffffff;fill-opacity:1" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16,1043.8621 -5,0"
+       id="path4209"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4211"
+       d="m 16,1048.8621 -5,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4213"
+       d="m 16,1046.3621 -6,0"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/turning_loop.svg
===================================================================
--- /trunk/images/presets/vehicle/turning_loop.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/turning_loop.svg	(revision 10565)
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="12"
+   viewBox="0 0 16 12"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="highway__turning_loop.svg">
+  <defs
+     id="defs4266">
+    <marker
+       inkscape:stockid="EmptyTriangleInL"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="EmptyTriangleInL"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4298"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4778"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4780"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4657"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4659"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       inkscape:stockid="InfiniteLineStart"
+       id="InfiniteLineStart"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:isstock="true">
+      <g
+         id="g4391"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
+         transform="translate(-13,0)">
+        <circle
+           id="circle4393"
+           r="0.8"
+           cy="0"
+           cx="3"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4395"
+           r="0.8"
+           cy="0"
+           cx="6.5"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+        <circle
+           id="circle4397"
+           r="0.8"
+           cy="0"
+           cx="10"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4165"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(1.1,0,0,1.1,1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Mstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Mstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4153"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.4,0,0,0.4,4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4147"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="13.788693"
+     inkscape:cy="4.3855505"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="false"
+     inkscape:snap-center="false"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="true"
+     inkscape:snap-page="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1040.3621)">
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4221"
+       cx="6"
+       cy="1046.3621"
+       rx="5.5"
+       ry="5.5" />
+    <ellipse
+       cy="1046.3621"
+       cx="5.999999"
+       id="circle4223"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       rx="2"
+       ry="2" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16,1043.8621 -5,0"
+       id="path4209"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4211"
+       d="m 16,1048.8621 -5,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4213"
+       d="m 16,1046.3621 -6,0"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
Index: /trunk/images/presets/vehicle/waypoints.svg
===================================================================
--- /trunk/images/presets/vehicle/waypoints.svg	(revision 10565)
+++ /trunk/images/presets/vehicle/waypoints.svg	(revision 10565)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="9"
+   height="16"
+   viewBox="0 0 9 16"
+   id="svg4264"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="waypoints.svg">
+  <defs
+     id="defs4266" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="-5.2691134"
+     inkscape:cy="6.8269063"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4137" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4269">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3621)">
+    <g
+       id="g3382"
+       transform="matrix(1.3846064,0,0,1.1346381,-204.78322,616.43092)"
+       style="fill:#808080;fill-opacity:1">
+      <rect
+         id="XMLID_61_"
+         x="147.89999"
+         y="370.10001"
+         class="st4"
+         width="6.5"
+         height="14.1"
+         style="fill:#808080;fill-opacity:1" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0"
+       d="m 5,1039.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       style="fill:#ffffff;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="path3387-0-9-4"
+       d="m 5,1051.3621 -1,0 0,-2 1,0 z"
+       class="st5" />
+    <circle
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4140"
+       cx="4.5"
+       cy="1044.3621"
+       r="3" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10564)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10565)
@@ -65,55 +65,55 @@
 
 relation[restriction=no_left_turn][!setting("alt_turn_icons")] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_left_turn_red.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn_red.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_left_turn][setting("alt_turn_icons")] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_right_turn][!setting("alt_turn_icons")] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_right_turn_red.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn_red.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_right_turn][setting("alt_turn_icons")] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_straight_on][!setting("alt_turn_icons")] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_straight_on_red.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on_red.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_straight_on][setting("alt_turn_icons")] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=no_u_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=only_left_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=only_right_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
     set icon_z17;
     text: auto;
 }
 relation[restriction=only_straight_on] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
     set icon_z17;
     text: auto;
 }
 node[restriction] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
     text: auto;
@@ -155,5 +155,5 @@
 node[cutting?!],
 node[embankment?!] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -188,5 +188,5 @@
 }
 node[traffic_sign][access?!] {
-    icon-image: "vehicle/restriction/access.png";
+    icon-image: "presets/vehicle/restriction/access.png";
     set icon_z17;
 }
@@ -194,80 +194,80 @@
 node[traffic_sign][access=private][!is_prop_set(icon-image)],
 node[traffic_sign][access=destination][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[traffic_sign][bicycle?!] {
-    icon-image: "vehicle/restriction/bicycle.png";
+    icon-image: "presets/vehicle/restriction/bicycle.png";
     set icon_z17;
 }
 node[traffic_sign][bicycle=designated] {
-    icon-image: "vehicle/restriction/bicycle-designated.png";
+    icon-image: "presets/vehicle/restriction/bicycle-designated.png";
     set icon_z17;
 }
 node[traffic_sign][foot?!] {
-    icon-image: "vehicle/restriction/foot.png";
+    icon-image: "presets/vehicle/restriction/foot.png";
     set icon_z17;
 }
 node[traffic_sign][foot=designated] {
-    icon-image: "vehicle/restriction/foot-designated.png";
+    icon-image: "presets/vehicle/restriction/foot-designated.png";
     set icon_z17;
 }
 node[traffic_sign][goods?!],
 node[traffic_sign][hgv?!] {
-    icon-image: "vehicle/restriction/goods.png";
+    icon-image: "presets/vehicle/restriction/goods.png";
     set icon_z17;
 }
 node[traffic_sign][horse?!] {
-    icon-image: "vehicle/restriction/horse.png";
+    icon-image: "presets/vehicle/restriction/horse.png";
     set icon_z17;
 }
 node[traffic_sign][horse=designated] {
-    icon-image: "vehicle/restriction/horse-designated.png";
+    icon-image: "presets/vehicle/restriction/horse-designated.png";
     set icon_z17;
 }
 node[traffic_sign][motorcycle?!] {
-    icon-image: "vehicle/restriction/motorbike.png";
+    icon-image: "presets/vehicle/restriction/motorbike.png";
     set icon_z17;
 }
 node[traffic_sign][motorcar?!] {
-    icon-image: "vehicle/restriction/motorcar.png";
+    icon-image: "presets/vehicle/restriction/motorcar.png";
     set icon_z17;
 }
 node[traffic_sign][psv?!] {
-    icon-image: "vehicle/restriction/psv.png";
+    icon-image: "presets/vehicle/restriction/psv.png";
     set icon_z17;
 }
 node[traffic_sign][motorboat?!][!is_prop_set(icon-image)],
 node[traffic_sign][boat?!][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[noexit=yes] {
-    icon-image: "vehicle/restriction/dead_end.png";
+    icon-image: "presets/vehicle/restriction/dead_end.png";
     set icon_z17;
 }
 node[traffic_sign][maxweight] {
-    icon-image: "vehicle/restriction/maxweight.png";
+    icon-image: "presets/vehicle/restriction/maxweight.png";
     set icon_z17;
 }
 node[traffic_sign][maxheight] {
-    icon-image: "vehicle/restriction/maxheight.png";
+    icon-image: "presets/vehicle/restriction/maxheight.png";
     set icon_z17;
 }
 node[traffic_sign][maxwidth] {
-    icon-image: "vehicle/restriction/maxwidth.png";
+    icon-image: "presets/vehicle/restriction/maxwidth.png";
     set icon_z17;
 }
 node[traffic_sign][maxlength] {
-    icon-image: "vehicle/restriction/maxlength.png";
+    icon-image: "presets/vehicle/restriction/maxlength.png";
     set icon_z17;
 }
 node[traffic_sign][minspeed] {
-    icon-image: "vehicle/restriction/minspeed.png";
+    icon-image: "presets/vehicle/restriction/minspeed.png";
     set icon_z17;
 }
 node[traffic_sign][maxstay][!is_prop_set(icon-image)],
 node[traffic_sign][toll][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
@@ -279,5 +279,5 @@
 node["addr:housenumber"],
 node["addr:postcode"] {
-    icon-image: "misc/housenumber.png";
+    icon-image: "presets/misc/housenumber.png";
     set icon_z17;
 }
@@ -305,43 +305,43 @@
 }
 node[building][!building?!] {
-    icon-image: "misc/landmark/building.png";
+    icon-image: "presets/misc/landmark/building.png";
     set icon_z17;
 }
 node[building=garage] {
-    icon-image: "misc/landuse/garages.png";
+    icon-image: "presets/misc/landuse/garages.png";
     set icon_z17;
 }
 node[building=garages] {
-    icon-image: "misc/landuse/garages.png";
+    icon-image: "presets/misc/landuse/garages.png";
     set icon_z17;
 }
 node[building=transformer_tower] {
-    icon-image: "power/transformer_tower.svg";
+    icon-image: "presets/power/transformer_tower.svg";
     set icon_z17;
 }
 node[entrance=yes],
 node[entrance=staircase] {
-    icon-image: "misc/entrance-yes.png";
+    icon-image: "presets/misc/entrance-yes.png";
     set icon_z17;
 }
 node[entrance=main] {
-    icon-image: "misc/entrance-main.png";
+    icon-image: "presets/misc/entrance-main.png";
     set icon_z17;
 }
 node[entrance=service] {
-    icon-image: "misc/entrance-service.png";
+    icon-image: "presets/misc/entrance-service.png";
     set icon_z17;
 }
 node[entrance=exit] {
-    icon-image: "misc/entrance-exit.png";
+    icon-image: "presets/misc/entrance-exit.png";
     set icon_z17;
 }
 node[entrance=emergency] {
-    icon-image: "misc/entrance-emergency.png";
+    icon-image: "presets/misc/entrance-emergency.png";
     set icon_z17;
 }
 node[building=entrance],
 node[building:part] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -361,5 +361,5 @@
 }
 node[barrier=gate] {
-    icon-image: "vehicle/gate.png";
+    icon-image: "presets/vehicle/gate.png";
     set icon_z17;
 }
@@ -390,37 +390,37 @@
 node[barrier=retaining_wall],
 node[barrier=ditch] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[barrier=kerb] {
-    icon-image: "vehicle/kerb.svg";
+    icon-image: "presets/vehicle/kerb.svg";
     set icon_z17;
 }
 node[barrier=block] {
-    icon-image: "vehicle/block.svg";
+    icon-image: "presets/vehicle/block.svg";
     set icon_z17;
 }
 node[barrier=chain] {
-    icon-image: "vehicle/chain.svg";
+    icon-image: "presets/vehicle/chain.svg";
     set icon_z17;
 }
 node[barrier=stile] {
-    icon-image: "vehicle/stile.svg";
+    icon-image: "presets/vehicle/stile.svg";
     set icon_z17;
 }
 node[barrier=turnstile] {
-    icon-image: "vehicle/turnstile.png";
+    icon-image: "presets/vehicle/turnstile.png";
     set icon_z17;
 }
 node[barrier=cycle_barrier] {
-    icon-image: "vehicle/cycle_barrier.png";
+    icon-image: "presets/vehicle/cycle_barrier.png";
     set icon_z17;
 }
 node[barrier=lift_gate] {
-    icon-image: "vehicle/lift_gate.png";
+    icon-image: "presets/vehicle/lift_gate.png";
     set icon_z17;
 }
 node[barrier=swing_gate] {
-    icon-image: "vehicle/swing_gate.png";
+    icon-image: "presets/vehicle/swing_gate.png";
     set icon_z17;
 }
@@ -429,25 +429,25 @@
 }
 node[barrier=toll_booth] {
-    icon-image: "vehicle/toll_booth.png";
+    icon-image: "presets/vehicle/toll_booth.png";
     set icon_z17;
 }
 node[barrier=entrance] {
-    icon-image: "vehicle/entrance.png";
+    icon-image: "presets/vehicle/entrance.png";
     set icon_z17;
 }
 node[barrier=cattle_grid] {
-    icon-image: "vehicle/cattle_grid.png";
+    icon-image: "presets/vehicle/cattle_grid.png";
     set icon_z17;
 }
 node[barrier=border_control] {
-    icon-image: "vehicle/border_control.png";
+    icon-image: "presets/vehicle/border_control.png";
     set icon_z17;
 }
 node[barrier=sally_port] {
-    icon-image: "vehicle/sally_port.png";
+    icon-image: "presets/vehicle/sally_port.png";
     set icon_z17;
 }
 node[barrier=spikes] {
-    icon-image: "vehicle/spikes.svg";
+    icon-image: "presets/vehicle/spikes.svg";
     set icon_z17;
 }
@@ -457,5 +457,5 @@
 node[barrier=jersey_barrier][!is_prop_set(icon-image)],
 node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
@@ -637,93 +637,93 @@
 }
 node[junction=yes] {
-    icon-image: "vehicle/junction.svg";
+    icon-image: "presets/vehicle/junction.svg";
     set icon_z17;
 }
 node[highway=traffic_mirror] {
-    icon-image: "vehicle/traffic_mirror.svg";
+    icon-image: "presets/vehicle/traffic_mirror.svg";
     set icon_z17;
 }
 node[highway=milestone] {
-    icon-image: "vehicle/milestone.svg";
+    icon-image: "presets/vehicle/milestone.svg";
     set icon_z17;
 }
 node[direction=clockwise] {
-    icon-image: "vehicle/restriction/roundabout_left.svg";
+    icon-image: "presets/vehicle/restriction/roundabout_left.svg";
     set icon_z17;
 }
 node[highway=mini_roundabout] {
-    icon-image: "vehicle/restriction/mini_roundabout_left.svg";
+    icon-image: "presets/vehicle/restriction/mini_roundabout_left.svg";
     set icon_z17;
 }
 node:righthandtraffic[highway=mini_roundabout] {
-    icon-image: "vehicle/restriction/mini_roundabout_right.svg";
+    icon-image: "presets/vehicle/restriction/mini_roundabout_right.svg";
     set icon_z17;
 }
 node[highway=stop] {
-    icon-image: "vehicle/restriction/stop.svg";
+    icon-image: "presets/vehicle/restriction/stop.svg";
     set icon_z17;
 }
 node[highway=give_way] {
-    icon-image: "vehicle/restriction/give_way.svg";
+    icon-image: "presets/vehicle/restriction/give_way.svg";
     set icon_z17;
 }
 node[highway=traffic_signals] {
-    icon-image: "vehicle/traffic_signals.svg";
+    icon-image: "presets/vehicle/traffic_signals.svg";
     set icon_z17;
 }
 node[highway=traffic_signals][crossing][crossing!=no] {
-    icon-image: "vehicle/traffic_signals_crossing.svg";
+    icon-image: "presets/vehicle/traffic_signals_crossing.svg";
     set icon_z17;
 }
 node[highway=traffic_signals][crossing_ref=zebra] {
-    icon-image: "vehicle/traffic_signals_crossing_ref_zebra.svg";
+    icon-image: "presets/vehicle/traffic_signals_crossing_ref_zebra.svg";
     set icon_z17;
 }
 node[highway=traffic_signals][crossing=island] {
-    icon-image: "vehicle/traffic_signals_crossing_island.svg";
+    icon-image: "presets/vehicle/traffic_signals_crossing_island.svg";
     set icon_z17;
 }
 node[highway=traffic_signals][crossing=traffic_signals] {
-    icon-image: "vehicle/traffic_signals_crossing_traffic_signals.svg";
+    icon-image: "presets/vehicle/traffic_signals_crossing_traffic_signals.svg";
     set icon_z17;
 }
 node[highway=street_lamp] {
-    icon-image: "misc/streetlamp.png";
+    icon-image: "presets/misc/streetlamp.png";
     set icon_z17;
 }
 node[highway=speed_camera] {
-    icon-image: "vehicle/restriction/speed_camera.svg";
+    icon-image: "presets/vehicle/restriction/speed_camera.svg";
     set icon_z17;
 }
 relation[type=enforcement] >[role="device"] node {
-    icon-image: "vehicle/restriction/speed_camera.svg";
+    icon-image: "presets/vehicle/restriction/speed_camera.svg";
     set icon_z17;
 }
 node[traffic_sign=city_limit] {
-    icon-image: "vehicle/restriction/city_limit.svg";
+    icon-image: "presets/vehicle/restriction/city_limit.svg";
     set icon_z17;
 }
 node[highway=crossing][crossing!=no] {
-    icon-image: "vehicle/crossing.svg";
+    icon-image: "presets/vehicle/crossing.svg";
     set icon_z17;
 }
 node[highway=crossing][crossing=unmarked] {
-    icon-image: "vehicle/crossing_unmarked.svg";
+    icon-image: "presets/vehicle/crossing_unmarked.svg";
     set icon_z17;
 }
 node[highway=crossing][crossing=island] {
-    icon-image: "vehicle/crossing_island.svg";
+    icon-image: "presets/vehicle/crossing_island.svg";
     set icon_z17;
 }
 node[highway=crossing][crossing_ref=zebra] {
-    icon-image: "vehicle/crossing_ref_zebra.svg";
+    icon-image: "presets/vehicle/crossing_ref_zebra.svg";
     set icon_z17;
 }
 node[highway=crossing][crossing=traffic_signals] {
-    icon-image: "vehicle/crossing_traffic_signals.svg";
+    icon-image: "presets/vehicle/crossing_traffic_signals.svg";
     set icon_z17;
 }
 node[highway=motorway_junction] {
-    icon-image: "vehicle/motorway_junction.svg";
+    icon-image: "presets/vehicle/motorway_junction.svg";
     set icon_z17;
     text: eval(cond(has_tag_key(ref), concat(tag(name), " (", tag(ref), ")"), tag(name)));
@@ -733,5 +733,5 @@
 }
 node[highway=services] {
-    icon-image: "vehicle/services.svg";
+    icon-image: "presets/vehicle/services.svg";
     set icon_z17;
 }
@@ -740,9 +740,9 @@
 }
 node[highway=rest_area] {
-    icon-image: "vehicle/rest_area.svg";
+    icon-image: "presets/vehicle/rest_area.svg";
     set icon_z17;
 }
 node[highway=ford], node[ford?] {
-    icon-image: "misc/ford.svg";
+    icon-image: "presets/misc/ford.svg";
     set icon_z17;
 }
@@ -761,13 +761,13 @@
 }
 node[highway=turning_circle] {
-    icon-image: "vehicle/turning_circle.svg";
+    icon-image: "presets/vehicle/turning_circle.svg";
     set icon_z17;
 }
 node[highway=turning_loop] {
-    icon-image: "vehicle/turning_loop.svg";
+    icon-image: "presets/vehicle/turning_loop.svg";
     set icon_z17;
 }
 node[highway=passing_place] {
-    icon-image: "vehicle/passing_place.svg";
+    icon-image: "presets/vehicle/passing_place.svg";
     set icon_z17;
 }
@@ -776,5 +776,5 @@
 }
 node[highway=elevator] {
-    icon-image: "service/elevator.svg";
+    icon-image: "presets/service/elevator.svg";
     set icon_z17;
 }
@@ -785,5 +785,5 @@
 }
 node[highway=construction] {
-    icon-image: "misc/construction.png";
+    icon-image: "presets/misc/construction.png";
     set icon_z17;
 }
@@ -792,5 +792,5 @@
 }
 node[highway=emergency_access_point] {
-    icon-image: "service/emergency_access_point.svg";
+    icon-image: "presets/service/emergency_access_point.svg";
     set icon_z17;
 }
@@ -814,5 +814,5 @@
 node[highway=bus_guideway],
 node[highway=platform] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -823,37 +823,37 @@
 
 node[traffic_calming] {
-    icon-image: "vehicle/traffic_calming.svg";
+    icon-image: "presets/vehicle/traffic_calming.svg";
     set icon_z17;
 }
 node[traffic_calming=chicane] {
-    icon-image: "vehicle/chicane.svg";
+    icon-image: "presets/vehicle/chicane.svg";
     set icon_z17;
 }
 node[traffic_calming=choker] {
-    icon-image: "vehicle/choker.svg";
+    icon-image: "presets/vehicle/choker.svg";
     set icon_z17;
 }
 node[traffic_calming=island] {
-    icon-image: "vehicle/island.svg";
+    icon-image: "presets/vehicle/island.svg";
     set icon_z17;
 }
 node[traffic_calming=bump] {
-    icon-image: "vehicle/bump.svg";
+    icon-image: "presets/vehicle/bump.svg";
     set icon_z17;
 }
 node[traffic_calming=hump] {
-    icon-image: "vehicle/hump.svg";
+    icon-image: "presets/vehicle/hump.svg";
     set icon_z17;
 }
 node[traffic_calming=table] {
-    icon-image: "vehicle/table.svg";
+    icon-image: "presets/vehicle/table.svg";
     set icon_z17;
 }
 node[traffic_calming=cushion] {
-    icon-image: "vehicle/cushion.svg";
+    icon-image: "presets/vehicle/cushion.svg";
     set icon_z17;
 }
 node[traffic_calming=rumble_strip] {
-    icon-image: "vehicle/rumble_strip.svg";
+    icon-image: "presets/vehicle/rumble_strip.svg";
     set icon_z17;
 }
@@ -863,9 +863,9 @@
 
 node[junction=roundabout] {
-    icon-image: "vehicle/restriction/roundabout_left.svg";
+    icon-image: "presets/vehicle/restriction/roundabout_left.svg";
     set icon_z17;
 }
 node:righthandtraffic[junction=roundabout] {
-    icon-image: "vehicle/restriction/roundabout_right.svg";
+    icon-image: "presets/vehicle/restriction/roundabout_right.svg";
     set icon_z17;
 }
@@ -1025,5 +1025,5 @@
 node[cycleway=track], node[cycleway=opposite_track],
 node[cycleway=opposite] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -1119,5 +1119,5 @@
 node[piste:type=sleigh],
 node[piste:type=snow_park] {
-    icon-image: "sport/skiing.png";
+    icon-image: "presets/sport/skiing.png";
     set icon_z17;
 }
@@ -1128,21 +1128,21 @@
 
 node[power=portal] {
-    icon-image: "power/portal.svg";
+    icon-image: "presets/power/portal.svg";
     set icon_z17;
 }
 node[power=tower] {
-    icon-image: "power/tower.svg";
+    icon-image: "presets/power/tower.svg";
     set icon_z17;
 }
 node[power=pole] {
-    icon-image: "power/pole.svg";
+    icon-image: "presets/power/pole.svg";
     set icon_z17;
 }
 node[power=pole][transformer=distribution] {
-    icon-image: "power/pole_transformer.svg";
+    icon-image: "presets/power/pole_transformer.svg";
     set icon_z17;
 }
 node[power=insulator] {
-    icon-image: "power/insulator.svg";
+    icon-image: "presets/power/insulator.svg";
     set icon_z17;
 }
@@ -1163,5 +1163,5 @@
 node[power=cable],
 node[power=minor_line] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -1174,34 +1174,34 @@
 }
 node[man_made=street_cabinet][street_cabinet=power] {
-    icon-image: "power/cable_distribution_cabinet.svg";
+    icon-image: "presets/power/cable_distribution_cabinet.svg";
     set icon_z17;
 }
 node[power=generator] {
-    icon-image: "power/generator.svg";
+    icon-image: "presets/power/generator.svg";
     set icon_z17;
 }
 node[power=substation] {
-    icon-image: "power/substation.svg";
+    icon-image: "presets/power/substation.svg";
     set icon_z17;
 }
 node[power=transformer] {
-    icon-image: "power/transformer.svg";
+    icon-image: "presets/power/transformer.svg";
     set icon_z17;
 }
 
 node[power=switchgear] {
-    icon-image: "power/switchgear.svg";
+    icon-image: "presets/power/switchgear.svg";
     set icon_z17;
 }
 node[power=switch] {
-    icon-image: "power/switch.svg";
+    icon-image: "presets/power/switch.svg";
     set icon_z17;
 }
 node[power=converter] {
-    icon-image: "power/converter.svg";
+    icon-image: "presets/power/converter.svg";
     set icon_z17;
 }
 node[power=compensator] {
-    icon-image: "power/compensator.svg";
+    icon-image: "presets/power/compensator.svg";
     set icon_z17;
 }
@@ -1279,5 +1279,5 @@
 }
 node[power_source] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -1300,21 +1300,21 @@
 }
 node[man_made=beacon] {
-    icon-image: "misc/landmark/beacon.png";
+    icon-image: "presets/misc/landmark/beacon.png";
     set icon_z17;
 }
 node[man_made=bridge] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[bridge:support] {
-    icon-image: "transport/bridge/bridge_support.svg";
+    icon-image: "presets/transport/bridge/bridge_support.svg";
     set icon_z17;
 }
 node[man_made=chimney] {
-    icon-image: "misc/landmark/chimney.png";
+    icon-image: "presets/misc/landmark/chimney.png";
     set icon_z17;
 }
 node[man_made=flagpole] {
-    icon-image: "misc/flag.png";
+    icon-image: "presets/misc/flag.png";
     set icon_z17;
 }
@@ -1335,5 +1335,5 @@
 }
 node[man_made=bunker_silo] {
-    icon-image: "bunker_silo.svg";
+    icon-image: "presets/bunker_silo.svg";
     set icon_z17;
 }
@@ -1353,13 +1353,13 @@
 }
 node[man_made=lighthouse] {
-    icon-image: "misc/landmark/lighthouse.png";
+    icon-image: "presets/misc/landmark/lighthouse.png";
     set icon_z17;
 }
 node[man_made=monitoring_station] {
-    icon-image: "misc/landmark/measurement_station.png";
+    icon-image: "presets/misc/landmark/measurement_station.png";
     set icon_z17;
 }
 node[man_made=mineshaft] {
-    icon-image: "misc/landmark/mine.png";
+    icon-image: "presets/misc/landmark/mine.png";
     set icon_z17;
 }
@@ -1372,9 +1372,9 @@
 }
 node[man_made=crane] {
-    icon-image: "misc/landmark/crane.png";
+    icon-image: "presets/misc/landmark/crane.png";
     set icon_z17;
 }
 node[man_made=adit] {
-    icon-image: "misc/landmark/adit.png";
+    icon-image: "presets/misc/landmark/adit.png";
     set icon_z17;
 }
@@ -1387,5 +1387,5 @@
 }
 node[man_made=pier] {
-    icon-image: "nautical/pier.svg";
+    icon-image: "presets/nautical/pier.svg";
     set icon_z17;
 }
@@ -1410,9 +1410,9 @@
 }
 node[pipeline=marker] {
-    icon-image: "misc/pipeline_marker.svg";
+    icon-image: "presets/misc/pipeline_marker.svg";
     set icon_z17;
 }
 node[pipeline=valve] {
-    icon-image: "misc/valve.svg";
+    icon-image: "presets/misc/valve.svg";
     set icon_z17;
 }
@@ -1421,9 +1421,9 @@
 node[man_made=embankment],
 node[man_made=pipeline] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[man_made=petroleum_well][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
@@ -1441,5 +1441,5 @@
 }
 node[man_made=reservoir_covered] {
-    icon-image: "misc/landmark/reservoir_covered.png";
+    icon-image: "presets/misc/landmark/reservoir_covered.png";
     set icon_z17;
 }
@@ -1450,37 +1450,37 @@
 }
 node[man_made=survey_point] {
-    icon-image: "misc/landmark/survey_point.png";
+    icon-image: "presets/misc/landmark/survey_point.png";
     set icon_z17;
 }
 node[man_made=tower] {
-    icon-image: "misc/landmark/tower.png";
+    icon-image: "presets/misc/landmark/tower.png";
     set icon_z17;
 }
 node[man_made=wastewater_plant] {
-    icon-image: "misc/landmark/wastewater_plant.png";
+    icon-image: "presets/misc/landmark/wastewater_plant.png";
     set icon_z17;
 }
 node[man_made=watermill] {
-    icon-image: "misc/landmark/watermill.png";
+    icon-image: "presets/misc/landmark/watermill.png";
     set icon_z17;
 }
 node[man_made=water_tower] {
-    icon-image: "misc/landmark/water_tower.svg";
+    icon-image: "presets/misc/landmark/water_tower.svg";
     set icon_z17;
 }
 node[man_made=water_well] {
-    icon-image: "misc/landmark/water_well.png";
+    icon-image: "presets/misc/landmark/water_well.png";
     set icon_z17;
 }
 node[man_made=windmill] {
-    icon-image: "misc/landmark/windmill.png";
+    icon-image: "presets/misc/landmark/windmill.png";
     set icon_z17;
 }
 node[man_made=works] {
-    icon-image: "misc/landmark/works.png";
+    icon-image: "presets/misc/landmark/works.png";
     set icon_z17;
 }
 node[man_made=water_works] {
-    icon-image: "misc/landmark/water_works.png";
+    icon-image: "presets/misc/landmark/water_works.png";
     set icon_z17;
 }
@@ -1490,5 +1490,5 @@
 }
 node[man_made=cutline] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -1523,89 +1523,89 @@
 }
 node[office=accountant] {
-    icon-image: "styles/standard/office/accountant.svg";
+    icon-image: "presets/styles/standard/office/accountant.svg";
     set icon_z17;
 }
 node[office=administrative] {
-    icon-image: "styles/standard/office/administrative.svg";
+    icon-image: "presets/styles/standard/office/administrative.svg";
     set icon_z17;
 }
 node[office=advertising_agency] {
-    icon-image: "styles/standard/office/advertising_agency.svg";
+    icon-image: "presets/styles/standard/office/advertising_agency.svg";
     set icon_z17;
 }
 node[office=architect] {
-    icon-image: "styles/standard/office/architect.svg";
+    icon-image: "presets/styles/standard/office/architect.svg";
     set icon_z17;
 }
 node[office=association] {
-    icon-image: "styles/standard/office/association.svg";
+    icon-image: "presets/styles/standard/office/association.svg";
     set icon_z17;
 }
 node[office=company] {
-    icon-image: "styles/standard/office/private_company.svg";
+    icon-image: "presets/styles/standard/office/private_company.svg";
     set icon_z17;
 }
 node[office=educational_institution] {
-    icon-image: "styles/standard/office/educational_institution.svg";
+    icon-image: "presets/styles/standard/office/educational_institution.svg";
     set icon_z17;
 }
 node[office=employment_agency] {
-    icon-image: "styles/standard/office/employment_agency.svg";
+    icon-image: "presets/styles/standard/office/employment_agency.svg";
     set icon_z17;
 }
 node[office=estate_agent] {
-    icon-image: "styles/standard/office/real_state.svg";
+    icon-image: "presets/styles/standard/office/real_state.svg";
     set icon_z17;
 }
 node[office=foundation] {
-    icon-image: "styles/standard/office/foundation.svg";
+    icon-image: "presets/styles/standard/office/foundation.svg";
     set icon_z17;
 }
 node[office=insurance] {
-    icon-image: "styles/standard/office/insurance.svg";
+    icon-image: "presets/styles/standard/office/insurance.svg";
     set icon_z17;
 }
 node[office=it] {
-    icon-image: "styles/standard/office/it.svg";
+    icon-image: "presets/styles/standard/office/it.svg";
     set icon_z17;
 }
 node[office=lawyer] {
-    icon-image: "styles/standard/office/lawyer.svg";
+    icon-image: "presets/styles/standard/office/lawyer.svg";
     set icon_z17;
 }
 node[office=newspaper] {
-    icon-image: "styles/standard/office/newspaper.svg";
+    icon-image: "presets/styles/standard/office/newspaper.svg";
     set icon_z17;
 }
 node[office=ngo] {
-    icon-image: "styles/standard/office/ong.svg";
+    icon-image: "presets/styles/standard/office/ong.svg";
     set icon_z17;
 }
 node[office=notary] {
-    icon-image: "styles/standard/office/notary.svg";
+    icon-image: "presets/styles/standard/office/notary.svg";
     set icon_z17;
 }
 node[office=political_party] {
-    icon-image: "styles/standard/office/political_party.svg";
+    icon-image: "presets/styles/standard/office/political_party.svg";
     set icon_z17;
 }
 node[office=religion] {
-    icon-image: "styles/standard/office/religion.svg";
+    icon-image: "presets/styles/standard/office/religion.svg";
     set icon_z17;
 }
 node[office=research] {
-    icon-image: "styles/standard/office/research.svg";
+    icon-image: "presets/styles/standard/office/research.svg";
     set icon_z17;
 }
 node[office=tax_advisor] {
-    icon-image: "styles/standard/office/tax_advisor.svg";
+    icon-image: "presets/styles/standard/office/tax_advisor.svg";
     set icon_z17;
 }
 node[office=telecommunication] {
-    icon-image: "styles/standard/office/telecommunication.svg";
+    icon-image: "presets/styles/standard/office/telecommunication.svg";
     set icon_z17;
 }
 node[office=government] {
-    icon-image: "styles/standard/office/government.svg";
+    icon-image: "presets/styles/standard/office/government.svg";
     set icon_z17;
 }
@@ -1623,5 +1623,5 @@
 }
 node[leisure=sports_centre] {
-    icon-image: "sport/centre.png";
+    icon-image: "presets/sport/centre.png";
     set icon_z17;
 }
@@ -1632,5 +1632,5 @@
 }
 node[leisure=stadium] {
-    icon-image: "sport/stadium.png";
+    icon-image: "presets/sport/stadium.png";
     set icon_z17;
 }
@@ -1641,5 +1641,5 @@
 }
 node[leisure=water_park] {
-    icon-image: "leisure/water_park.png";
+    icon-image: "presets/leisure/water_park.png";
     set icon_z17;
 }
@@ -1652,5 +1652,5 @@
 }
 node[leisure=track] {
-    icon-image: "sport/track.png";
+    icon-image: "presets/sport/track.png";
     set icon_z17;
 }
@@ -1659,5 +1659,5 @@
 }
 node[leisure=pitch] {
-    icon-image: "sport/pitch.png";
+    icon-image: "presets/sport/pitch.png";
     set icon_z17;
 }
@@ -1666,5 +1666,5 @@
 }
 node[leisure=marina] {
-    icon-image: "nautical/marina.png";
+    icon-image: "presets/nautical/marina.png";
     set icon_z17;
 }
@@ -1674,5 +1674,5 @@
 }
 node[leisure=slipway] {
-    icon-image: "nautical/slipway.png";
+    icon-image: "presets/nautical/slipway.png";
     set icon_z17;
 }
@@ -1688,37 +1688,37 @@
 }
 node[leisure=fishing] {
-    icon-image: "sport/fishing.png";
+    icon-image: "presets/sport/fishing.png";
     set icon_z17;
 }
 node[leisure=bird_hide] {
-    icon-image: "leisure/bird_hide.svg";
+    icon-image: "presets/leisure/bird_hide.svg";
     set icon_z17;
 }
 node[leisure=nature_reserve] {
-    icon-image: "leisure/nature_reserve.png";
+    icon-image: "presets/leisure/nature_reserve.png";
     set icon_z17;
 }
 node[leisure=park] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[leisure=playground] {
-    icon-image: "leisure/playground.png";
+    icon-image: "presets/leisure/playground.png";
     set icon_z17;
 }
 node[leisure=garden] {
-    icon-image: "leisure/garden.png";
+    icon-image: "presets/leisure/garden.png";
     set icon_z17;
 }
 node[leisure=common] {
-    icon-image: "leisure/common.png";
+    icon-image: "presets/leisure/common.png";
     set icon_z17;
 }
 node[leisure=firepit] { 
-    icon-image: "leisure/firepit.svg";
+    icon-image: "presets/leisure/firepit.svg";
     set icon_z17;
 }
 node[leisure=picnic_table] {
-    icon-image: "leisure/picnic.png";
+    icon-image: "presets/leisure/picnic.png";
     set icon_z17;
 }
@@ -1727,5 +1727,5 @@
 }
 node[leisure=swimming_pool] {
-    icon-image: "sport/pool.png";
+    icon-image: "presets/sport/pool.png";
     set icon_z17;
 }
@@ -1738,9 +1738,9 @@
 }
 node[leisure=fitness_station] {
-    icon-image: "leisure/fitness_station.svg";
+    icon-image: "presets/leisure/fitness_station.svg";
     set icon_z17;
 }
 node[leisure=miniature_golf] {
-    icon-image: "sport/miniature_golf.svg";
+    icon-image: "presets/sport/miniature_golf.svg";
     set icon_z17;
 }
@@ -1751,9 +1751,9 @@
 }
 node[leisure=ice_rink] {
-    icon-image: "sport/ice_hockey.png";
+    icon-image: "presets/sport/ice_hockey.png";
     set icon_z17;
 }
 node[leisure=sauna] {
-    icon-image: "leisure/sauna.png";
+    icon-image: "presets/leisure/sauna.png";
     set icon_z17;
 }
@@ -1762,5 +1762,5 @@
 }
 node[leisure=golf_course] {
-    icon-image: "sport/golf/golf.svg";
+    icon-image: "presets/sport/golf/golf.svg";
     set icon_z17;
 }
@@ -1773,5 +1773,5 @@
 }
 node[golf=tee] {
-    icon-image: "sport/golf/tee.svg";
+    icon-image: "presets/sport/golf/tee.svg";
     set icon_z17;
 }
@@ -1782,5 +1782,5 @@
 }
 node[golf=pin] {
-    icon-image: "sport/golf/pin.svg";
+    icon-image: "presets/sport/golf/pin.svg";
     set icon_z17;
 }
@@ -1805,5 +1805,5 @@
 }
 node[golf=driving_range] {
-    icon-image: "sport/golf/driving_range.svg";
+    icon-image: "presets/sport/golf/driving_range.svg";
     set icon_z17;
 }
@@ -1814,9 +1814,9 @@
 
 node[advertising=column] {
-    icon-image: "leisure/advertising_column.svg";
+    icon-image: "presets/leisure/advertising_column.svg";
     set icon_z17;
 }
 node[advertising=billboard] {
-    icon-image: "leisure/billboard.svg";
+    icon-image: "presets/leisure/billboard.svg";
     set icon_z17;
 }
@@ -1915,131 +1915,131 @@
 }
 node[shop=supermarket] {
-    icon-image: "shop/supermarket.svg";
+    icon-image: "presets/shop/supermarket.svg";
     set icon_z17;
 }
 node[shop=convenience] {
-    icon-image: "shop/convenience.png";
+    icon-image: "presets/shop/convenience.png";
     set icon_z17;
 }
 node[shop=bakery] {
-    icon-image: "shop/groceries/bakery.png";
+    icon-image: "presets/shop/groceries/bakery.png";
     set icon_z17;
 }
 node[shop=butcher] {
-    icon-image: "shop/groceries/butcher.png";
+    icon-image: "presets/shop/groceries/butcher.png";
     set icon_z17;
 }
 node[shop=bicycle] {
-    icon-image: "sport/bicycle.png";
+    icon-image: "presets/sport/bicycle.png";
     set icon_z17;
 }
 node[shop=doityourself] {
-    icon-image: "shop/diy_store.png";
+    icon-image: "presets/shop/diy_store.png";
     set icon_z17;
 }
 node[shop=dry_cleaning],
 node[shop=laundry] {
-    icon-image: "shop/laundry.png";
+    icon-image: "presets/shop/laundry.png";
     set icon_z17;
 }
 node[shop=outdoor] {
-    icon-image: "shop/outdoor.png";
+    icon-image: "presets/shop/outdoor.png";
     set icon_z17;
 }
 node[shop=kiosk] {
-    icon-image: "shop/kiosk.png";
+    icon-image: "presets/shop/kiosk.png";
     set icon_z17;
 }
 node[shop=beverages] {
-    icon-image: "shop/beverages.png";
+    icon-image: "presets/shop/beverages.png";
     set icon_z17;
 }
 node[shop=alcohol] {
-    icon-image: "shop/alcohol.png";
+    icon-image: "presets/shop/alcohol.png";
     set icon_z17;
 }
 node[shop=books] {
-    icon-image: "shop/book.svg";
+    icon-image: "presets/shop/book.svg";
     set icon_z17;
 }
 node[shop=boutique] {
-    icon-image: "shop/boutique.png";
+    icon-image: "presets/shop/boutique.png";
     set icon_z17;
 }
 node[shop=car],
 node[shop=car_dealer] {
-    icon-image: "vehicle.png";
+    icon-image: "presets/vehicle.png";
     set icon_z17;
 }
 node[shop=car_repair] {
-    icon-image: "vehicle/repair_shop.png";
+    icon-image: "presets/vehicle/repair_shop.png";
     set icon_z17;
 }
 node[shop=tyres] {
-    icon-image: "vehicle/tyres.png";
+    icon-image: "presets/vehicle/tyres.png";
     set icon_z17;
 }
 node[shop=chemist] {
-    icon-image: "shop/chemist.png";
+    icon-image: "presets/shop/chemist.png";
     set icon_z17;
 }
 node[shop=tobacco] {
-    icon-image: "shop/tobacco.svg";
+    icon-image: "presets/shop/tobacco.svg";
     set icon_z17;
 }
 node[shop=clothes] {
-    icon-image: "shop/clothes.png";
+    icon-image: "presets/shop/clothes.png";
     set icon_z17;
 }
 node[shop=computer] {
-    icon-image: "shop/computer.png";
+    icon-image: "presets/shop/computer.png";
     set icon_z17;
 }
 node[shop=confectionery] {
-    icon-image: "shop/groceries/confectionery.png";
+    icon-image: "presets/shop/groceries/confectionery.png";
     set icon_z17;
 }
 node[shop=copyshop] {
-    icon-image: "shop/copyshop.png";
+    icon-image: "presets/shop/copyshop.png";
     set icon_z17;
 }
 node[shop=curtain] {
-    icon-image: "shop/curtain.png";
+    icon-image: "presets/shop/curtain.png";
     set icon_z17;
 }
 node[shop=cycle_repair] {
-    icon-image: "sport/bicycle.png";
+    icon-image: "presets/sport/bicycle.png";
     set icon_z17;
 }
 node[shop=department_store] {
-    icon-image: "shop/mall.png";
+    icon-image: "presets/shop/mall.png";
     set icon_z17;
 }
 node[shop=deli] {
-    icon-image: "shop/groceries/deli.png";
+    icon-image: "presets/shop/groceries/deli.png";
     set icon_z17;
 }
 node[shop=electronics] {
-    icon-image: "shop/electronics.png";
+    icon-image: "presets/shop/electronics.png";
     set icon_z17;
 }
 node[shop=erotic] {
-    icon-image: "shop/erotic.png";
+    icon-image: "presets/shop/erotic.png";
     set icon_z17;
 }
 node[shop=furniture] {
-    icon-image: "shop/furniture.png";
+    icon-image: "presets/shop/furniture.png";
     set icon_z17;
 }
 node[shop=fabric] {
-    icon-image: "shop/fabric.png";
+    icon-image: "presets/shop/fabric.png";
     set icon_z17;
 }
 node[shop=florist] {
-    icon-image: "shop/florist.png";
+    icon-image: "presets/shop/florist.png";
     set icon_z17;
 }
 node[shop=frame] {
-    icon-image: "shop/frame.png";
+    icon-image: "presets/shop/frame.png";
     set icon_z17;
 }
@@ -2049,69 +2049,69 @@
 }
 node[shop=greengrocer] {
-    icon-image: "shop/groceries/greengrocer.png";
+    icon-image: "presets/shop/groceries/greengrocer.png";
     set icon_z17;
 }
 node[shop=garden_centre] {
-    icon-image: "shop/garden_centre.png";
+    icon-image: "presets/shop/garden_centre.png";
     set icon_z17;
 }
 node[shop=hairdresser] {
-    icon-image: "shop/hairdresser.png";
+    icon-image: "presets/shop/hairdresser.png";
     set icon_z17;
 }
 node[shop=hardware] {
-    icon-image: "shop/hardware.png";
+    icon-image: "presets/shop/hardware.png";
     set icon_z17;
 }
 node[shop=hearing_aids] {
-    icon-image: "shop/hearing_aids.png";
+    icon-image: "presets/shop/hearing_aids.png";
     set icon_z17;
 }
 node[shop=hifi] {
-    icon-image: "shop/hifi.svg";
+    icon-image: "presets/shop/hifi.svg";
     set icon_z17;
 }
 node[shop=houseware] {
-    icon-image: "shop/houseware.svg";
+    icon-image: "presets/shop/houseware.svg";
     set icon_z17;
 }
 node[shop=jewelry] {
-    icon-image: "shop/jewelry.png";
+    icon-image: "presets/shop/jewelry.png";
     set icon_z17;
 }
 node[shop=kitchen] {
-    icon-image: "shop/kitchen.png";
+    icon-image: "presets/shop/kitchen.png";
     set icon_z17;
 }
 node[shop=mall] {
-    icon-image: "shop/mall.png";
+    icon-image: "presets/shop/mall.png";
     set icon_z17;
 }
 node[shop=mobile_phone] {
-    icon-image: "shop/mobile_phone.png";
+    icon-image: "presets/shop/mobile_phone.png";
     set icon_z17;
 }
 node[shop=motorcycle] {
-    icon-image: "vehicle/motorbike.png";
+    icon-image: "presets/vehicle/motorbike.png";
     set icon_z17;
 }
 node[shop=musical_instrument] {
-    icon-image: "shop/musical_instrument.png";
+    icon-image: "presets/shop/musical_instrument.png";
     set icon_z17;
 }
 node[shop=newsagent] {
-    icon-image: "shop/news.svg";
+    icon-image: "presets/shop/news.svg";
     set icon_z17;
 }
 node[shop=optician] {
-    icon-image: "shop/optician.svg";
+    icon-image: "presets/shop/optician.svg";
     set icon_z17;
 }
 node[shop=medical_supply] {
-    icon-image: "shop/medical_supply.svg";
+    icon-image: "presets/shop/medical_supply.svg";
     set icon_z17;
 }
 node[shop=paint] {
-    icon-image: "shop/paint.png";
+    icon-image: "presets/shop/paint.png";
     set icon_z17;
 }
@@ -2121,21 +2121,21 @@
 }
 node[shop=seafood] {
-    icon-image: "shop/groceries/seafood.png";
+    icon-image: "presets/shop/groceries/seafood.png";
     set icon_z17;
 }
 node[shop=shoes] {
-    icon-image: "shop/shoes.png";
+    icon-image: "presets/shop/shoes.png";
     set icon_z17;
 }
 node[shop=sports] {
-    icon-image: "sport/multi.png";
+    icon-image: "presets/sport/multi.png";
     set icon_z17;
 }
 node[shop=stationery] {
-    icon-image: "shop/stationery.png";
+    icon-image: "presets/shop/stationery.png";
     set icon_z17;
 }
 node[shop=tailor] {
-    icon-image: "shop/tailor.png";
+    icon-image: "presets/shop/tailor.png";
     set icon_z17;
 }
@@ -2146,17 +2146,17 @@
 }
 node[shop=toys] {
-    icon-image: "shop/toys.png";
+    icon-image: "presets/shop/toys.png";
     set icon_z17;
 }
 node[shop=vacuum_cleaner] {
-    icon-image: "shop/vacuum_cleaner.png";
+    icon-image: "presets/shop/vacuum_cleaner.png";
     set icon_z17;
 }
 node[shop=variety_store] {
-    icon-image: "shop/variety_store.png";
+    icon-image: "presets/shop/variety_store.png";
     set icon_z17;
 }
 node[shop=video] {
-    icon-image: "shop/video.png";
+    icon-image: "presets/shop/video.png";
     set icon_z17;
 }
@@ -2171,69 +2171,69 @@
 /* duplicate of shopping_centre? */
 node[shop=shopping_centre] {
-    icon-image: "shop/mall.png";
+    icon-image: "presets/shop/mall.png";
     set icon_z17;
 }
 node[shop=pet] {
-    icon-image: "shop/pet.svg";
+    icon-image: "presets/shop/pet.svg";
     set icon_z17;
 }
 node[shop=photo] {
-    icon-image: "shop/photo.svg";
+    icon-image: "presets/shop/photo.svg";
     set icon_z17;
 }
 node[shop=ticket] {
-    icon-image: "shop/ticket.svg";
+    icon-image: "presets/shop/ticket.svg";
     set icon_z17;
 }
 node[shop=interior_decoration] {
-    icon-image: "shop/interior_decoration.svg";
+    icon-image: "presets/shop/interior_decoration.svg";
     set icon_z17;
 }
 node[shop=car_parts] {
-    icon-image: "vehicle/car_parts.svg";
+    icon-image: "presets/vehicle/car_parts.svg";
     set icon_z17;
 }
 node[shop=video_games] {
-    icon-image: "shop/video_games.png";
+    icon-image: "presets/shop/video_games.png";
     set icon_z17;
 }
 node[shop=bed] {
-    icon-image: "shop/bed.svg";
+    icon-image: "presets/shop/bed.svg";
     set icon_z17;
 }
 node[shop=beauty] {
-    icon-image: "shop/beauty.svg";
+    icon-image: "presets/shop/beauty.svg";
     set icon_z17;
 }
 node[shop=cosmetics] {
-    icon-image: "shop/cosmetics.svg";
+    icon-image: "presets/shop/cosmetics.svg";
     set icon_z17;
 }
 node[shop=perfumery] {
-    icon-image: "shop/perfumery.svg";
+    icon-image: "presets/shop/perfumery.svg";
     set icon_z17;
 }
 node[shop=tea] {
-    icon-image: "shop/groceries/tea.svg";
+    icon-image: "presets/shop/groceries/tea.svg";
     set icon_z17;
 }
 node[shop=coffee] {
-    icon-image: "shop/groceries/coffee.svg";
+    icon-image: "presets/shop/groceries/coffee.svg";
     set icon_z17;
 }
 node[shop=antiques] {
-    icon-image: "shop/antique.svg";
+    icon-image: "presets/shop/antique.svg";
     set icon_z17;
 }
 node[shop=music] {
-    icon-image: "shop/music.svg";
+    icon-image: "presets/shop/music.svg";
     set icon_z17;
 }
 node[shop=funeral_directors] {
-    icon-image: "shop/funeral_directors.svg";
+    icon-image: "presets/shop/funeral_directors.svg";
     set icon_z17;
 }
 node[shop=wine] {
-    icon-image: "shop/wine.svg";
+    icon-image: "presets/shop/wine.svg";
     set icon_z17;
 }
@@ -2243,13 +2243,13 @@
 }
 node[shop=tattoo] {
-    icon-image: "shop/tattoo.svg";
+    icon-image: "presets/shop/tattoo.svg";
     set icon_z17;
 }
 node[shop=art] {
-    icon-image: "shop/art.svg";
+    icon-image: "presets/shop/art.svg";
     set icon_z17;
 }
 node[shop=bag] {
-    icon-image: "shop/bag.svg";
+    icon-image: "presets/shop/bag.svg";
     set icon_z17;
 }
@@ -2263,13 +2263,13 @@
 }
 node[emergency=ambulance_station] {
-    icon-image: "emergency/ambulance_station.svg";
+    icon-image: "presets/emergency/ambulance_station.svg";
     set icon_z17;
 }
 node[emergency=water_tank] {
-    icon-image: "emergency/water_tank.svg";
+    icon-image: "presets/emergency/water_tank.svg";
     set icon_z17;
 }
 node[emergency=phone] {
-    icon-image: "vehicle/emergency_phone.png";
+    icon-image: "presets/vehicle/emergency_phone.png";
     set icon_z17;
 }
@@ -2279,21 +2279,21 @@
 }
 node[emergency=fire_hydrant] {
-    icon-image: "service/fire_hydrant.png";
+    icon-image: "presets/service/fire_hydrant.png";
     set icon_z17;
 }
 node[emergency=fire_extinguisher] {
-    icon-image: "emergency/fire_extinguisher.svg";
+    icon-image: "presets/emergency/fire_extinguisher.svg";
     set icon_z17;
 }
 node[emergency=fire_hose] {
-    icon-image: "emergency/fire_hose.svg";
+    icon-image: "presets/emergency/fire_hose.svg";
     set icon_z17;
 }
 node[emergency=assembly_point] {
-    icon-image: "emergency/assembly_point.svg";
+    icon-image: "presets/emergency/assembly_point.svg";
     set icon_z17;
 }
 node[emergency=siren] {
-    icon-image: "emergency/siren.svg";
+    icon-image: "presets/emergency/siren.svg";
     set icon_z17;
 }
@@ -2318,49 +2318,49 @@
 }
 node[amenity=pub] {
-    icon-image: "food/pub.png";
+    icon-image: "presets/food/pub.png";
     set icon_z17;
 }
 node[amenity=biergarten] {
-    icon-image: "food/biergarten.png";
+    icon-image: "presets/food/biergarten.png";
     set icon_z17;
 }
 node[amenity=nightclub] {
-    icon-image: "leisure/discoball.svg";
+    icon-image: "presets/leisure/discoball.svg";
     set icon_z17;
 }
 node[amenity=stripclub] {
-    icon-image: "leisure/nightclub.png";
+    icon-image: "presets/leisure/nightclub.png";
     set icon_z17;
 }
 node[amenity=casino] {
-    icon-image: "leisure/casino.svg";
+    icon-image: "presets/leisure/casino.svg";
     set icon_z17;
 }
 node[amenity=brothel] {
-    icon-image: "leisure/stripclub.png";
+    icon-image: "presets/leisure/stripclub.png";
     set icon_z17;
 }
 node[amenity=cafe] {
-    icon-image: "food/cafe.png";
+    icon-image: "presets/food/cafe.png";
     set icon_z17;
 }
 node[amenity=restaurant] {
-    icon-image: "food/restaurant.svg";
+    icon-image: "presets/food/restaurant.svg";
     set icon_z17;
 }
 node[amenity=food_court] {
-    icon-image: "food/restaurant.png";
+    icon-image: "presets/food/restaurant.png";
     set icon_z17;
 }
 node[amenity=fast_food] {
-    icon-image: "food/fastfood.png";
+    icon-image: "presets/food/fastfood.png";
     set icon_z17;
 }
 node[amenity=bar] {
-    icon-image: "food/bar.png";
+    icon-image: "presets/food/bar.png";
     set icon_z17;
 }
 node[amenity=ice_cream] {
-    icon-image: "food/icecream.png";
+    icon-image: "presets/food/icecream.png";
     set icon_z17;
 }
@@ -2385,83 +2385,83 @@
 }
 node[amenity=parking_space] {
-    icon-image: "vehicle/parking/parking_space.svg";
+    icon-image: "presets/vehicle/parking/parking_space.svg";
     set icon_z17;
 }
 node[amenity=parking] {
-    icon-image: "vehicle/parking.png";
+    icon-image: "presets/vehicle/parking.png";
     set icon_z17;
 }
 node[amenity=parking_entrance] {
-    icon-image: "vehicle/parking.png";
+    icon-image: "presets/vehicle/parking.png";
     set icon_z17;
 }
 node[amenity=parking_entrance][parking=multi-storey],
 node[amenity=parking][parking=multi-storey] {
-    icon-image: "vehicle/parking/multi-storey.png";
+    icon-image: "presets/vehicle/parking/multi-storey.png";
     set icon_z17;
 }
 node[amenity=parking_entrance][parking=underground],
 node[amenity=parking][parking=underground] {
-    icon-image: "vehicle/parking/underground.png";
+    icon-image: "presets/vehicle/parking/underground.png";
     set icon_z17;
 }
 node[amenity=motorcycle_parking] {
-    icon-image: "vehicle/parking/motorbike.png";
+    icon-image: "presets/vehicle/parking/motorbike.png";
     set icon_z17;
 }
 node[amenity=bicycle_parking] {
-    icon-image: "vehicle/parking/bicycle.png";
+    icon-image: "presets/vehicle/parking/bicycle.png";
     set icon_z17;
 }
 node[park_ride][park_ride!=no] {
-    icon-image: "vehicle/parking/park_ride.svg";
+    icon-image: "presets/vehicle/parking/park_ride.svg";
     set icon_z17;
 }
 node[amenity=parking_space][wheelchair?] {
-    icon-image: "vehicle/parking/handicapped.png";
+    icon-image: "presets/vehicle/parking/handicapped.png";
     set icon_z17;
 }
 node[amenity=bicycle_rental] {
-    icon-image: "vehicle/rental/bicycle.png";
+    icon-image: "presets/vehicle/rental/bicycle.png";
     set icon_z17;
 }
 node[amenity=bicycle_repair_station] {
-    icon-image: "vehicle/bicycle_repair_station.svg";
+    icon-image: "presets/vehicle/bicycle_repair_station.svg";
     set icon_z17;
 }
 node[amenity=car_rental] {
-    icon-image: "vehicle/rental/car.png";
+    icon-image: "presets/vehicle/rental/car.png";
     set icon_z17;
 }
 node[amenity=car_sharing] {
-    icon-image: "vehicle/car_sharing.png";
+    icon-image: "presets/vehicle/car_sharing.png";
     set icon_z17;
 }
 node[amenity=car_wash] {
-    icon-image: "vehicle/car_wash.png";
+    icon-image: "presets/vehicle/car_wash.png";
     set icon_z17;
 }
 node[amenity=taxi] {
-    icon-image: "transport/taxi.png";
+    icon-image: "presets/transport/taxi.png";
     set icon_z17;
 }
 node[amenity=fuel] {
-    icon-image: "vehicle/fuel.png";
+    icon-image: "presets/vehicle/fuel.png";
     set icon_z17;
 }
 node[amenity=charging_station] {
-    icon-image: "vehicle/fuel/charging_station.png";
+    icon-image: "presets/vehicle/fuel/charging_station.png";
     set icon_z17;
 }
 node[amenity=grit_bin] {
-    icon-image: "misc/grit_bin.svg";
+    icon-image: "presets/misc/grit_bin.svg";
     set icon_z17;
 }
 node[amenity=telephone] {
-    icon-image: "service/telephone.png";
+    icon-image: "presets/service/telephone.png";
     set icon_z17;
 }
 node[amenity=clock] {
-    icon-image: "service/clock.svg";
+    icon-image: "presets/service/clock.svg";
     set icon_z17;
 }
@@ -2473,31 +2473,31 @@
 }
 node[amenity=toilets] {
-    icon-image: "service/toilets.png";
+    icon-image: "presets/service/toilets.png";
     set icon_z17;
 }
 node[amenity=shower] { 
-    icon-image: "service/shower.svg";
+    icon-image: "presets/service/shower.svg";
     set icon_z17;
 }
 node[amenity=recycling] {
-    icon-image: "service/recycling/recycling.svg";
+    icon-image: "presets/service/recycling/recycling.svg";
     set icon_z17;
 }
 node[amenity=recycling][recycling_type=container] {
-    icon-image: "service/recycling/recycling_container.svg";
+    icon-image: "presets/service/recycling/recycling_container.svg";
 }
 node[amenity=recycling][recycling_type=centre] {
-    icon-image: "service/recycling/recycling_centre.svg";
+    icon-image: "presets/service/recycling/recycling_centre.svg";
 }
 node[amenity=waste_basket] {
-    icon-image: "service/recycling/trash-bin.png";
+    icon-image: "presets/service/recycling/trash-bin.png";
     set icon_z17;
 }
 node[amenity=waste_disposal] {
-    icon-image: "service/recycling/waste_disposal.png";
+    icon-image: "presets/service/recycling/waste_disposal.png";
     set icon_z17;
 }
 node[amenity=sanitary_dump_station] {
-    icon-image: "service/recycling/sanitary_dump_station.svg";
+    icon-image: "presets/service/recycling/sanitary_dump_station.svg";
     set icon_z17;
 }
@@ -2512,9 +2512,9 @@
 }
 node[amenity=embassy] {
-    icon-image: "service/administration/embassy.png";
+    icon-image: "presets/service/administration/embassy.png";
     set icon_z17;
 }
 node[amenity=community_centre] {
-    icon-image: "service/community_centre.png";
+    icon-image: "presets/service/community_centre.png";
     set icon_z17;
 }
@@ -2524,13 +2524,13 @@
 }
 node[amenity=drinking_water] {
-    icon-image: "food/drinking_water.png";
+    icon-image: "presets/food/drinking_water.png";
     set icon_z17;
 }
 node[amenity=water_point] {
-    icon-image: "accommodation/camping/water.png";
+    icon-image: "presets/accommodation/camping/water.png";
     set icon_z17;
 }
 node[amenity=fountain] {
-    icon-image: "misc/fountain.png";
+    icon-image: "presets/misc/fountain.png";
     set icon_z17;
 }
@@ -2548,97 +2548,97 @@
 }
 node[amenity=place_of_worship] {
-    icon-image: "religion.png";
+    icon-image: "presets/religion.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=bahai] {
-    icon-image: "religion/bahai.png";
+    icon-image: "presets/religion/bahai.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=buddhist] {
-    icon-image: "religion/buddhism.png";
+    icon-image: "presets/religion/buddhism.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=christian] {
-    icon-image: "religion/church.png";
+    icon-image: "presets/religion/church.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=hindu] {
-    icon-image: "religion/hinduism.png";
+    icon-image: "presets/religion/hinduism.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=jain] {
-    icon-image: "religion/jainism.png";
+    icon-image: "presets/religion/jainism.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=jewish] {
-    icon-image: "religion/jewish.png";
+    icon-image: "presets/religion/jewish.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=muslim] {
-    icon-image: "religion/muslim.png";
+    icon-image: "presets/religion/muslim.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=sikh] {
-    icon-image: "religion/sikhism.png";
+    icon-image: "presets/religion/sikhism.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=shinto] {
-    icon-image: "religion/shinto.png";
+    icon-image: "presets/religion/shinto.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=taoist] {
-    icon-image: "religion/taoism.png";
+    icon-image: "presets/religion/taoism.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[amenity=grave_yard] {
-    icon-image: "rendering/landuse/cemetery.png";
+    icon-image: "presets/rendering/landuse/cemetery.png";
     set icon_z17;
 }
 node[amenity=crematorium][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[amenity=post_office] {
-    icon-image: "service/post_office.png";
+    icon-image: "presets/service/post_office.png";
     set icon_z17;
 }
 node[amenity=post_box] {
-    icon-image: "service/post_box.png";
+    icon-image: "presets/service/post_box.png";
     set icon_z17;
 }
 node[amenity=studio] {
-    icon-image: "service/studio.png";
+    icon-image: "presets/service/studio.png";
     set icon_z17;
 }
 node[amenity=school] {
-    icon-image: "education/school.png";
+    icon-image: "presets/education/school.png";
     set icon_z17;
 }
 node[amenity=university] {
-    icon-image: "education/university.png";
+    icon-image: "presets/education/university.png";
     set icon_z17;
 }
 node[amenity=college] {
-    icon-image: "education/college.png";
+    icon-image: "presets/education/college.png";
     set icon_z17;
 }
 node[amenity=kindergarten] {
-    icon-image: "education/kindergarten.png";
+    icon-image: "presets/education/kindergarten.png";
     set icon_z17;
 }
 node[amenity=driving_school] {
-    icon-image: "education/driving_school.png";
+    icon-image: "presets/education/driving_school.png";
     set icon_z17;
 }
@@ -2655,53 +2655,53 @@
 }
 node[amenity=pharmacy] {
-    icon-image: "health/pharmacy.svg";
+    icon-image: "presets/health/pharmacy.svg";
     set icon_z17;
 }
 node[amenity=hospital] {
-    icon-image: "health/hospital.svg";
+    icon-image: "presets/health/hospital.svg";
     set icon_z17;
 }
 node[amenity=clinic] {
-    icon-image: "health/clinic.svg";
+    icon-image: "presets/health/clinic.svg";
     set icon_z17;
 }
 node[amenity=nursing_home] {
-    icon-image: "social_facility/nursing_home.svg";
+    icon-image: "presets/social_facility/nursing_home.svg";
     set icon_z17;
 }
 node[amenity=social_facility][social_facility=group_home] {
-    icon-image: "social_facility/group_home.svg";
+    icon-image: "presets/social_facility/group_home.svg";
     set icon_z17;
 }
 node[amenity=social_facility][social_facility=assisted_living] {
-    icon-image: "social_facility/assisted_living.svg";
+    icon-image: "presets/social_facility/assisted_living.svg";
     set icon_z17;
 }
 node[amenity=social_facility][social_facility=outreach] {
-    icon-image: "social_facility/outreach.svg";
+    icon-image: "presets/social_facility/outreach.svg";
     set icon_z17;
 }
 node[amenity=social_facility][social_facility=shelter] {
-    icon-image: "social_facility/shelter.svg";
+    icon-image: "presets/social_facility/shelter.svg";
     set icon_z17;
 }
 node[amenity=social_facility][social_facility=food_bank] {
-    icon-image: "social_facility/food_bank.svg";
+    icon-image: "presets/social_facility/food_bank.svg";
     set icon_z17;
 }
 node[amenity=baby_hatch] {
-    icon-image: "health/baby_hatch.svg";
+    icon-image: "presets/health/baby_hatch.svg";
     set icon_z17;
 }
 node[amenity=doctors] {
-    icon-image: "health/doctors.svg";
+    icon-image: "presets/health/doctors.svg";
     set icon_z17;
 }
 node[amenity=dentist] {
-    icon-image: "health/dentist.svg";
+    icon-image: "presets/health/dentist.svg";
     set icon_z17;
 }
 node[amenity=veterinary] {
-    icon-image: "health/veterinary.svg";
+    icon-image: "presets/health/veterinary.svg";
     set icon_z17;
 }
@@ -2723,25 +2723,25 @@
 }
 node[amenity=library] {
-    icon-image: "shop/library.png";
+    icon-image: "presets/shop/library.png";
     set icon_z17;
 }
 node[amenity=police] {
-    icon-image: "service/police.png";
+    icon-image: "presets/service/police.png";
     set icon_z17;
 }
 node[amenity=ranger_station] {
-    icon-image: "service/ranger_station.svg";
+    icon-image: "presets/service/ranger_station.svg";
     set icon_z17;
 }
 node[amenity=fire_station] {
-    icon-image: "service/firebrigade.png";
+    icon-image: "presets/service/firebrigade.png";
     set icon_z17;
 }
 node[amenity=bus_station] {
-    icon-image: "transport/bus.png";
+    icon-image: "presets/transport/bus.png";
     set icon_z17;
 }
 node[amenity=ferry_terminal] {
-    icon-image: "nautical/ferry.svg";
+    icon-image: "presets/nautical/ferry.svg";
     set icon_z17;
 }
@@ -2752,29 +2752,29 @@
 }
 node[amenity=cinema] {
-    icon-image: "leisure/cinema.png";
+    icon-image: "presets/leisure/cinema.png";
     set icon_z17;
 }
 node[amenity=arts_centre] {
-    icon-image: "service/arts_centre.png";
+    icon-image: "presets/service/arts_centre.png";
     set icon_z17;
 }
 node[amenity=courthouse] {
-    icon-image: "service/administration/courthouse.svg";
+    icon-image: "presets/service/administration/courthouse.svg";
     set icon_z17;
 }
 node[amenity=prison] {
-    icon-image: "service/administration/prison.svg";
+    icon-image: "presets/service/administration/prison.svg";
     set icon_z17;
 }
 node[amenity=bank] {
-    icon-image: "money/bank.png";
+    icon-image: "presets/money/bank.png";
     set icon_z17;
 }
 node[amenity=bureau_de_change] {
-    icon-image: "money/exchange.png";
+    icon-image: "presets/money/exchange.png";
     set icon_z17;
 }
 node[amenity=atm] {
-    icon-image: "money/atm.png";
+    icon-image: "presets/money/atm.png";
     set icon_z17;
 }
@@ -2784,13 +2784,13 @@
 }
 node[amenity=bench] {
-    icon-image: "leisure/bench.png";
+    icon-image: "presets/leisure/bench.png";
     set icon_z17;
 }
 node[amenity=bbq] {
-    icon-image: "leisure/bbq.png";
+    icon-image: "presets/leisure/bbq.png";
     set icon_z17;
 }
 node[amenity=compressed_air] {
-    icon-image: "vehicle/compressed_air.svg";
+    icon-image: "presets/vehicle/compressed_air.svg";
     set icon_z17;
 }
@@ -2801,41 +2801,41 @@
 }
 node[amenity=shelter] {
-    icon-image: "accommodation/shelter.png";
+    icon-image: "presets/accommodation/shelter.png";
     set icon_z17;
 }
 node[amenity=shelter][shelter_type=public_transport] {
-    icon-image: "accommodation/shelter_public_transport_brown.png";
+    icon-image: "presets/accommodation/shelter_public_transport_brown.png";
     set icon_z17;
 }
 node[amenity=shelter][shelter_type=picnic_shelter] {
-    icon-image: "accommodation/shelter_picnic_brown.png";
+    icon-image: "presets/accommodation/shelter_picnic_brown.png";
     set icon_z17;
 }
 node[amenity=shelter][shelter_type=basic_hut] {
-    icon-image: "accommodation/basic_hut_blue.png";
+    icon-image: "presets/accommodation/basic_hut_blue.png";
     set icon_z17;
 }
 node[amenity=shelter][shelter_type=lean_to] {
-    icon-image: "accommodation/shelter_lean_to.svg";
+    icon-image: "presets/accommodation/shelter_lean_to.svg";
     set icon_z17;
 }
 node[amenity=hunting_stand] {
-    icon-image: "hunting_stand.png";
+    icon-image: "presets/hunting_stand.png";
     set icon_z17;
 }
 node[amenity=marketplace] {
-    icon-image: "place/marketplace.png";
+    icon-image: "presets/place/marketplace.png";
     set icon_z17;
 }
 node[amenity=wlan] {
-    icon-image: "wlan.png";
+    icon-image: "presets/wlan.png";
     set icon_z17;
 }
 node[amenity=vending_machine] {
-    icon-image: "transport/ticket-machine.png";
+    icon-image: "presets/transport/ticket-machine.png";
     set icon_z17;
 }
 node[vending=excrement_bags] {
-    icon-image: "service/excrement_bags.png";
+    icon-image: "presets/service/excrement_bags.png";
     set icon_z17;
 }
@@ -2872,96 +2872,96 @@
 }
 node[craft=carpenter][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=shoemaker][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=photographer][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=metal_construction][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }node[craft=electrician][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=brewery][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=plumber] {
-    icon-image: "craft/plumber.png";
+    icon-image: "presets/craft/plumber.png";
     set icon_z17;
 }
 node[craft=sawmill][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=gardener][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=winery][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=hvac][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=painter] {
-    icon-image: "craft/painter.png";
+    icon-image: "presets/craft/painter.png";
     set icon_z17;
 }
 node[craft=stonemason][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=handicraft][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=pottery] {
-    icon-image: "craft/pottery.png";
+    icon-image: "presets/craft/pottery.png";
     set icon_z17;
 }
 node[craft=key_cutter][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=caterer][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=roofer][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=beekeeper][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=blacksmith][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=locksmith][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=window_construction] {
-    icon-image: "craft/window_construction.png";
+    icon-image: "presets/craft/window_construction.png";
     set icon_z17;
 }
 node[craft=upholsterer][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[craft=tiler] {
-    icon-image: "craft/tiler.png";
+    icon-image: "presets/craft/tiler.png";
     set icon_z17;
 }
@@ -2983,37 +2983,37 @@
 }
 node[tourism=hotel] {
-    icon-image: "accommodation/hotel.svg";
+    icon-image: "presets/accommodation/hotel.svg";
     set icon_z17;
 }
 node[tourism=motel] {
-    icon-image: "accommodation/motel.svg";
+    icon-image: "presets/accommodation/motel.svg";
     set icon_z17;
 }
 node[tourism=guest_house] {
-    icon-image: "accommodation/guest_house.png";
+    icon-image: "presets/accommodation/guest_house.png";
     set icon_z17;
 }
 node[tourism=hostel] {
-    icon-image: "accommodation/hostel.svg";
+    icon-image: "presets/accommodation/hostel.svg";
     set icon_z17;
 }
 node[tourism=chalet] {
-    icon-image: "accommodation/chalet.png";
+    icon-image: "presets/accommodation/chalet.png";
     set icon_z17;
 }
 node[tourism=alpine_hut] {
-    icon-image: "accommodation/alpine_hut_blue.png";
+    icon-image: "presets/accommodation/alpine_hut_blue.png";
     set icon_z17;
 }
 node[tourism=wilderness_hut] {
-    icon-image: "accommodation/wilderness_hut_blue.png";
+    icon-image: "presets/accommodation/wilderness_hut_blue.png";
     set icon_z17;
 }
 node[tourism=camp_site] {
-    icon-image: "accommodation/camping.png";
+    icon-image: "presets/accommodation/camping.png";
     set icon_z17;
 }
 node[tourism=caravan_site] {
-    icon-image: "accommodation/camping/caravan.png";
+    icon-image: "presets/accommodation/camping/caravan.png";
     set icon_z17;
 }
@@ -3027,21 +3027,22 @@
 }
 node[tourism=picnic_site] {
-    icon-image: "leisure/picnic.png";
+    icon-image: "presets/leisure/picnic.png";
     set icon_z17;
 }
 node[tourism=viewpoint] {
-    icon-image: "sightseeing/viewpoint.png";
+    icon-image: "presets/sightseeing/viewpoint.png";
     set icon_z17;
 }
 node[tourism=theme_park] {
-    icon-image: "leisure/theme_park.png";
+    icon-image: "presets/leisure/theme_park.png";
     set icon_z17;
 }
 node[tourism=attraction] {
-    icon-image: "sightseeing.png";
+    icon-image: "presets/sightseeing.png";
+    icon-width: 16;
     set icon_z17;
 }
 node[tourism=zoo] {
-    icon-image: "leisure/zoo.png";
+    icon-image: "presets/leisure/zoo.png";
     set icon_z17;
 }
@@ -3054,9 +3055,9 @@
 }
 node[tourism=artwork] {
-    icon-image: "service/arts_centre.png";
+    icon-image: "presets/service/arts_centre.png";
     set icon_z17;
 }
 node[tourism=museum] {
-    icon-image: "sightseeing/museum.svg";
+    icon-image: "presets/sightseeing/museum.svg";
     set icon_z17;
 }
@@ -3070,9 +3071,9 @@
 }
 node[tourism=information] {
-    icon-image: "misc/information.png";
+    icon-image: "presets/misc/information.png";
     set icon_z17;
 }
 node[tourism=information][information=guidepost] {
-    icon-image: "misc/information/guidepost.png";
+    icon-image: "presets/misc/information/guidepost.png";
     set icon_z17;
 }
@@ -3081,13 +3082,13 @@
 }
 node[tourism=information][information=office] {
-    icon-image: "misc/information/informationoffice.png";
+    icon-image: "presets/misc/information/informationoffice.png";
     set icon_z17;
 }
 node[tourism=information][information=map] {
-    icon-image: "misc/information/map.png";
+    icon-image: "presets/misc/information/map.png";
     set icon_z17;
 }
 node[tourism=information][information=board] {
-    icon-image: "misc/information/board.png";
+    icon-image: "presets/misc/information/board.png";
     set icon_z17;
 }
@@ -3110,41 +3111,41 @@
 }
 node[historic=castle] {
-    icon-image: "sightseeing/castle.svg";
+    icon-image: "presets/sightseeing/castle.svg";
     set icon_z17;
 }
 node[historic=monument] {
-    icon-image: "sightseeing/monument.png";
+    icon-image: "presets/sightseeing/monument.png";
     set icon_z17;
 }
 node[historic=memorial] {
-    icon-image: "sightseeing/memorial.png";
+    icon-image: "presets/sightseeing/memorial.png";
     set icon_z17;
 }
 node[historic=archaeological_site] {
-    icon-image: "sightseeing/archaeological.png";
+    icon-image: "presets/sightseeing/archaeological.png";
     set icon_z17;
 }
 node[historic=ruins] {
-    icon-image: "sightseeing/ruins.png";
+    icon-image: "presets/sightseeing/ruins.png";
     set icon_z17;
 }
 node[historic=battlefield] {
-    icon-image: "sightseeing/battlefield.png";
+    icon-image: "presets/sightseeing/battlefield.png";
     set icon_z17;
 }
 node[geological=palaeontological_site] {
-    icon-image: "historic/palaeontological_site.png";
+    icon-image: "presets/historic/palaeontological_site.png";
     set icon_z17;
 }
 node[historic=wayside_cross] {
-    icon-image: "religion/wayside_cross.png";
+    icon-image: "presets/religion/wayside_cross.png";
     set icon_z17;
 }
 node[historic=wayside_shrine] {
-    icon-image: "religion/wayside_shrine.png";
+    icon-image: "presets/religion/wayside_shrine.png";
     set icon_z17;
 }
 node[historic=boundary_stone] {
-    icon-image: "historic/boundary_stone.png";
+    icon-image: "presets/historic/boundary_stone.png";
     set icon_z17;
 }
@@ -3244,5 +3245,5 @@
 }
 node[landuse] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -3260,21 +3261,21 @@
 }
 node[military=airfield] {
-    icon-image: "transport/airport/airfield.png";
+    icon-image: "presets/transport/airport/airfield.png";
     set icon_z17;
 }
 node[military=bunker] {
-    icon-image: "misc/landmark/bunker.png";
+    icon-image: "presets/misc/landmark/bunker.png";
     set icon_z17;
 }
 node[military=barracks][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[military=danger_area] {
-    icon-image: "misc/danger.png";
+    icon-image: "presets/misc/danger.png";
     set icon_z17;
 }
 node[military=range] {
-    icon-image: "misc/landmark/range.png";
+    icon-image: "presets/misc/landmark/range.png";
     set icon_z17;
 }
@@ -3288,5 +3289,5 @@
 }
 node[railway=station] {
-    icon-image: "transport/railway_station.png";
+    icon-image: "presets/transport/railway_station.png";
     set icon_z17;
 }
@@ -3296,17 +3297,17 @@
 }
 node[railway=tram_stop] {
-    icon-image: "transport/tram.png";
+    icon-image: "presets/transport/tram.png";
     set icon_z17;
 }
 node[railway=subway_entrance] {
-    icon-image: "transport/underground.png";
+    icon-image: "presets/transport/underground.png";
     set icon_z17;
 }
 node[railway=crossing] {
-    icon-image: "transport/railway/crossing.svg";
+    icon-image: "presets/transport/railway/crossing.svg";
     set icon_z17;
 }
 node[railway=level_crossing] {
-    icon-image: "transport/railway/level_crossing.svg";
+    icon-image: "presets/transport/railway/level_crossing.svg";
     icon-width: 16;
     set icon_z17;
@@ -3416,9 +3417,9 @@
 }
 node[railway=turntable] {
-    icon-image: "transport/railway/turntable.svg";
+    icon-image: "presets/transport/railway/turntable.svg";
     set icon_z17;
 }
 node[railway=buffer_stop] {
-    icon-image: "transport/railway/buffer_stop.svg";
+    icon-image: "presets/transport/railway/buffer_stop.svg";
     set icon_z17;
 }
@@ -3436,14 +3437,14 @@
 }
 node[railway=switch] {
-    icon-image: "transport/railway/switch.svg";
+    icon-image: "presets/transport/railway/switch.svg";
     icon-width: 16;
     set icon_z17;
 }
 node[railway=signal] {
-    icon-image: "transport/railway/signal.svg";
+    icon-image: "presets/transport/railway/signal.svg";
     set icon_z17;
 }
 node[railway=milestone] {
-    icon-image: "transport/railway/milestone.svg";
+    icon-image: "presets/transport/railway/milestone.svg";
     set icon_z17;
 }
@@ -3454,5 +3455,5 @@
 node[railway=platform], node[railway=funicular],
 node[service=yard], node[service=siding], node[service=spur] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -3493,5 +3494,5 @@
 }
 node[aeroway=aerodrome][military!=airfield] {
-    icon-image: "transport/airport.png";
+    icon-image: "presets/transport/airport.png";
     set icon_z17;
 }
@@ -3500,5 +3501,5 @@
 }
 node[aeroway=terminal] {
-    icon-image: "transport/airport/terminal.png";
+    icon-image: "presets/transport/airport/terminal.png";
     set icon_z17;
 }
@@ -3507,5 +3508,5 @@
 }
 node[aeroway=helipad] {
-    icon-image: "transport/airport/helipad.png";
+    icon-image: "presets/transport/airport/helipad.png";
     set icon_z17;
 }
@@ -3529,5 +3530,5 @@
 }
 node[aeroway=parking_position] {
-    icon-image: "transport/airport/parking_position.png";
+    icon-image: "presets/transport/airport/parking_position.png";
     set icon_z17;
 }
@@ -3539,17 +3540,17 @@
 node[aeroway=runway],
 node[aeroway=taxiway] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[aeroway=hangar] {
-    icon-image: "transport/airport/hangar.png";
+    icon-image: "presets/transport/airport/hangar.png";
     set icon_z17;
 }
 node[aeroway=gate] {
-    icon-image: "transport/airport/gate.png";
+    icon-image: "presets/transport/airport/gate.png";
     set icon_z17;
 }
 node[aeroway=windsock] {
-    icon-image: "transport/airport/windsock.png";
+    icon-image: "presets/transport/airport/windsock.png";
     set icon_z17;
 }
@@ -3598,9 +3599,9 @@
 }
 node[aerialway=station] {
-    icon-image: "transport/aerialway/station.png";
+    icon-image: "presets/transport/aerialway/station.png";
     set icon_z17;
 }
 node[aerialway=pylon] {
-    icon-image: "transport/aerialway/pylon.svg";
+    icon-image: "presets/transport/aerialway/pylon.svg";
     set icon_z17;
 }
@@ -3616,5 +3617,5 @@
 node[aerialway=rope_tow],
 node[aerialway=goods] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -3625,49 +3626,49 @@
 
 node[highway=bus_stop] {
-    icon-image: "transport/bus_small.png";
+    icon-image: "presets/transport/bus_small.png";
     set icon_z17;
 }
 node[public_transport=stop_position] {
-    icon-image: "transport/railway_small.png";
+    icon-image: "presets/transport/railway_small.png";
     set icon_z17;
 }
 node[public_transport=stop_position][share_taxi=yes] {
-    icon-image: "transport/share_taxi.svg";
+    icon-image: "presets/transport/share_taxi.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][bus=yes] {
-    icon-image: "transport/bus.svg";
+    icon-image: "presets/transport/bus.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][train=yes] {
-    icon-image: "transport/train.svg";
+    icon-image: "presets/transport/train.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][tram=yes] {
-    icon-image: "transport/railway/tram.svg";
+    icon-image: "presets/transport/railway/tram.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][subway=yes] {
-    icon-image: "transport/railway/subway.svg";
+    icon-image: "presets/transport/railway/subway.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][monorail=yes] {
-    icon-image: "transport/railway/monorail.svg";
+    icon-image: "presets/transport/railway/monorail.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][trolleybus=yes] {
-    icon-image: "transport/trolleybus.svg";
+    icon-image: "presets/transport/trolleybus.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][funicular=yes] {
-    icon-image: "transport/railway/funicular.svg";
+    icon-image: "presets/transport/railway/funicular.svg";
     set icon_z17;
 }
 node[public_transport=stop_position][aerialway=yes] {
-    icon-image: "transport/aerialway/station.png";
+    icon-image: "presets/transport/aerialway/station.png";
     set icon_z17;
 }
 node[public_transport=stop_position][ferry=yes] {
-    icon-image: "nautical/ferry.svg";
+    icon-image: "presets/nautical/ferry.svg";
     set icon_z17;
 }
@@ -3681,5 +3682,5 @@
 }
 node[public_transport=platform] {
-    icon-image: "transport/platform.svg";
+    icon-image: "presets/transport/platform.svg";
     set icon_z17;
 }
@@ -3688,5 +3689,5 @@
 }
 node[public_transport=station] {
-    icon-image: "transport/station.svg";
+    icon-image: "presets/transport/station.svg";
     set icon_z17;
 }
@@ -3710,22 +3711,22 @@
 }
 node[sport="9pin"] {
-    icon-image: "sport/10pin.png";
+    icon-image: "presets/sport/10pin.png";
     set icon_z17;
 }
 node[sport="10pin"] {
-    icon-image: "sport/10pin.png";
+    icon-image: "presets/sport/10pin.png";
     set icon_z17;
 }
 node[sport=athletics] {
-    icon-image: "sport/athletics.png";
+    icon-image: "presets/sport/athletics.png";
     set icon_z17;
 }
 node[sport=running] {
-    icon-image: "sport/running.svg";
+    icon-image: "presets/sport/running.svg";
     set icon_z17;
 }
 node[sport=soccer],
 node[sport=gaelic_games] {
-    icon-image: "sport/soccer.png";
+    icon-image: "presets/sport/soccer.png";
     set icon_z17;
 }
@@ -3735,5 +3736,5 @@
 node[sport=rugby_league],
 node[sport=rugby_union] {
-    icon-image: "sport/football.png";
+    icon-image: "presets/sport/football.png";
     set icon_z17;
 }
@@ -3750,37 +3751,37 @@
 }
 node[sport=baseball] {
-    icon-image: "sport/baseball.png";
+    icon-image: "presets/sport/baseball.png";
     set icon_z17;
 }
 node[sport=basketball] {
-    icon-image: "sport/basketball.png";
+    icon-image: "presets/sport/basketball.png";
     set icon_z17;
 }
 node[sport=boules] {
-    icon-image: "sport/boule.png";
+    icon-image: "presets/sport/boule.png";
     set icon_z17;
 }
 node[sport=bowls] {
-    icon-image: "sport/boule.png";
+    icon-image: "presets/sport/boule.png";
     set icon_z17;
 }
 node[sport=canoe] {
-    icon-image: "sport/canoe.svg";
+    icon-image: "presets/sport/canoe.svg";
     set icon_z17;
 }
 node[sport=chess] {
-    icon-image: "sport/chess.png";
+    icon-image: "presets/sport/chess.png";
     set icon_z17;
 }
 node[sport=climbing] {
-    icon-image: "sport/climbing.png";
+    icon-image: "presets/sport/climbing.png";
     set icon_z17;
 }
 node[sport=cricket] {
-    icon-image: "sport/cricket.png";
+    icon-image: "presets/sport/cricket.png";
     set icon_z17;
 }
 node[sport=croquet] {
-    icon-image: "sport/croquet.png";
+    icon-image: "presets/sport/croquet.png";
     set icon_z17;
 }
@@ -3802,9 +3803,9 @@
 }
 node[sport=cycling] {
-    icon-image: "sport/cycling.png";
+    icon-image: "presets/sport/cycling.png";
     set icon_z17;
 }
 node[sport=dog_racing] {
-    icon-image: "leisure/dog.png";
+    icon-image: "presets/leisure/dog.png";
     set icon_z17;
 }
@@ -3815,5 +3816,5 @@
 }
 node[sport=golf] {
-    icon-image: "sport/golf.svg";
+    icon-image: "presets/sport/golf.svg";
     set icon_z17;
 }
@@ -3823,25 +3824,25 @@
 }
 node[sport=field_hockey] {
-    icon-image: "sport/field_hockey.png";
+    icon-image: "presets/sport/field_hockey.png";
     set icon_z17;
 }
 node[sport=ice_hockey] {
-    icon-image: "sport/ice_hockey.png";
+    icon-image: "presets/sport/ice_hockey.png";
     set icon_z17;
 }
 node[sport=horse_racing] {
-    icon-image: "sport/riding.png";
+    icon-image: "presets/sport/riding.png";
     set icon_z17;
 }
 node[sport=karting] {
-    icon-image: "sport/karting.png";
+    icon-image: "presets/sport/karting.png";
     set icon_z17;
 }
 node[sport=motocross] {
-    icon-image: "sport/motocross.png";
+    icon-image: "presets/sport/motocross.png";
     set icon_z17;
 }
 node[sport=motor] {
-    icon-image: "sport/motor.png";
+    icon-image: "presets/sport/motor.png";
     set icon_z17;
 }
@@ -3855,29 +3856,29 @@
 }
 node[sport=multi] {
-    icon-image: "sport/multi.png";
+    icon-image: "presets/sport/multi.png";
     set icon_z17;
 }
 node[sport=pelota] {
-    icon-image: "sport/pelota.png";
+    icon-image: "presets/sport/pelota.png";
     set icon_z17;
 }
 node[sport=racquet] {
-    icon-image: "sport/racquetball.png";
+    icon-image: "presets/sport/racquetball.png";
     set icon_z17;
 }
 node[sport=ice_skating] {
-    icon-image: "sport/skating.png";
+    icon-image: "presets/sport/skating.png";
     set icon_z17;
 }
 node[sport=roller_skating] {
-    icon-image: "sport/roller_skating.svg";
+    icon-image: "presets/sport/roller_skating.svg";
     set icon_z17;
 }
 node[sport=skating] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[sport=skateboard] {
-    icon-image: "sport/skateboard.png";
+    icon-image: "presets/sport/skateboard.png";
     set icon_z17;
 }
@@ -3886,5 +3887,5 @@
 }
 node[sport=swimming] {
-    icon-image: "sport/pool.png";
+    icon-image: "presets/sport/pool.png";
     set icon_z17;
 }
@@ -3895,13 +3896,13 @@
 }
 node[sport=table_tennis] {
-    icon-image: "sport/table_tennis.png";
+    icon-image: "presets/sport/table_tennis.png";
     set icon_z17;
 }
 node[sport=tennis] {
-    icon-image: "sport/tennis.png";
+    icon-image: "presets/sport/tennis.png";
     set icon_z17;
 }
 node[sport=paintball][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
@@ -3920,5 +3921,5 @@
 }
 node[sport=squash][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
@@ -3929,37 +3930,37 @@
 }
 node[sport=volleyball] {
-    icon-image: "sport/volleyball.png";
+    icon-image: "presets/sport/volleyball.png";
     set icon_z17;
 }
 node[sport=beachvolleyball] {
-    icon-image: "sport/beachvolleyball.png";
+    icon-image: "presets/sport/beachvolleyball.png";
     set icon_z17;
 }
 node[sport=billiards] {
-    icon-image: "sport/billiards.svg";
+    icon-image: "presets/sport/billiards.svg";
     set icon_z17;
 }
 node[sport=bowling] {
-    icon-image: "sport/10pin.png";
+    icon-image: "presets/sport/10pin.png";
     set icon_z17;
 }
 node[sport=handball] {
-    icon-image: "sport/handball.png";
+    icon-image: "presets/sport/handball.png";
     set icon_z17;
 }
 node[sport=rowing] {
-    icon-image: "sport/rowing.png";
+    icon-image: "presets/sport/rowing.png";
     set icon_z17;
 }
 node[sport=sailing][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
 node[sport=scuba_diving] {
-    icon-image: "sport/scuba_diving.svg";
+    icon-image: "presets/sport/scuba_diving.svg";
     set icon_z17;
 }
 node[sport=badminton][!is_prop_set(icon-image)] {
-    icon-image: "misc/no_icon.png";
+    icon-image: "presets/misc/no_icon.png";
     set icon_z17;
 }
@@ -3971,17 +3972,17 @@
 }
 node[sport=archery] {
-    icon-image: "sport/archery.png";
+    icon-image: "presets/sport/archery.png";
     set icon_z17;
 }
 node[sport=fishing] {
-    icon-image: "sport/fishing.png";
+    icon-image: "presets/sport/fishing.png";
     set icon_z17;
 }
 node[sport=model_aerodrome] {
-    icon-image: "transport/airport.png";
+    icon-image: "presets/transport/airport.png";
     set icon_z17;
 }
 node[sport=rc_car] {
-    icon-image: "transport/car.png";
+    icon-image: "presets/transport/car.png";
     set icon_z17;
 }
@@ -3995,5 +3996,5 @@
 }
 node[natural=spring] {
-    icon-image: "misc/landmark/spring.svg";
+    icon-image: "presets/misc/landmark/spring.svg";
     set icon_z17;
 }
@@ -4009,5 +4010,5 @@
 }
 node[natural=peak][tourism=viewpoint] {
-    icon-image: "sightseeing/peak_viewpoint.svg";
+    icon-image: "presets/sightseeing/peak_viewpoint.svg";
     set icon_z0;
     set text_z0;
@@ -4017,5 +4018,5 @@
 }
 node[natural=volcano] {
-    icon-image: "misc/landmark/volcano_small.png";
+    icon-image: "presets/misc/landmark/volcano_small.png";
     set icon_z0;
     set text_z0;
@@ -4031,5 +4032,5 @@
 }
 node[natural=cliff] {
-    icon-image: "misc/cliff.svg";
+    icon-image: "presets/misc/cliff.svg";
     set icon_z17;
 }
@@ -4097,5 +4098,5 @@
 }
 node[natural=rock] {
-    icon-image: "misc/rock.svg";
+    icon-image: "presets/misc/rock.svg";
     set icon_z17;
 }
@@ -4104,5 +4105,5 @@
 }
 node[natural=stone] {
-    icon-image: "misc/stone.svg";
+    icon-image: "presets/misc/stone.svg";
     set icon_z17;
 }
@@ -4112,27 +4113,27 @@
 }
 node[natural=bay] {
-    icon-image: "nautical/bay.svg";
+    icon-image: "presets/nautical/bay.svg";
     set icon_z17;
 }
 node[natural=cave_entrance] {
-    icon-image: "misc/landmark/cave_entrance.png";
+    icon-image: "presets/misc/landmark/cave_entrance.png";
     set icon_z17;
 }
 node[natural=tree] {
-    icon-image: "misc/landmark/trees.png";
+    icon-image: "presets/misc/landmark/trees.png";
     set icon_z17;
 }
 node[natural=tree][type=conifer],
 node[natural=tree][leaf_type=needleleaved] {
-    icon-image: "misc/landmark/trees_conifer.png";
+    icon-image: "presets/misc/landmark/trees_conifer.png";
     set icon_z17;
 }
 node[natural=tree][type=broad_leaved],
 node[natural=tree][leaf_type=broadleaved] {
-    icon-image: "misc/landmark/trees_broad_leaved.png";
+    icon-image: "presets/misc/landmark/trees_broad_leaved.png";
     set icon_z17;
 }
 node[natural=tree][type=palm] {
-    icon-image: "misc/landmark/trees_palm.png";
+    icon-image: "presets/misc/landmark/trees_palm.png";
     set icon_z17;
 }
@@ -4155,5 +4156,5 @@
 node[natural=ridge],
 node[natural=valley] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -4196,13 +4197,13 @@
 }
 node[waterway=dock] {
-    icon-image: "nautical/boatyard.png";
+    icon-image: "presets/nautical/boatyard.png";
     set icon_z17;
 }
 node[waterway=lock_gate] {
-    icon-image: "nautical/lock_gate.png";
+    icon-image: "presets/nautical/lock_gate.png";
     set icon_z17;
 }
 node[waterway=turning_point] {
-    icon-image: "nautical/turning.png";
+    icon-image: "presets/nautical/turning.png";
     set icon_z17;
 }
@@ -4211,5 +4212,5 @@
 }
 node[waterway=boatyard] {
-    icon-image: "nautical/boatyard.png";
+    icon-image: "presets/nautical/boatyard.png";
     set icon_z17;
 }
@@ -4217,9 +4218,9 @@
 node[waterway=waste_disposal],
 node[waterway=mooring] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
 node[mooring] {
-    icon-image: "nautical/marina.png";
+    icon-image: "presets/nautical/marina.png";
     set icon_z17;
 }
@@ -4228,5 +4229,5 @@
 }
 node[waterway=fuel] {
-    icon-image: "nautical/marine_fuel.png";
+    icon-image: "presets/nautical/marine_fuel.png";
     icon-width: 16;
     set icon_z17;
@@ -4237,5 +4238,5 @@
 }
 node[waterway=weir] {
-    icon-image: "nautical/weir.svg";
+    icon-image: "presets/nautical/weir.svg";
     set icon_z17;
 }
@@ -4248,5 +4249,5 @@
 }
 node[waterway=dam] {
-    icon-image: "nautical/dam.svg";
+    icon-image: "presets/nautical/dam.svg";
     set icon_z17;
 }
@@ -4257,5 +4258,5 @@
 }
 node[waterway=waterfall] {
-    icon-image: "nautical/waterfall.svg";
+    icon-image: "presets/nautical/waterfall.svg";
     set icon_z17;
 }
@@ -4264,5 +4265,5 @@
 node[waterway=stream],
 node[waterway=ditch], node[waterway=drain] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -4285,5 +4286,5 @@
 node[route=tour],
 node[route=pub_crawl] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -4294,5 +4295,5 @@
 
 node[mountain_pass?] {
-    icon-image: "misc/landmark/mountain_pass.svg";
+    icon-image: "presets/misc/landmark/mountain_pass.svg";
     set icon_z0;
     set text_z0;
@@ -4370,5 +4371,5 @@
 node[boundary=political],
 node[boundary=national_park] {
-    icon-image: "misc/deprecated.png";
+    icon-image: "presets/misc/deprecated.png";
     set icon_z17;
 }
@@ -4378,5 +4379,5 @@
 /******************/
 node[traffic_sign][maxspeed=none][!is_prop_set(icon-image)] {
-    icon-image: "vehicle/restriction/maxspeed_none.svg";
+    icon-image: "presets/vehicle/restriction/maxspeed_none.svg";
     set icon_z17;
 }
@@ -4494,42 +4495,42 @@
 node[place=region],
 node[place=county] {
-    icon-image: "place/settlement/capital.png";
+    icon-image: "presets/place/settlement/capital.png";
     z-index: 2.9;
 }
 node[place=city] {
-    icon-image: "place/settlement/city.png";
+    icon-image: "presets/place/settlement/city.png";
     z-index: 2.8;
 }
 node[place=town] {
-    icon-image: "place/settlement/town.png";
+    icon-image: "presets/place/settlement/town.png";
     z-index: 2.7;
 }
 node[place=suburb] {
-    icon-image: "place/settlement/suburb.png";
+    icon-image: "presets/place/settlement/suburb.png";
     z-index: 2.6;
 }
 node[place=village] {
-    icon-image: "place/settlement/village.png";
+    icon-image: "presets/place/settlement/village.png";
     z-index: 2.5;
 }
 node[place=neighbourhood] {
-    icon-image: "place/settlement/neighbourhood.png";
+    icon-image: "presets/place/settlement/neighbourhood.png";
     z-index: 2.4;
 }
 node[place=hamlet] {
-    icon-image: "place/settlement/hamlet.png";
+    icon-image: "presets/place/settlement/hamlet.png";
     z-index: 2.3;
 }
 node[place=isolated_dwelling] {
-    icon-image: "place/settlement/isolated_dwelling.png";
+    icon-image: "presets/place/settlement/isolated_dwelling.png";
     z-index: 2.2;
 }
 node[place=farm] {
-    icon-image: "place/settlement/farm.png";
+    icon-image: "presets/place/settlement/farm.png";
     z-index: 2.1;
 }
 node|z15-[place=locality],
 node|z-14[place=locality][!setting("hide_icons")] {
-    icon-image: "place/locality.png";
+    icon-image: "presets/place/locality.png";
     font-weight: bold;
     text-color:black;
@@ -4538,8 +4539,8 @@
 }
 node[place=island] {
-    icon-image: "place/island.png";
+    icon-image: "presets/place/island.png";
 }
 node[place=islet] {
-    icon-image: "place/islet.png";
+    icon-image: "presets/place/islet.png";
 }
 
@@ -4553,10 +4554,10 @@
 node|z-15[FIXME][!setting("hide_icons")]::core_note_fixme {
     object-z-index: 10;
-    icon-image: "misc/fixme-annotation.png";
+    icon-image: "presets/misc/fixme-annotation.png";
 }
 node|z16-[note]::core_note_fixme,
 node|z-15[note][!setting("hide_icons")]::core_note_fixme {
     object-z-index: 10;
-    icon-image: "misc/note-annotation.png";
+    icon-image: "presets/misc/note-annotation.png";
 }
 node|z16-[note][fixme]::core_note_fixme,
@@ -4564,5 +4565,5 @@
 node|z16-[note][FIXME]::core_note_fixme,
 node|z-15[note][FIXME][!setting("hide_icons")]::core_note_fixme {
-    icon-image: "misc/note-fixme-annotation.png";
+    icon-image: "presets/misc/note-fixme-annotation.png";
 }
 
Index: /trunk/styles/standard/potlatch2.mapcss
===================================================================
--- /trunk/styles/standard/potlatch2.mapcss	(revision 10564)
+++ /trunk/styles/standard/potlatch2.mapcss	(revision 10565)
@@ -27,23 +27,23 @@
 
 relation[restriction=no_left_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
 }
 relation[restriction=no_right_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
 }
 relation[restriction=no_straight_on] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
 }
 relation[restriction=no_u_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
 }
 relation[restriction=only_left_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
 }
 relation[restriction=only_right_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
 }
 relation[restriction=only_straight_on] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
 }
 
Index: /trunk/styles_nodist/potlatch2/prelude.css
===================================================================
--- /trunk/styles_nodist/potlatch2/prelude.css	(revision 10564)
+++ /trunk/styles_nodist/potlatch2/prelude.css	(revision 10565)
@@ -26,23 +26,23 @@
 
 relation[restriction=no_left_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.png";
 }
 relation[restriction=no_right_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.png";
 }
 relation[restriction=no_straight_on] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.png";
 }
 relation[restriction=no_u_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/no_u_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.png";
 }
 relation[restriction=only_left_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_left_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.png";
 }
 relation[restriction=only_right_turn] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_right_turn.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.png";
 }
 relation[restriction=only_straight_on] {
-    icon-image: "vehicle/restriction/turn_restrictions/only_straight_on.png";
+    icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.png";
 }