diff --git a/css/map.css b/css/map.css
index f96eacc5a..7cf427f3a 100644
--- a/css/map.css
+++ b/css/map.css
@@ -96,6 +96,7 @@ g.midpoint .fill {
     opacity: .7;
 }
 
+g.midpoint.tag-highway-corridor .fill,
 g.midpoint.tag-highway-pedestrian .fill,
 g.midpoint.tag-highway-steps .fill,
 g.midpoint.tag-highway-path .fill,
@@ -560,15 +561,18 @@ path.casing.tag-highway-living_street {
     stroke-width:6;
 }
 
+path.stroke.tag-highway-corridor,
 path.stroke.tag-highway-pedestrian {
     stroke:#fff;
     stroke-dasharray: 2, 8;
     stroke-width:4;
 }
+path.casing.tag-highway-corridor,
 path.casing.tag-highway-pedestrian {
     stroke:#8cd05f;
     stroke-width:6;
 }
+path.stroke.area.tag-highway-corridor,
 path.stroke.area.tag-highway-pedestrian {
     stroke:#fff;
     stroke-dasharray: none;
@@ -833,6 +837,7 @@ path.shadow.tag-bridge {
 path.casing.line.tag-railway.tag-bridge,
 path.casing.tag-highway-living_street.tag-bridge,
 path.casing.tag-highway-path.tag-bridge,
+path.casing.tag-highway-corridor.tag-bridge,
 path.casing.line.tag-highway-pedestrian.tag-bridge,
 path.casing.tag-highway-service.tag-bridge,
 path.casing.tag-highway-track.tag-bridge,
@@ -846,6 +851,7 @@ path.casing.tag-highway-bridleway.tag-bridge {
 path.shadow.line.tag-railway.tag-bridge,
 path.shadow.tag-highway-living_street.tag-bridge,
 path.shadow.tag-highway-path.tag-bridge,
+path.shadow.tag-highway-corridor.tag-bridge,
 path.shadow.line.tag-highway-pedestrian.tag-bridge,
 path.shadow.tag-highway-service.tag-bridge,
 path.shadow.tag-highway-track.tag-bridge,
@@ -871,6 +877,7 @@ path.shadow.tag-highway-bridleway.tag-bridge {
 .low-zoom path.casing.line.tag-railway.tag-bridge,
 .low-zoom path.casing.tag-highway-living_street.tag-bridge,
 .low-zoom path.casing.tag-highway-path.tag-bridge,
+.low-zoom path.casing.tag-highway-corridor.tag-bridge,
 .low-zoom path.casing.line.tag-highway-pedestrian.tag-bridge,
 .low-zoom path.casing.tag-highway-service.tag-bridge,
 .low-zoom path.casing.tag-highway-track.tag-bridge,
@@ -884,6 +891,7 @@ path.shadow.tag-highway-bridleway.tag-bridge {
 .low-zoom path.shadow.line.tag-railway.tag-bridge,
 .low-zoom path.shadow.tag-highway-living_street.tag-bridge,
 .low-zoom path.shadow.tag-highway-path.tag-bridge,
+.low-zoom path.shadow.tag-highway-corridor.tag-bridge,
 .low-zoom path.shadow.line.tag-highway-pedestrian.tag-bridge,
 .low-zoom path.shadow.tag-highway-service.tag-bridge,
 .low-zoom path.shadow.tag-highway-track.tag-bridge,
diff --git a/data/presets.yaml b/data/presets.yaml
index 9e5478008..55fa6579c 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -507,6 +507,9 @@ en:
       length:
         # 'length=*'
         label: Length (Meters)
+      level:
+        # 'level=*'
+        label: Level
       levels:
         # 'building:levels=*'
         label: Levels
@@ -1993,6 +1996,11 @@ en:
         # highway=bus_stop
         name: Bus Stop
         terms: "<translate with synonyms or related terms for 'Bus Stop', separated by commas>"
+      highway/corridor:
+        # highway=corridor
+        name: Indoor Corridor
+        # 'terms: indoor'
+        terms: "<translate with synonyms or related terms for 'Indoor Corridor', separated by commas>"
       highway/crossing:
         # highway=crossing
         name: Crossing
diff --git a/data/presets/fields.json b/data/presets/fields.json
index b0a772109..39ea8880a 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -677,6 +677,12 @@
         "type": "number",
         "label": "Length (Meters)"
     },
+    "level": {
+        "key": "level",
+        "type": "combo",
+        "label": "Level",
+        "universal": true
+    },
     "levels": {
         "key": "building:levels",
         "type": "number",
diff --git a/data/presets/fields/level.json b/data/presets/fields/level.json
new file mode 100644
index 000000000..fcf13f76b
--- /dev/null
+++ b/data/presets/fields/level.json
@@ -0,0 +1,6 @@
+{
+    "key": "level",
+    "type": "combo",
+    "label": "Level",
+    "universal": true
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 137b7b89b..a249ca310 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3853,6 +3853,24 @@
         "terms": [],
         "name": "Bus Stop"
     },
+    "highway/corridor": {
+        "icon": "highway-footway",
+        "fields": [
+            "width",
+            "level",
+            "access_simple"
+        ],
+        "geometry": [
+            "line"
+        ],
+        "tags": {
+            "highway": "corridor"
+        },
+        "terms": [
+            "indoor"
+        ],
+        "name": "Indoor Corridor"
+    },
     "highway/crossing": {
         "fields": [
             "crossing",
@@ -4056,6 +4074,7 @@
         "name": "Path"
     },
     "highway/pedestrian": {
+        "icon": "highway-footway",
         "fields": [
             "surface",
             "lit",
diff --git a/data/presets/presets/highway/corridor.json b/data/presets/presets/highway/corridor.json
new file mode 100644
index 000000000..eef15c341
--- /dev/null
+++ b/data/presets/presets/highway/corridor.json
@@ -0,0 +1,18 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "width",
+        "level",
+        "access_simple"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "corridor"
+    },
+    "terms": [
+        "indoor"
+    ],
+    "name": "Indoor Corridor"
+}
diff --git a/data/presets/presets/highway/pedestrian.json b/data/presets/presets/highway/pedestrian.json
index dc38f88e6..8b2a6c5e8 100644
--- a/data/presets/presets/highway/pedestrian.json
+++ b/data/presets/presets/highway/pedestrian.json
@@ -1,4 +1,5 @@
 {
+    "icon": "highway-footway",
     "fields": [
         "surface",
         "lit",
@@ -8,7 +9,8 @@
         "access"
     ],
     "geometry": [
-        "line", "area"
+        "line",
+        "area"
     ],
     "tags": {
         "highway": "pedestrian"
diff --git a/data/taginfo.json b/data/taginfo.json
index 3c6fcd138..a9817944b 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -879,6 +879,10 @@
             "key": "highway",
             "value": "bus_stop"
         },
+        {
+            "key": "highway",
+            "value": "corridor"
+        },
         {
             "key": "highway",
             "value": "crossing"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fd0e3e0dd..fd668ee9c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1020,6 +1020,9 @@
             "length": {
                 "label": "Length (Meters)"
             },
+            "level": {
+                "label": "Level"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
@@ -2312,6 +2315,10 @@
                 "name": "Bus Stop",
                 "terms": ""
             },
+            "highway/corridor": {
+                "name": "Indoor Corridor",
+                "terms": "indoor"
+            },
             "highway/crossing": {
                 "name": "Crossing",
                 "terms": ""
diff --git a/js/id/renderer/features.js b/js/id/renderer/features.js
index 75c6eac72..936a39303 100644
--- a/js/id/renderer/features.js
+++ b/js/id/renderer/features.js
@@ -27,7 +27,8 @@ iD.Features = function(context) {
         'cycleway': true,
         'bridleway': true,
         'steps': true,
-        'pedestrian': true
+        'pedestrian': true,
+        'corridor': true
     };
 
     var past_futures = {
diff --git a/test/spec/renderer/features.js b/test/spec/renderer/features.js
index 01c2155af..0ab39d004 100644
--- a/test/spec/renderer/features.js
+++ b/test/spec/renderer/features.js
@@ -119,6 +119,7 @@ describe('iD.Features', function() {
             iD.Way({id: 'bridleway', tags: {highway: 'bridleway'}, version: 1}),
             iD.Way({id: 'steps', tags: {highway: 'steps'}, version: 1}),
             iD.Way({id: 'pedestrian', tags: {highway: 'pedestrian'}, version: 1}),
+            iD.Way({id: 'corridor', tags: {highway: 'corridor'}, version: 1}),
 
             // Buildings
             iD.Way({id: 'building_yes', tags: {area: 'yes', amenity: 'school', building: 'yes'}, version: 1}),
@@ -266,7 +267,7 @@ describe('iD.Features', function() {
 
             doMatch([
                 'path', 'footway', 'cycleway', 'bridleway',
-                'steps', 'pedestrian'
+                'steps', 'pedestrian', 'corridor'
             ]);
 
             dontMatch([