Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 16800)
+++ /trunk/resources/data/defaultpresets.xml	(revision 16801)
@@ -91,25 +91,25 @@
         <reference ref="railway_electrified_yesno" />
     </chunk>
-    <chunk id="barrier_5">
-        <optional text="Allowed traffic:">
-            <check key="foot" text="Foot"/>
-            <check key="bicycle" text="Bicycle"/>
-            <check key="horse" text="Horse" />
-            <check key="motorcycle" text="Motorcycle" />
-            <check key="motorcar" text="Motorcar" />
+    <chunk id="check_access_nomotor">
+        <optional text="Non-motorized traffic:">
+            <checkgroup columns="3">
+                <check key="foot" text="Foot" icon="presets/vehicle/restriction/plain/foot.svg" />
+                <check key="bicycle" text="Bicycle" icon="presets/vehicle/restriction/plain/bicycle.svg" />
+                <check key="horse" text="Horse" icon="presets/vehicle/restriction/plain/horse.svg" />
+            </checkgroup>
+        <space />
+        <reference ref="wheelchair" />
         </optional>
     </chunk>
-    <chunk id="barrier_4">
-        <optional text="Allowed traffic:">
-            <check key="foot" text="Foot"/>
-            <check key="bicycle" text="Bicycle"/>
-            <check key="horse" text="Horse" />
-            <check key="motorcycle" text="Motorcycle" />
-        </optional>
-    </chunk>
-    <chunk id="barrier_2">
-        <optional text="Allowed traffic:">
-            <check key="foot" text="Foot"/>
-            <check key="bicycle" text="Bicycle"/>
+    <chunk id="check_access_motor">
+        <optional text="Motor vehicle traffic:">
+            <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
+            <space />
+            <checkgroup columns="2">
+                <check key="motorcar" text="Motorcar" icon="presets/vehicle/restriction/plain/motorcar.svg" />
+                <check key="motorcycle" text="Motorcycle" icon="presets/vehicle/restriction/plain/motorcycle.svg" />
+                <check key="moped" text="Moped" icon="presets/vehicle/restriction/plain/moped.svg" />
+                <check key="mofa" text="Mofa" icon="presets/vehicle/restriction/plain/mofa.svg" />
+            </checkgroup>
         </optional>
     </chunk>
@@ -219,4 +219,8 @@
     <chunk id="highway_access">
         <combo key="access" text="General Access" values="yes,destination,delivery,permissive,private,customers,agricultural,forestry,no" values_sort="false" />
+    </chunk>
+    <chunk id="highway_access_vehicle">
+        <reference ref="highway_access" />
+        <combo key="vehicle" text="All vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" />
     </chunk>
     <chunk id="POI_access">
@@ -1469,54 +1473,115 @@
             <link wiki="Tag:barrier=block" />
             <key key="barrier" value="block" />
-            <reference ref="barrier_4" />
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-                <combo key="material" text="Material" values="concrete,reinforced_concrete,stone" />
-            </optional>
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Block -->
         <item name="Bollard" icon="presets/barrier/bollard.svg" type="node,way" preset_name_label="true">
             <link wiki="Tag:barrier=bollard" />
-            <space />
             <key key="barrier" value="bollard" />
-            <combo key="bollard" text="Bollard type" values="rising,removable" />
-            <reference ref="barrier_4" />
-            <optional>
-                <text key="maxwidth" text="Max. width (meters)" length="7" />
-                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
-            </optional>
+            <space />
+            <combo key="bollard" text="Bollard type" values="rising,removable,foldable,fixed" values_searchable="true" />
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <label text="Tags which are implied and do not need to be set are:" />
+            <label text="`access=no`, `foot=yes` and `bicycle=yes`" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Bollard -->
         <item name="Cycle Barrier" icon="presets/barrier/cycle_barrier.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=cycle_barrier" />
             <key key="barrier" value="cycle_barrier" />
-            <reference ref="barrier_4" />
             <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <optional text="Non-motorized traffic:">
+                <checkgroup columns="2">
+                    <check key="foot" text="Foot" icon="presets/vehicle/restriction/plain/foot.svg" />
+                    <check key="horse" text="Horse" icon="presets/vehicle/restriction/plain/horse.svg" />
+                </checkgroup>
+                <space />
+                <reference ref="wheelchair" />
+                <combo key="bicycle" text="Bicycle" values="yes,designated,dismount,no" values_sort="false" />
+            </optional>
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Cycle Barrier -->
         <item name="Cattle Grid" icon="presets/barrier/cattle_grid.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=cattle_grid" />
             <key key="barrier" value="cattle_grid" />
-            <reference ref="barrier_4" />
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Cattle Grid -->
-        <item name="Bus Trap" type="node" preset_name_label="true">
+        <item name="Bus Trap" icon="presets/barrier/bus_trap.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=bus_trap" />
             <key key="barrier" value="bus_trap" />
             <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <label text="Tags which are implied and do not need to be set are:" />
+            <label text="`motor_vehicle=no`, `psv=yes`, `foot=yes` and `bicycle=yes`" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
         </item> <!-- Bus Trap -->
         <item name="Spikes" icon="presets/barrier/spikes.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=spikes" />
             <key key="barrier" value="spikes" />
-            <reference ref="barrier_5" />
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Spikes -->
-        <item name="Toll Booth" icon="presets/barrier/toll_station.svg" type="node,closedway" preset_name_label="true">
+        <item name="Toll Booth" icon="presets/barrier/toll_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=toll_booth" />
             <key key="barrier" value="toll_booth" />
             <optional>
-                <text key="name" text="Name" />
-                <text key="operator" text="Operator" />
-            </optional>
+                <reference ref="name_ref_operator" />
+                <reference ref="oh" />
+                <reference ref="fee_interval" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
+                <text key="maxheight" text="Max. height (meters)" length="7" />
+                <text key="maxwidth" text="Max. width (meters)" length="7" />
+            </optional>
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Payment Methods" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Toll Booth -->
-        <item name="Border Control" icon="presets/barrier/douane.svg" type="node" preset_name_label="true">
+        <item name="Border Control" icon="presets/barrier/douane.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:barrier=border_control" />
             <key key="barrier" value="border_control" />
-            <reference ref="barrier_5" />
+            <optional>
+                <reference ref="name_ref_operator" />
+                <reference ref="oh" />
+                <combo key="lanes" text="Lanes" values="1,2,3,4,5,6" length="3" />
+                <text key="maxheight" text="Max. height (meters)" length="7" />
+                <text key="maxwidth" text="Max. width (meters)" length="7" />
+            </optional>
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Border Control -->
         <separator/> <!-- *** Linear Barriers *** -->
@@ -1599,52 +1664,95 @@
             <link wiki="Tag:barrier=entrance" />
             <key key="barrier" value="entrance" />
-            <reference ref="barrier_5" />
-            <reference ref="optional_maxwidth" />
+            <reference ref="optional_maxheight_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Entrance (Barrier Opening) -->
         <item name="Gate" icon="presets/barrier/gate.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=gate" />
             <key key="barrier" value="gate" />
-            <reference ref="barrier_5" />
             <reference ref="optional_maxheight_maxwidth" />
-            <reference ref="highway_access" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Gate -->
         <item name="Lift Gate" icon="presets/barrier/lift_gate.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=lift_gate" />
             <key key="barrier" value="lift_gate" />
-            <reference ref="barrier_5" />
+            <space />
+            <combo key="lift_gate:type" text="Type" value="single,double" values_context="lift_gate" values_searchable="true" />
             <reference ref="optional_maxwidth" />
-            <reference ref="highway_access" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Lift Gate -->
         <item name="Swing Gate" icon="presets/barrier/swing_gate.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=swing_gate" />
             <key key="barrier" value="swing_gate" />
-            <combo key="swing_gate:type" text="Type" values="single,double" values_context="swing_gate" />
-            <reference ref="barrier_5" />
+            <space />
+            <combo key="swing_gate:type" text="Type" values="single,double" values_context="swing_gate" values_searchable="true" />
             <reference ref="optional_maxwidth" />
-            <reference ref="highway_access" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Swing Gate -->
         <item name="Hampshire Gate" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=hampshire_gate" />
             <key key="barrier" value="hampshire_gate" />
-            <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
+            <text key="maxlength" text="Max. length (meters)" match="key" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Hampshire Gate -->
         <item name="Bump Gate" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=bump_gate" />
             <key key="barrier" value="bump_gate" />
-            <reference ref="barrier_5" />
-            <reference ref="optional_maxwidth" />
+            <reference ref="optional_maxheight_maxwidth" />
+            <text key="maxlength" text="Max. length (meters)" match="key" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Bump Gate -->
         <item name="Kissing Gate" icon="presets/barrier/kissing_gate.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=kissing_gate" />
             <key key="barrier" value="kissing_gate" />
-            <reference ref="barrier_2" />
             <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <label text="The tag `foot=yes` is implied and does not need to be set." />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Kissing Gate -->
         <item name="Chain" icon="presets/barrier/chain.svg" type="node,way,closedway" preset_name_label="true">
             <link wiki="Tag:barrier=chain" />
             <key key="barrier" value="chain" />
-            <reference ref="barrier_5" />
             <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Chain -->
         <item name="Stile" icon="presets/barrier/stile.svg" type="node" preset_name_label="true">
@@ -1652,20 +1760,34 @@
             <space />
             <key key="barrier" value="stile" />
-            <combo key="stile" text="Type" values="ladder,squeezer,stepover" />
-            <optional>
-                <combo key="material" text="Material" values="metal,stone,wood" />
-            </optional>
-            <reference ref="barrier_2" />
+            <combo key="stile" text="Type" values="ladder,squeezer,stepover" values_searchable="true" />
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Stile -->
         <item name="Turnstile" icon="presets/barrier/turnstile.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=turnstile" />
             <key key="barrier" value="turnstile" />
-            <reference ref="barrier_2" />
+            <reference ref="optional_maxwidth" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Turnstile -->
         <item name="Sally Port" icon="presets/barrier/sally_port.svg" type="node" preset_name_label="true">
             <link wiki="Tag:barrier=sally_port" />
+            <space />
             <key key="barrier" value="sally_port" />
-            <reference ref="barrier_5" />
-            <reference ref="optional_maxheight_maxwidth" />
+            <text key="maxheight" text="Max. height (meters)" match="key" />
+            <text key="maxwidth" text="Max. width (meters)" match="key" />
+            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
+            <space />
+            <reference ref="highway_access_vehicle" />
+            <reference ref="check_access_nomotor" />
+            <reference ref="check_access_motor" />
+            <preset_link preset_name="Access Restrictions" />
         </item> <!-- Sally Port -->
     </group> <!-- Barriers -->
Index: /trunk/resources/images/presets/barrier/bus_trap.svg
===================================================================
--- /trunk/resources/images/presets/barrier/bus_trap.svg	(revision 16801)
+++ /trunk/resources/images/presets/barrier/bus_trap.svg	(revision 16801)
@@ -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.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"
+   sodipodi:docname="bus_trap.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><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><defs
+   id="defs11" /><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="987"
+   id="namedview9"
+   showgrid="false"
+   inkscape:zoom="34.014034"
+   inkscape:cx="8.6152563"
+   inkscape:cy="5.9638431"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Ebene_1" />
+<rect
+   x="5"
+   y="2"
+   width="6"
+   height="12"
+   id="rect2"
+   style="fill:#4d4d4d;fill-opacity:1" />
+<line
+   fill="none"
+   stroke="#000000"
+   stroke-width="2"
+   x1="2.002"
+   y1="0"
+   x2="2.021"
+   y2="16"
+   id="line4"
+   style="stroke:#999999;stroke-opacity:1;fill:none" />
+<line
+   fill="none"
+   stroke="#000000"
+   stroke-width="2"
+   x1="14.001"
+   y1="0"
+   x2="14.021"
+   y2="16"
+   id="line6"
+   style="stroke:#999999;stroke-opacity:1;fill:none" />
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/give_way.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/give_way.svg	(revision 16800)
+++ /trunk/resources/images/presets/vehicle/restriction/give_way.svg	(revision 16801)
@@ -15,6 +15,6 @@
    id="svg4264"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="highway__give_way2.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="give_way.svg">
   <defs
      id="defs4266">
@@ -149,6 +149,6 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="10.7423"
+     inkscape:zoom="146.19433"
+     inkscape:cx="8.5944738"
      inkscape:cy="6.8371201"
      inkscape:document-units="px"
@@ -172,5 +172,10 @@
      inkscape:snap-others="true"
      inkscape:snap-page="true"
-     inkscape:snap-grids="false">
+     inkscape:snap-grids="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -212,5 +217,5 @@
        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"
+       style="fill:none;fill-rule:evenodd;stroke:#cc0000;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"
Index: /trunk/resources/images/presets/vehicle/restriction/plain/bicycle.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/bicycle.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/bicycle.svg	(revision 16801)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="600px" width="1000px">
+
+ <circle cx="215" cy="409" r="161" style="fill:none; stroke:black; stroke-width:40px" />
+ <circle cx="790" cy="406" r="161" style="fill:none; stroke:black; stroke-width:40px" />
+ <path style="fill:black; fill-rule:evenodd; stroke:none"
+       d="M 429.48437,15.467118 C 296.91790,16.759190 319.39993,1.7711686 248.07762,230.98455 C 189.97511,414.12586 196.30387,394.15363 196.00000,407.00000 C 195.78704,416.98022 203.84333,424.89312 213.96694,425.57043 C 235.02054,423.44166 226.16492,427.84741 299.15748,201.18078 C 565.86963,482.53640 465.80592,436.91194 609.34064,442.62576 C 797.98299,440.81686 813.31557,452.44550 815.55516,424.79518 C 815.29674,415.40613 810.90371,409.80716 681.43820,121.67535 L 693.84208,87.564675 L 736.48042,86.789433 L 734.92994,51.128275 L 576.00521,51.128275 C 561.96471,70.337063 581.69033,70.250925 652.75423,86.014190 L 640.35035,120.90010 L 323.27614,121.67535 C 344.63838,47.079788 332.57905,51.731243 428.70913,51.903518 L 429.48437,15.467118 z     M 314.11415,159.91012 L 624.37752,159.36001 L 534.70921,400.30922 L 314.11415,159.91012 z     M 661.78516,174.21304 L 573.76718,405.26023 L 766.30650,405.81034 L 661.78516,174.21304 z" />
+
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/plain/foot.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/foot.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/foot.svg	(revision 16801)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="800" width="400">
+
+<circle r="56" cx="188" cy="105" style="fill:black; stroke:none"/>
+
+<path style="fill:black; stroke:none" d="M 22.000000,427.00000 C 173.66667,190.33333 159.33333,183.66667 216.00000,182.00000 C 249.00000,183.00000 250.00000,192.00000 306.00000,236.00000 C 375.00000,286.66667 370.00000,287.33333 369.00000,343.00000 C 368.66667,410.00000 373.33333,405.00000 320.00000,430.00000 L 320.00000,317.00000 L 273.00000,275.00000 L 273.00000,434.00000 L 161.00000,433.00000 L 160.00000,307.00000 C 68.000000,449.00000 74.000000,441.00000 22.000000,427.00000 z "/>
+
+<path style="fill:black; stroke:none" d="M 163.00000,450.00000 L 272.00000,450.00000 C 272.00000,475.00000 280.00000,473.00000 338.00000,582.00000 C 399.00000,694.33333 400.00000,686.66667 365.00000,751.00000 L 214.00000,480.00000 C 71.000000,756.66667 89.000000,748.33333 10.000000,743.00000 L 89.000000,595.00000 C 156.66667,472.66667 160.33333,472.33333 163.00000,450.00000 z "/>
+
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/plain/horse.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/horse.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/horse.svg	(revision 16801)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="420"
+   height="360"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     id="layer1">
+    <g
+       transform="translate(2.930158,-2.251167)"
+       id="g1892">
+      <path
+         d="M 52.413594,38.866939 L 52.913594,62.616939 L 6.4448442,115.14819 L 18.069844,127.27319 L 71.101094,116.14819 L 94.319844,156.05444 C 84.123594,180.44952 92.866694,191.61419 98.382344,208.08569 L 40.788594,244.42944 L 40.788594,324.74194 L 61.507344,313.61694 L 61.007344,259.08569 L 108.97609,232.80444 L 153.91359,334.83569 L 149.97609,355.21072 L 170.60109,355.55442 L 173.63234,335.33569 L 137.75734,231.30444 C 171.91348,240.9542 206.38281,242.73849 241.31984,231.30444 L 275.13234,291.39819 L 240.72609,355.11692 L 264.53859,355.64822 L 300.41359,289.39819 L 292.81984,238.86694 L 345.35109,280.30444 L 333.72609,350.49192 L 356.97609,344.42944 L 368.06984,272.71069 L 338.28859,221.71069 C 342.53567,195.71256 337.04829,175.97794 325.97609,162.58569 L 336.56984,153.39819 C 354.39122,147.20989 365.19314,153.71935 371.41359,168.52319 L 377.41359,205.24194 L 407.69484,189.67944 L 399.60109,160.46069 C 389.57588,134.24426 359.48885,116.39751 325.78859,140.33569 C 325.78859,140.33569 315.08625,151.23801 313.81984,151.71069 C 295.95766,139.97227 271.36688,138.29839 248.22609,146.86694 L 244.16359,146.89819 C 251.46329,143.16506 251.87072,133.73733 249.38234,126.74194 L 213.53859,64.616939 C 199.79552,48.550019 166.87985,63.298099 173.13234,86.866939 L 177.81984,95.554439 L 146.19484,110.42944 C 130.20815,82.201549 113.44726,54.451059 68.569844,54.523189 L 52.413594,38.866939 z M 187.22609,113.58569 L 198.97609,133.30444 L 171.00734,147.21069 L 170.60109,147.21069 C 165.62405,141.82773 161.30591,135.77545 157.28859,129.39819 L 187.22609,113.58569 z "
+         style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path1882" />
+      <path
+         d="M 241.42858 621.29077 A 23.392857 23.392857 0 1 1  194.64286,621.29077 A 23.392857 23.392857 0 1 1  241.42858 621.29077 z"
+         transform="translate(-40.44356,-589.0438)"
+         style="opacity:1;fill:black;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="path1884" />
+    </g>
+  </g>
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/plain/mofa.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/mofa.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/mofa.svg	(revision 16801)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="680"
+   height="390"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     id="layer1">
+    <path
+       d="M 136.75462 282.03583 A 135.85492 135.85492 0 1 1  -134.95522,282.03583 A 135.85492 135.85492 0 1 1  136.75462 282.03583 z"
+       transform="matrix(0.74724,0,0,0.74724,122.5869,48.79482)"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:39.38558578;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path15475" />
+    <path
+       d="M 648.90867,96.718727 L 435.78671,96.718727 C 427.74779,99.838733 421.99999,104.94437 426.56202,118.9852 L 481.59203,154.61156 C 505.09805,136.98259 529.46933,134.06306 553.79902,130.43653 L 649.54486,130.11844 L 648.90867,96.718727 z "
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path12814" />
+    <path
+       d="M 582.93177,285.852 L 361.08955,285.58848 C 314.75731,284.17925 288.28246,245.79634 259.51124,204.2434 C 209.17953,131.55162 201.92686,130.76936 191.60083,97.014213 L 265.47547,97.091396 C 270.39789,98.590741 275.32031,99.325646 280.24273,105.42207 L 324.71097,168.71896 C 328.41656,184.39886 325.34225,197.06215 321.45561,210.49425 C 316.96787,226.00375 334.80258,253.63393 362.62544,252.50687 L 583.4588,239.59683 L 582.93177,285.852 z "
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path13701" />
+    <path
+       d="M 108.60035,251.76407 C 110.39975,246.36586 194.33551,41.815551 194.33551,41.815551 C 204.53449,23.526361 218.83992,13.450051 237.52117,12.125404 L 295.10207,12.125404 L 294.78398,45.941389 L 239.266,45.941389 C 232.48018,45.301217 227.37783,49.579445 223.12595,61.608982 L 139.45372,265.8412 C 131.31921,284.84108 100.39972,278.15819 108.60035,251.76407 z "
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path14588" />
+    <path
+       d="M 136.75462 282.03583 A 135.85492 135.85492 0 1 1  -134.95522,282.03583 A 135.85492 135.85492 0 1 1  136.75462 282.03583 z"
+       transform="matrix(0.74724,0,0,0.74724,555.8824,49.18351)"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:39.38558578;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path17247" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/plain/moped.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/moped.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/moped.svg	(revision 16801)
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:ooo="http://xml.openoffice.org/svg/export"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.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="1192.9474"
+   height="681.87598"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="Sinnbild Kleinkraftrad.svg">
+  <metadata
+     id="metadata20">
+    <rdf: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="defs18">
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(8211)">
+      <path
+         id="path40"
+         d="m -4,459 1139,0 0,147 -1139,0 0,-147 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(8226)">
+      <path
+         id="path37"
+         d="m 346,457 c -73,0 -137,26 -191,78 -54,51 -81,114 -81,188 0,73 27,136 81,188 54,52 118,78 191,78 73,0 134,-26 185,-79 51,-51 77,-114 77,-187 0,-75 -25,-137 -76,-188 -50,-52 -112,-78 -186,-78 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(9679)">
+      <path
+         id="path34"
+         d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 c 0,181 53,324 160,431 106,107 249,161 430,161 179,0 323,-54 432,-161 108,-107 162,-251 162,-431 0,-180 -54,-324 -162,-431 C 1136,54 992,0 813,0 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(10004)">
+      <path
+         id="path31"
+         d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 c 0,78 14,145 41,201 34,71 87,106 158,106 53,0 88,-31 106,-94 l 23,-176 c 8,-64 28,-97 59,-98 l 735,706 c 11,11 33,17 66,17 42,0 63,-15 63,-46 l 0,-122 c 0,-36 -10,-64 -30,-84 L 442,47 C 390,-6 338,-33 285,-33 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(10007)">
+      <path
+         id="path28"
+         d="m 0,-2 c -7,16 -16,29 -25,39 l 381,530 c -94,256 -141,385 -141,387 0,25 13,38 40,38 9,0 21,-2 34,-5 21,4 42,12 65,25 l 27,-13 111,-251 280,301 64,-25 24,25 c 21,-10 41,-24 62,-43 C 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 c 0,-27 -21,-55 -63,-84 l 16,-20 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 c -22,-34 -53,-51 -92,-51 -42,0 -63,17 -64,51 -7,9 -10,24 -10,44 0,9 1,19 2,30 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(10132)">
+      <path
+         id="path25"
+         d="M 2015,739 1276,0 717,0 l 543,543 -1086,0 0,393 1086,0 -543,545 557,0 741,-742 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(10146)">
+      <path
+         id="path22"
+         d="M 174,0 602,739 174,1481 1456,739 174,0 z m 1184,739 -1049,607 350,-607 699,0 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(57354)">
+      <path
+         id="path19"
+         d="m 8,1128 1129,0 L 1137,0 8,0 8,1128 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="scale(4.8828125e-4,-4.8828125e-4)"
+       id="bullet-char-template(57356)">
+      <path
+         id="path16"
+         d="M 580,1141 1163,571 580,0 -4,571 580,1141 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g11"
+       ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10 id11 id12 id13 id14 id15"
+       ooo:slide="id1" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="presentation_clip_path">
+      <rect
+         id="rect7"
+         height="23690"
+         width="26568"
+         y="0"
+         x="0" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1091"
+     inkscape:window-height="939"
+     id="namedview16"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="0.3713418"
+     inkscape:cx="363.63247"
+     inkscape:cy="302.77832"
+     inkscape:window-x="56"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.7155664;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 463.09269,1.3762983 c -4.91273,0.0903 -17.9952,1.01241 -21.31241,1.73355 -13.26888,2.88454 -74.88635,16.5630197 -114.77091,37.4751697 -24.73113,12.96697 -29.45421,27.15788 -30.03111,36.9653 -0.57692,9.80744 9.81677,14.9532 16.16276,23.606822 6.34598,8.65361 5.39399,10.57588 3.08635,24.42166 -2.30762,13.84578 -3.85467,16.86323 -10.20066,18.59395 -6.86239,1.78109 -10.94013,1.54717 -15.72771,-1.86941 0.96502,-6.78518 1.59829,-12.94401 0.4079,-14.53119 -2.30919,-3.07892 -15.03621,-14.6381 -27.73672,-13.86836 -12.70052,0.76973 -19.98676,7.13813 -19.98676,7.13813 0,0 1.32712,35.79599 -0.21236,78.13106 -0.1818,4.99993 22.87479,7.85268 25.6037,4.41629 4.12603,-5.19575 8.66803,-8.73877 11.78982,-15.40132 l 16.7117,13.10692 -29.98014,74.54245 c -22.28412,-8.01887 -47.47245,-12.79764 -75.81711,-12.79764 -98.435011,0 -159.537156,78.41743 -159.537156,78.41743 0,0 2.752883,13.65138 10.044368,19.11999 1.072771,0.80457 2.043292,1.47255 3.05919,2.19243 -27.031593,33.18806 -43.2876488,75.69588 -43.2876488,122.06198 0,106.07204 84.9781478,192.01564 189.7722368,192.01564 75.97096,0 141.47386,-45.17614 171.77394,-110.43703 2.50437,1.30499 5.39787,2.65348 8.61675,3.82398 31.70149,11.41216 27.90853,8.66224 27.94067,8.20885 23.45982,-52.62572 20.52284,-136.69719 -13.3585,-197.82811 -18.77835,-33.88113 -49.4078,-70.63185 -94.22328,-93.86638 l 23.65778,-53.79089 223.62735,218.0698 c -9.47727,11.53437 -15.245,26.61707 -15.245,43.13469 0,29.76697 18.6479,54.88513 44.20541,62.9175 l -7.49504,36.14952 -31.61171,0 0,29.62323 69.34182,0 0,-29.62323 -20.24169,0 6.67924,-33.49822 c 0.29152,0.005 0.5743,0.051 0.86678,0.051 54.48119,-1.27719 111.63644,-2.19311 158.72137,-3.05919 0,0 3.48907,-3.41852 7.69898,-7.49504 l 36.35346,2.44736 c 25.81967,75.01265 96.30458,128.84321 179.21798,128.84321 94.52557,0 172.87677,-69.97384 187.32487,-161.52563 0.1599,0.0259 0.2931,0.0783 0.4589,0.10202 8.3824,1.19746 8.365,0.97533 18.4062,0.30591 10.0412,-0.66941 17.7434,-7.03615 17.7434,-7.03615 -4.0165,-4.01648 -6.4206,-8.83605 -8.3618,-11.67594 -2.4153,-3.5333 -3.5992,-10.21945 -4.079,-13.76639 10e-4,-0.0489 -9e-4,-0.10394 0,-0.15288 0.5757,-30.56826 -7.4455,-94.69929 -55.8814,-149.49279 -40.1121,-45.37726 -101.4534,-69.25371 -161.1687,-68.52603 -26.03508,0.31727 -51.75568,5.35156 -75.25625,15.29599 l -62.35665,-122.97974 2.39638,-5.14965 c 11.51486,1.97526 77.63251,10.60547 95.49795,-48.28433 8.58714,-28.305772 -10.86016,-32.580462 -10.86016,-32.580462 0,0 -13.98712,8.46797 -34.05906,15.90782 -21.74739,8.06085 -40.71122,9.574972 -65.26288,7.29109 -62.34251,-5.79929 -94.98809,-30.49 -94.98809,-30.49 l -13.00159,24.67753 c 0,0 32.68256,45.633472 87.69699,56.544172 16.35765,3.24415 12.09631,2.39215 16.16276,3.21215 L 684.52761,376.23 580.51489,374.75138 381.83955,172.54178 c -10.79383,-0.71842 -19.57725,-1.49682 -31.78421,-2.1448 -4.61527,-3.46145 -5.14965,-9.22946 -5.14965,-20.19071 0,-10.96124 11.18938,-16.63389 17.84532,-25.9522 2.88453,-4.03835 7.69365,-4.91789 5.20063,-16.16276 -1.1631,-5.24619 -10.50405,-6.7387 -16.72361,-11.522972 -7.49981,-5.76907 -12.00789,-10.1852 -9.22858,-20.1907 2.88453,-10.38434 15.00982,-17.31182 27.12489,-23.6578 12.11505,-6.34598 12.06654,-5.15335 63.98821,-17.84532 13.55445,-3.31331 22.25652,-3.50178 24.83049,-0.61183 9.86454,11.07547 34.06277,18.4732 46.75474,17.8963 12.69196,-0.57691 16.16275,-8.66861 16.16275,-19.62986 0,-10.96124 -12.11963,-23.6284997 -23.65779,-26.5130397 -8.65361,-2.1634 -19.37186,-4.91021 -34.11005,-4.63979 z M 808.57808,195.73733 860.83937,297.45565 C 788.12446,341.23389 765.88544,405.28225 759.325,445.92871 l -62.9175,-2.03947 -2.03947,0 z m -617.44806,129.608 c 18.3067,0 35.86611,3.16226 52.21031,8.97365 l -48.94717,121.75607 c -1.03307,-0.11281 -2.09811,-0.20394 -3.16117,-0.20394 -15.83986,0 -28.65448,12.81462 -28.65448,28.65448 0,15.83985 12.81462,28.70547 28.65448,28.70547 15.83985,0 28.70547,-12.86562 28.70547,-28.70547 0,-7.15146 -2.65602,-13.63806 -6.98516,-18.6611 l 53.38299,-121.19522 c 49.05694,27.02475 82.3434,79.65008 82.3434,140.16224 0,88.07787 -70.53198,159.43518 -157.54867,159.43518 -87.01671,0 -157.54869,-71.35731 -157.54869,-159.43518 0,-88.07788 70.53198,-159.48618 157.54869,-159.48618 z m 776.52631,3.67104 c 87.01677,0 157.54877,71.4083 157.54877,159.48617 0,88.07788 -70.532,159.43519 -157.54877,159.43519 -63.90286,0 -118.91265,-38.48752 -143.6293,-93.8154 l 122.41888,8.25984 11.77792,-18.61012 -142.04875,-11.31904 c -0.73296,-2.59206 -1.43467,-5.2076 -2.03946,-7.85194 L 971.93924,513.0781 c 0.81606,0.0698 1.61318,0.15288 2.44735,0.15288 15.83987,0 28.70551,-12.86561 28.70551,-28.70548 0,-15.83986 -12.86564,-28.65448 -28.70551,-28.65448 -0.13847,0 -0.26975,-10e-4 -0.40785,0 L 914.37533,338.39783 c 16.64905,-6.05902 34.57027,-9.38154 53.281,-9.38154 z m -79.43714,21.72031 51.90438,101.10648 -124.81526,-4.07893 c 10.7361,-41.25645 37.38719,-75.98754 72.91088,-97.02755 z"
+     id="path3301"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csssssccsscsscccscscsscccscccsccccccccccccsccscsccsscccscssccscccccssssssssssscccccccsccssssccsssscssccccccsssccsccccc" />
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/plain/motorcar.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/motorcar.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/motorcar.svg	(revision 16801)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="690" height="270" viewBox="0 0 690 270">
+  <path d="M169.792,212.579a52.981,52.981,0,0,1-105.963.04v-.04a52.981,52.981,0,1,1,105.963-.04Z"/>
+  <path d="M632.43,212.557a52.981,52.981,0,0,1-105.963.04v-.04a52.981,52.981,0,0,1,105.963-.04Z"/>
+  <path d="M683.969,112.851a29.131,29.131,0,0,0-2.474-7.169L554.112,4.539H297.8c-5.934-.365-9.149,2.442-11.971,5.708l-85.67,85.83L12.815,127.2a21.568,21.568,0,0,0-7.323,10.374l.394,64.452c4.063,10.33,6.83,8.992,9.905,10.431H51.857c0-87.622,130.531-87.287,130.531,0H515.222c0-87.806,129.545-87.627,129.545,0h29.565c4.968-.457,7.753-4.843,10.121-9.98ZM408.852,108.7H231.274c-6.76-2.666-7.675-6.708-4.862-11.627l63.843-63c1.439-1.223,2.572-2.908,5.074-2.537H408.852Zm183.864.011H429.946V31.55h95.506c2.5-.371,3.634,1.314,5.074,2.537l54.712,55.1C590.282,96.784,600.418,107.175,592.715,108.711Z"/>
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/plain/motorcycle.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/plain/motorcycle.svg	(revision 16801)
+++ /trunk/resources/images/presets/vehicle/restriction/plain/motorcycle.svg	(revision 16801)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="680"
+   height="500"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     id="layer1">
+    <path
+       d="M 438.12826,429.16927 C 375.32987,426.00501 282.92602,437.06422 251.92375,397.77007 C 237.71768,323.00073 197.12299,285.36345 127.4223,284.58694 C 84.626532,201.93866 162.31092,188.98722 215.41306,167.75274 C 218.78636,206.16837 216.71935,246.10015 277.48123,268.52224 C 279.92034,256.63453 284.90432,246.92813 300.84807,246.61583 L 390.66436,246.98094 L 454.19295,197.3264 C 464.45935,213.65423 484.83147,234.57558 484.86193,246.25072 L 581.25015,246.61583 C 588.2694,252.59444 594.22298,268.45864 580.15483,284.22184 C 522.41354,282.46908 417.46802,288.77717 438.12826,429.16927 z "
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path4749" />
+    <path
+       d="M 281.45311,113.13794 L 281.71128,79.094411 L 319.83363,73.920272 L 319.83363,46.902363 L 280.93677,53.36735 C 283.79727,29.02724 299.44705,11.428004 333.92156,6.3312047 C 355.56786,7.8567994 378.26787,9.030436 391.1807,49.520754 C 394.96498,65.581097 392.60623,81.830116 382.63201,95.826685 C 350.34442,78.127222 326.17913,90.209532 304.13403,110.06585 L 281.45311,113.13794 z "
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path5636" />
+    <path
+       d="M 215.04795,186.7383 L 328.59619,100.93818 C 343.85852,92.79748 360.69029,91.248459 380.80647,103.49393 C 398.00264,119.11558 427.05087,162.39207 450.17678,191.84979 L 385.55287,240.22646 L 323.48469,153.87868 L 225.27094,229.0907 C 217.71099,215.89572 215.94199,200.40941 215.04795,186.7383 z "
+       style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path6523" />
+    <path
+       d="M 241.70075 414.19989 A 83.609474 83.609474 0 1 1  74.481804,414.19989 A 83.609474 83.609474 0 1 1  241.70075 414.19989 z"
+       transform="matrix(0.974466,0,0,0.974466,-15.37667,-10.08382)"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:34.99968338;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path7410" />
+    <path
+       d="M 241.70075 414.19989 A 83.609474 83.609474 0 1 1  74.481804,414.19989 A 83.609474 83.609474 0 1 1  241.70075 414.19989 z"
+       transform="matrix(0.974466,0,0,0.974466,388.6178,-9.97323)"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:34.99968338;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path8297" />
+  </g>
+</svg>
Index: /trunk/resources/images/presets/vehicle/restriction/restrictions.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/restrictions.svg	(revision 16800)
+++ /trunk/resources/images/presets/vehicle/restriction/restrictions.svg	(revision 16801)
@@ -15,5 +15,5 @@
    id="svg4264"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="restrictions.svg">
   <defs
@@ -26,7 +26,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="0.26738697"
-     inkscape:cy="9.1870644"
+     inkscape:zoom="12.921875"
+     inkscape:cx="2.2921076"
+     inkscape:cy="-3.7340477"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -50,5 +50,10 @@
      inkscape:snap-grids="true"
      inkscape:snap-to-guides="true"
-     inkscape:snap-page="true">
+     inkscape:snap-page="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -90,5 +95,5 @@
     <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"
+       style="fill:none;stroke:#cc0000;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" />
Index: /trunk/resources/images/presets/vehicle/restriction/stop.svg
===================================================================
--- /trunk/resources/images/presets/vehicle/restriction/stop.svg	(revision 16800)
+++ /trunk/resources/images/presets/vehicle/restriction/stop.svg	(revision 16801)
@@ -15,6 +15,6 @@
    id="svg4264"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="highway__stop2.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="stop.svg">
   <defs
      id="defs4266">
@@ -149,7 +149,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="64"
-     inkscape:cx="8.3175116"
-     inkscape:cy="8.1344046"
+     inkscape:zoom="25.84375"
+     inkscape:cx="1.9172884"
+     inkscape:cy="3.6377853"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -171,5 +171,10 @@
      inkscape:snap-nodes="true"
      inkscape:snap-others="true"
-     inkscape:snap-page="true">
+     inkscape:snap-page="true"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
@@ -211,5 +216,5 @@
     <path
        id="path10312"
-       style="fill:#ee1c23;fill-rule:nonzero;stroke:none"
+       style="fill:#cc0000;fill-rule:nonzero;stroke:none;fill-opacity:1"
        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" />
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16800)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16801)
@@ -500,6 +500,9 @@
     set icon_z17;
 }
+node[barrier=bus_trap] {
+    icon-image: "presets/barrier/bus_trap.svg";
+    set icon_z17;
+}
 node[barrier=bump_gate][!is_prop_set(icon-image)],
-node[barrier=bus_trap][!is_prop_set(icon-image)],
 node[barrier=hampshire_gate][!is_prop_set(icon-image)] {
     icon-image: "presets/misc/no_icon.svg";