diff --git a/data/presets.yaml b/data/presets.yaml
index 12a1ad0b33..8c270ec2a8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -340,6 +340,16 @@ en:
       content:
         # content=*
         label: Content
+      conveying:
+        # conveying=*
+        label: Movement Direction
+        options:
+          # conveying=backward
+          backward: Backward
+          # conveying=forward
+          forward: Forward
+          # conveying=reversible
+          reversible: Reversible
       country:
         # country=*
         label: Country
@@ -3378,6 +3388,11 @@ en:
         name: Entrance/Exit
         # 'terms: entrance,exit,door'
         terms: '<translate with synonyms or related terms for ''Entrance/Exit'', separated by commas>'
+      footway/conveying/moving-walkway:
+        # 'highway=footway, conveying=*'
+        name: Moving Walkway
+        # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor'
+        terms: '<translate with synonyms or related terms for ''Moving Walkway'', separated by commas>'
       footway/crossing:
         # 'highway=footway, footway=crossing'
         name: Street Crossing
@@ -3713,6 +3728,11 @@ en:
         name: Steps
         # 'terms: stairs,staircase'
         terms: '<translate with synonyms or related terms for ''Steps'', separated by commas>'
+      highway/steps/conveying/escalator:
+        # 'highway=steps, conveying=*'
+        name: Escalator
+        # 'terms: moving staircase,moving stairway,people mover'
+        terms: '<translate with synonyms or related terms for ''Escalator'', separated by commas>'
       highway/stop:
         # highway=stop
         name: Stop Sign
diff --git a/data/presets/fields.json b/data/presets/fields.json
index ef606e2b28..8c2246978c 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -58,6 +58,7 @@
     "construction": {"key": "construction", "type": "combo", "label": "Type"},
     "contact/webcam": {"key": "contact:webcam", "type": "url", "icon": "website", "label": "Webcam URL", "placeholder": "http://example.com/"},
     "content": {"key": "content", "type": "combo", "label": "Content", "options": ["silage", "water", "oil", "fuel", "slurry", "gas", "manure", "sewage"]},
+    "conveying": {"key": "conveying", "type": "typeCombo", "label": "Movement Direction", "strings": {"options": {"forward": "Forward", "backward": "Backward", "reversible": "Reversible"}}},
     "country": {"key": "country", "type": "combo", "label": "Country"},
     "covered": {"key": "covered", "type": "check", "label": "Covered"},
     "craft": {"key": "craft", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b980f4a285..9ad1bb3f39 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -335,6 +335,7 @@
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
     "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"},
+    "footway/conveying/moving-walkway": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "surface", "width"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
     "footway/crossing-raised": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Raised Street Crossing"},
     "footway/crossing": {"fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "terms": [], "name": "Street Crossing"},
     "footway/crosswalk-raised": {"icon": "iD-highway-footway", "fields": ["crossing", "access", "surface", "kerb", "tactile_paving"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "flat top", "hump", "speed", "slow"], "name": "Raised Pedestrian Crosswalk"},
@@ -406,6 +407,7 @@
     "highway/services": {"icon": "maki-car", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
     "highway/speed_camera": {"icon": "maki-attraction", "geometry": ["point", "vertex"], "fields": ["direction", "ref"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
     "highway/steps": {"icon": "iD-highway-steps", "fields": ["surface", "lit", "width", "incline_steps", "handrail", "step_count"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase"], "name": "Steps"},
+    "highway/steps/conveying/escalator": {"icon": "maki-entrance", "fields": ["name", "incline_steps", "conveying", "access_simple", "lit", "surface", "width", "handrail", "step_count"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
     "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
     "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
     "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["name", "oneway", "maxspeed", "maxspeed/advisory", "lanes", "surface", "structure", "maxheight", "ref_road_number", "cycleway", "access"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
diff --git a/data/presets/presets/footway/conveying/moving-walkway.json b/data/presets/presets/footway/conveying/moving-walkway.json
new file mode 100644
index 0000000000..b9b3d46844
--- /dev/null
+++ b/data/presets/presets/footway/conveying/moving-walkway.json
@@ -0,0 +1,23 @@
+{
+    "icon": "temaki-pedestrian",
+    "fields": [
+        "name", "conveying", "access_simple", "lit", "surface", "width"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "terms": [
+        "moving sidewalk", 
+        "autwalk",
+        "skywalk",
+        "travolator",
+        "travelator",
+        "travellator",
+        "conveyor"
+    ],
+    "tags": {
+        "highway": "footway",
+        "conveying": "*"
+    },
+    "name": "Moving Walkway"
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index c5e62af937..c632cb5021 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2290,6 +2290,12 @@
       "object_types": ["node"],
       "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"
     },
+    {
+      "key": "conveying",
+      "description": "Moving Walkway, Escalator",
+      "object_types": ["way"],
+      "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/pedestrian.svg?sanitize=true"
+    },
     {
       "key": "traffic_calming",
       "value": "table",
@@ -6624,6 +6630,21 @@
     {"key": "construction", "description": "Type"},
     {"key": "contact:webcam", "description": "Webcam URL"},
     {"key": "content", "description": "Content"},
+    {
+      "key": "conveying",
+      "value": "forward",
+      "description": "Movement Direction"
+    },
+    {
+      "key": "conveying",
+      "value": "backward",
+      "description": "Movement Direction"
+    },
+    {
+      "key": "conveying",
+      "value": "reversible",
+      "description": "Movement Direction"
+    },
     {"key": "country", "description": "Country"},
     {"key": "covered", "description": "Covered"},
     {"key": "crane:type", "value": "portal_crane", "description": "Crane Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f8b240dc29..29fa63e464 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1747,6 +1747,14 @@
                 "content": {
                     "label": "Content"
                 },
+                "conveying": {
+                    "label": "Movement Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "reversible": "Reversible"
+                    }
+                },
                 "country": {
                     "label": "Country"
                 },
@@ -4402,6 +4410,10 @@
                     "name": "Entrance/Exit",
                     "terms": "entrance,exit,door"
                 },
+                "footway/conveying/moving-walkway": {
+                    "name": "Moving Walkway",
+                    "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor"
+                },
                 "footway/crossing-raised": {
                     "name": "Raised Street Crossing",
                     "terms": "flat top,hump,speed,slow"
@@ -4686,6 +4698,10 @@
                     "name": "Steps",
                     "terms": "stairs,staircase"
                 },
+                "highway/steps/conveying/escalator": {
+                    "name": "Escalator",
+                    "terms": "moving staircase,moving stairway,people mover"
+                },
                 "highway/stop": {
                     "name": "Stop Sign",
                     "terms": "stop,halt,sign"