diff --git a/data/locales.js b/data/locales.js
index 765fd3ae9..d27ebccc0 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -360,6 +360,9 @@ locale.en = {
             "oneway": {
                 "label": "One Way"
             },
+            "oneway_yes": {
+                "label": "One Way"
+            },
             "opening_hours": {
                 "label": "Hours"
             },
@@ -683,8 +686,8 @@ locale.en = {
                 "terms": ""
             },
             "highway/bridleway": {
-                "name": "Steps",
-                "terms": "stairs,staircase"
+                "name": "Bridle Path",
+                "terms": "bridleway,equestrian trail,horse riding path,bridle road,horse trail"
             },
             "highway/bus_stop": {
                 "name": "Bus Stop",
@@ -706,6 +709,10 @@ locale.en = {
                 "name": "Motorway",
                 "terms": ""
             },
+            "highway/motorway_link": {
+                "name": "Motorway Link",
+                "terms": "ramp,on ramp,off ramp"
+            },
             "highway/path": {
                 "name": "Path",
                 "terms": ""
@@ -714,6 +721,10 @@ locale.en = {
                 "name": "Primary Road",
                 "terms": ""
             },
+            "highway/primary_link": {
+                "name": "Primary Link",
+                "terms": "ramp,on ramp,off ramp"
+            },
             "highway/residential": {
                 "name": "Residential Road",
                 "terms": ""
@@ -722,6 +733,10 @@ locale.en = {
                 "name": "Secondary Road",
                 "terms": ""
             },
+            "highway/secondary_link": {
+                "name": "Secondary Link",
+                "terms": "ramp,on ramp,off ramp"
+            },
             "highway/service": {
                 "name": "Service Road",
                 "terms": ""
@@ -734,6 +749,10 @@ locale.en = {
                 "name": "Tertiary Road",
                 "terms": ""
             },
+            "highway/tertiary_link": {
+                "name": "Tertiary Link",
+                "terms": "ramp,on ramp,off ramp"
+            },
             "highway/track": {
                 "name": "Track",
                 "terms": ""
@@ -746,6 +765,10 @@ locale.en = {
                 "name": "Trunk Road",
                 "terms": ""
             },
+            "highway/trunk_link": {
+                "name": "Trunk Link",
+                "terms": "ramp,on ramp,off ramp"
+            },
             "highway/turning_circle": {
                 "name": "Turning Circle",
                 "terms": ""
diff --git a/data/presets.yaml b/data/presets.yaml
index 5ceacc1d4..c7e9f78f9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -86,6 +86,8 @@ en:
         label: Type
       oneway: 
         label: One Way
+      oneway_yes: 
+        label: One Way
       opening_hours: 
         label: Hours
       operator: 
@@ -324,8 +326,8 @@ en:
         name: Highway
         terms: ""
       highway/bridleway: 
-        name: Bridleway
-        terms: "bridle path,bridleway,equestrian trail,horse riding path,bridle road,horse trail"
+        name: Bridle Path
+        terms: "bridleway,equestrian trail,horse riding path,bridle road,horse trail"
       highway/bus_stop: 
         name: Bus Stop
         terms: ""
@@ -341,18 +343,27 @@ en:
       highway/motorway: 
         name: Motorway
         terms: ""
+      highway/motorway_link: 
+        name: Motorway Link
+        terms: "ramp,on ramp,off ramp"
       highway/path: 
         name: Path
         terms: ""
       highway/primary: 
         name: Primary Road
         terms: ""
+      highway/primary_link: 
+        name: Primary Link
+        terms: "ramp,on ramp,off ramp"
       highway/residential: 
         name: Residential Road
         terms: ""
       highway/secondary: 
         name: Secondary Road
         terms: ""
+      highway/secondary_link: 
+        name: Secondary Link
+        terms: "ramp,on ramp,off ramp"
       highway/service: 
         name: Service Road
         terms: ""
@@ -362,6 +373,9 @@ en:
       highway/tertiary: 
         name: Tertiary Road
         terms: ""
+      highway/tertiary_link: 
+        name: Tertiary Link
+        terms: "ramp,on ramp,off ramp"
       highway/track: 
         name: Track
         terms: ""
@@ -371,6 +385,9 @@ en:
       highway/trunk: 
         name: Trunk Road
         terms: ""
+      highway/trunk_link: 
+        name: Trunk Link
+        terms: "ramp,on ramp,off ramp"
       highway/turning_circle: 
         name: Turning Circle
         terms: ""
diff --git a/data/presets/presets.json b/data/presets/presets.json
index bf9e6177c..c1e6f5246 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1069,13 +1069,16 @@
             "line"
         ],
         "tags": {
-            "highway": "steps"
+            "highway": "bridleway"
         },
         "terms": [
-            "stairs",
-            "staircase"
+            "bridleway",
+            "equestrian trail",
+            "horse riding path",
+            "bridle road",
+            "horse trail"
         ],
-        "name": "Steps"
+        "name": "Bridle Path"
     },
     "highway/bus_stop": {
         "icon": "bus",
@@ -2712,7 +2715,7 @@
         "name": "Beverage Store"
     },
     "shop/bicycle": {
-        "icon": "shop",
+        "icon": "bicycle",
         "fields": [
             "address",
             "opening_hours"
diff --git a/data/presets/presets/shop/bicycle.json b/data/presets/presets/shop/bicycle.json
index 941432d10..12bad05b7 100644
--- a/data/presets/presets/shop/bicycle.json
+++ b/data/presets/presets/shop/bicycle.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "bicycle",
     "fields": [
         "address",
         "opening_hours"