Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16742)
+++ trunk/resources/data/defaultpresets.xml	(revision 16743)
@@ -560,4 +560,8 @@
         <preset_link preset_name="Payment Methods" />
     </chunk>
+    <chunk id="link_road_access_restrictions">
+        <preset_link preset_name="Road Restrictions" />
+        <preset_link preset_name="Access Restrictions" />
+    </chunk>
   <!--  Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
@@ -585,5 +589,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Motorway -->
         <item name="Motorway Link" icon="presets/transport/way/way_motorway_link.svg" type="way" preset_name_label="true">
@@ -607,5 +611,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Motorway Link -->
         <item name="Trunk" icon="presets/transport/way/way_trunk.svg" type="way" preset_name_label="true">
@@ -632,5 +636,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Trunk -->
         <item name="Trunk Link" icon="presets/transport/way/way_trunk_link.svg" type="way" preset_name_label="true">
@@ -656,5 +660,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Trunk Link -->
         <separator/>
@@ -677,5 +681,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Primary -->
         <item name="Primary Link" icon="presets/transport/way/way_primary_link.svg" type="way" preset_name_label="true">
@@ -692,5 +696,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Primary Link -->
         <item name="Secondary" icon="presets/transport/way/way_secondary.svg" type="way,closedway" preset_name_label="true">
@@ -711,5 +715,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Secondary -->
         <item name="Secondary Link" icon="presets/transport/way/way_secondary_link.svg" type="way" preset_name_label="true">
@@ -724,5 +728,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Secondary Link -->
         <item name="Tertiary" icon="presets/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
@@ -743,5 +747,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Tertiary -->
         <item name="Tertiary Link" icon="presets/transport/way/way_tertiary_link.svg" type="way" preset_name_label="true">
@@ -756,5 +760,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Tertiary Link -->
         <item name="Unclassified" icon="presets/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
@@ -775,5 +779,5 @@
                 <reference ref="placement" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Unclassified -->
         <item name="Residential" icon="presets/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
@@ -799,5 +803,5 @@
                 </checkgroup>
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Residential -->
         <item name="Bicycle Road" icon="presets/transport/way/way_bicycle_road.svg" type="way,closedway" preset_name_label="true">
@@ -824,5 +828,5 @@
                 <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Bicycle Road -->
         <item name="Living Street" icon="presets/transport/way/way_living_street.svg" type="way,closedway" preset_name_label="true">
@@ -842,5 +846,5 @@
                 </checkgroup>
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Living Street -->
         <item name="Pedestrian" icon="presets/transport/way/way_pedestrian.svg" type="way,closedway,multipolygon" preset_name_label="true">
@@ -858,5 +862,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Pedestrian -->
         <item name="Service" icon="presets/transport/way/way_service.svg" type="way,closedway" preset_name_label="true">
@@ -872,5 +876,5 @@
                 <check key="passing_places" text="Passing Places" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Service -->
         <item name="Parking Aisle" icon="presets/transport/way/way_service_parking_aisle.svg" type="way,closedway" preset_name_label="true">
@@ -883,5 +887,5 @@
                 <check key="lit" text="Lit" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Parking Aisle -->
         <item name="Escape" icon="presets/transport/way/way_escape.svg" type="way" preset_name_label="true">
@@ -912,5 +916,5 @@
                 <check key="trolley_wire" text="Overhead trolley wires" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Road (Unknown Type) -->
         <item name="Construction" icon="presets/transport/way/way_construction.svg" type="way,closedway" preset_name_label="true">
@@ -926,11 +930,9 @@
                 <combo key="junction" text="Junction" values="roundabout,jughandle" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Construction -->
         <separator/>
-        <item name="Road Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
+        <item name="Road Restrictions" icon="presets/vehicle/restriction/maxspeed.svg" type="node,way,closedway" preset_name_label="true">
             <link wiki="Key:access" />
-            <space />
-            <label text="Some road types already imply some access restrictions which should not be set again." />
             <space />
             <checkgroup columns="3" >
@@ -941,4 +943,25 @@
                 <check key="ice_road" text="Ice road" disable_off="true" />
             </checkgroup>
+            <text key="maxspeed" text="Max. speed (km/h)" />
+            <text key="maxspeed:forward" text="Max. speed in way direction" />
+            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
+            <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
+            <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
+            <text key="minspeed" text="Min. speed (km/h)" match="key" />
+            <space />
+            <text key="maxweight" text="Max. weight (tonnes)" match="key" />
+            <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
+            <space />
+            <text key="maxheight" text="Max. height (meters)" match="key" />
+            <text key="maxwidth" text="Max. width (meters)" match="key" />
+            <text key="maxlength" text="Max. length (meters)" match="key" />
+            <space />
+            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
+            <preset_link preset_name="Access Restrictions" />
+        </item> <!-- Road Restrictions -->
+        <item name="Access Restrictions" icon="presets/vehicle/restriction/restrictions.svg" type="node,way,closedway" preset_name_label="true">
+            <link wiki="Key:access" />
+            <space />
+            <label text="Some road types already imply some access restrictions which should not be set again." />
             <space />
             <label text="Transport mode restrictions" />
@@ -976,18 +999,6 @@
             <combo key="tourist_bus" text="Tourist buses" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
             <combo key="hazmat" text="Hazmat" values="yes,official,designated,destination,permissive,private,no" values_sort="false" match="key" />
-            <space />
-            <text key="maxspeed" text="Max. speed (km/h)" />
-            <text key="maxspeed:forward" text="Max. speed in way direction" />
-            <text key="maxspeed:backward" text="Max. speed opposed to way direction" />
-            <text key="maxspeed:hgv" text="Max. speed Heavy Goods Vehicles (km/h)" match="key" />
-            <text key="maxspeed:advisory" text="Signposted advisory max. speed (km/h)" />
-            <text key="minspeed" text="Min. speed (km/h)" match="key" />
-            <text key="maxweight" text="Max. weight (tonnes)" match="key" />
-            <text key="maxaxleload" text="Max. axleload (tonnes)" match="key" />
-            <text key="maxheight" text="Max. height (meters)" match="key" />
-            <text key="maxwidth" text="Max. width (meters)" match="key" />
-            <text key="maxlength" text="Max. length (meters)" match="key" />
-            <combo key="overtaking" text="Overtaking" values="yes,both,forward,backward,no" values_context="overtaking" values_sort="false" match="key" />
-        </item> <!-- Road Restrictions -->
+            <preset_link preset_name="Road Restrictions" />
+        </item> <!-- Access Restrictions -->
         <separator/>
         <item name="Roundabout" icon="presets/vehicle/restriction/roundabout_right.svg" type="node,way,closedway" preset_name_label="true">
@@ -1002,5 +1013,5 @@
                 <text key="width" text="Width (meters)" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Roundabout -->
         <item name="Ford" icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
@@ -1036,5 +1047,5 @@
                 <combo key="horse" text="Horse" values="yes,official,designated,permissive,destination,delivery,private,no" values_sort="false" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Track -->
         <item name="Path" icon="presets/transport/way/path.svg" type="way,closedway" preset_name_label="true">
@@ -1061,5 +1072,5 @@
                 <reference ref="path_access_modes" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Path -->
         <separator/>
@@ -1087,5 +1098,5 @@
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Dedicated Bridleway -->
         <item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
@@ -1122,5 +1133,5 @@
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Dedicated Cycleway -->
         <item name="Segregated Foot- and Cycleway" icon="presets/transport/way/segregated_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
@@ -1138,5 +1149,5 @@
                 <reference ref="path_access_modes" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Segregated Foot- and Cycleway -->
         <item name="Combined Foot- and Cycleway" icon="presets/transport/way/combined_foot_cycleway.svg" type="way,closedway" preset_name_label="true">
@@ -1155,5 +1166,5 @@
                 <reference ref="path_access_modes" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Combined Foot- and Cycleway -->
         <item name="Dedicated Footway" icon="presets/transport/way/dedicated_footway.svg" type="way,closedway" preset_name_label="true">
@@ -1178,5 +1189,5 @@
                 <combo key="motor_vehicle" text="Motor vehicles" values="yes,destination,delivery,permissive,private,agricultural,forestry,no" values_sort="false" match="key" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Dedicated Footway -->
         <item name="Steps" icon="presets/transport/way/steps.svg" type="way" preset_name_label="true">
@@ -1987,5 +1998,5 @@
                 <check key="ferry:cable" text="Reaction ferry" />
             </optional>
-            <preset_link preset_name="Road Restrictions" />
+            <reference ref="link_road_access_restrictions" />
         </item> <!-- Ferry Route -->
         <separator/>