Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15199)
+++ trunk/data/defaultpresets.xml	(revision 15201)
@@ -1124,5 +1124,5 @@
             </optional>
         </item> <!-- Give Way -->
-        <item name="Advanced stop line" icon="presets/transport/way/asl.svg" type="node" preset_name_label="true">
+        <item name="Advanced stop line" icon="presets/vehicle/asl.svg" type="node" preset_name_label="true">
             <link wiki="Tag:cycleway=asl" />
             <key key="cycleway" value="asl" />
@@ -1239,4 +1239,11 @@
             </optional>
         </item> <!-- Speed Camera -->
+        <item name="Toll gantry" icon="presets/vehidle/restriction/toll_gantry.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:highway=toll_gantry" />
+            <key key="highway" value="toll_gantry" />
+            <optional>
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Toll gantry -->
         <item name="Traffic Mirror" icon="presets/vehicle/traffic_mirror.svg" type="node" preset_name_label="true">
             <link wiki="Tag:highway=traffic_mirror" />
@@ -7440,5 +7447,5 @@
             <space />
             <key key="type" value="enforcement" />
-            <combo key="enforcement" text="Type of enforcement" values="maxheight,maxweight,maxspeed,mindistance,traffic_signals,check" />
+            <combo key="enforcement" text="Type of enforcement" values="check,maxheight,maxspeed,maxweight,mindistance,toll,traffic_signals" />
             <text key="maxheight" text="Max. height (meters, only if enforcement=maxheight)" />
             <text key="maxweight" text="Max. weight (tonnes, only if enforcement=maxweight)" />