diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json
index 74b1abc278..3fc1dfc853 100644
--- a/assets/layers/elevator/elevator.json
+++ b/assets/layers/elevator/elevator.json
@@ -1,10 +1,10 @@
 {
   "id": "elevator",
   "name": {
-    "en": "elevator",
-    "fr": "ascenseur",
+    "en": "Elevator",
+    "fr": "Ascenseur",
     "de": "Aufzug",
-    "nl": "lift"
+    "nl": "Lift"
   },
   "source": {
     "osmTags": "highway=elevator"
@@ -134,7 +134,15 @@
         "type": "pfloat"
       }
     },
-    "induction-loop"
+    "induction-loop",
+    {
+      "builtin": "wikidata.tactile_writing-braille",
+      "override": {
+        "question": {
+          "en": "In which languages does this elevator have tactile writing (braille)?"
+        }
+      }
+    }
   ],
   "mapRendering": [
     {
@@ -210,4 +218,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/stairs/Braille_stairs.jpg b/assets/layers/stairs/Braille_stairs.jpg
new file mode 100644
index 0000000000..778fdc5c5d
Binary files /dev/null and b/assets/layers/stairs/Braille_stairs.jpg differ
diff --git a/assets/layers/stairs/license_info.json b/assets/layers/stairs/license_info.json
new file mode 100644
index 0000000000..5cae5099d9
--- /dev/null
+++ b/assets/layers/stairs/license_info.json
@@ -0,0 +1,10 @@
+[
+  {
+    "path": "Braille_stairs.jpg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
new file mode 100644
index 0000000000..06b3c783a1
--- /dev/null
+++ b/assets/layers/stairs/stairs.json
@@ -0,0 +1,132 @@
+{
+  "id": "stairs",
+  "name": {
+    "en": "Stairs",
+    "nl": "Trappen"
+  },
+  "description": {
+    "en": "Layer showing stairs and escalators"
+  },
+  "title": {
+    "render": {
+      "en": "Stairs",
+      "nl": "Trap"
+    },
+    "mappings": [
+      {
+        "if": "conveying=yes",
+        "then": {
+          "en": "Escalator",
+          "nl": "Roltrap"
+        }
+      }
+    ]
+  },
+  "minzoom": 17,
+  "source": {
+    "osmTags": "highway=steps"
+  },
+  "tagRenderings": [
+    {
+      "id": "handrail",
+      "question": {
+        "en": "Does this stair have a handrail?",
+        "nl": "Heeft deze trap een leuning?"
+      },
+      "mappings": [
+        {
+          "if": "handrail=yes",
+          "then": {
+            "en": "These stairs have a handrail",
+            "nl": "Deze trap heeft een leuning"
+          }
+        },
+        {
+          "if": "handrail=no",
+          "then": {
+            "en": "These stairs do <b>not</b> have a handrail",
+            "nl": "Deze trap heeft <b>geen</b> leuning"
+          }
+        }
+      ]
+    },
+    {
+      "id": "ramp",
+      "question": {
+        "en": "Is there a ramp at these stairs?"
+      },
+      "multiAnswer": true,
+      "mappings": [
+        {
+          "if": "ramp:bicycle=yes",
+          "ifnot": "ramp:bicycle=no",
+          "then": {
+            "en": "There is a ramp for bicycles here"
+          }
+        },
+        {
+          "if": "ramp:wheelchair=yes",
+          "ifnot": "ramp:wheelchair=no",
+          "then": {
+            "en": "There is a ramp for wheelchairs here"
+          }
+        },
+        {
+          "if": "ramp=separate",
+          "then": {
+            "en": "There is ramp for wheelchairs here, but it is shown separately on the map"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "ramp:stroller=yes",
+          "ifnot": "ramp:stroller=no",
+          "then": {
+            "en": "There is a ramp for strollers here"
+          }
+        },
+        {
+          "if": "ramp=no",
+          "ifnot": "ramp=",
+          "then": {
+            "en": "There is no ramp at these stairs"
+          }
+        }
+      ]
+    },
+    {
+      "builtin": "wikidata.tactile_writing-braille",
+      "override": {
+        "question": {
+          "en": "In which languages is there tactile writing (braille) for navigation? <img src='./assets/layers/stairs/Braille_stairs.jpg' style='height: 300px; width: auto; display: block;' />"
+        }
+      }
+    },
+    {
+      "id": "conveying",
+      "mappings": [
+        {
+          "if": "conveying=yes",
+          "then": {
+            "en": "This is an escalator",
+            "nl": "Dit is een roltrap"
+          }
+        },
+        {
+          "if": "conveying=no",
+          "then": {
+            "en": "This is not an escalator",
+            "nl": "Dit is geen roltrap"
+          }
+        }
+      ]
+    }
+  ],
+"mapRendering": [
+  {
+    "color": "gray",
+    "width": 10,
+    "dashArray": "2 2"
+  }
+]
+}
diff --git a/assets/themes/blind_osm/blind_osm.json b/assets/themes/blind_osm/blind_osm.json
index a0740bf08b..49fb5ef919 100644
--- a/assets/themes/blind_osm/blind_osm.json
+++ b/assets/themes/blind_osm/blind_osm.json
@@ -37,7 +37,9 @@
           }
         ]
       },
-      "hideTagRenderingsWithLabels": ["crossing-bicycle-allowed"]
+      "hideTagRenderingsWithLabels": [
+        "crossing-bicycle-allowed"
+      ]
     },
     {
       "builtin": "kerbs",
@@ -77,6 +79,13 @@
           }
         ]
       }
-    }
+    },
+    {
+      "builtin": "elevator",
+      "override": {
+        "minzoom": 17
+      }
+    },
+    "stairs"
   ]
 }
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 7df80a9630..054086351a 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3384,7 +3384,7 @@
     },
     "elevator": {
         "description": "This layer show elevators and asks for operational status and elevator dimensions. Useful for wheelchair accessibility information",
-        "name": "elevator",
+        "name": "Elevator",
         "presets": {
             "0": {
                 "title": "an elevator"
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 33beda7422..c6b95f9e55 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -2228,7 +2228,7 @@
     },
     "elevator": {
         "description": "Ce calque montre les ascenseurs et demande l'état opérationnel et les dimensions de l'ascenseur. Utile pour les informations sur l'accessibilité en fauteuil roulant",
-        "name": "ascenseur",
+        "name": "Ascenseur",
         "presets": {
             "0": {
                 "title": "un ascenseur"
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 533e822d8f..daf131cbe3 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3372,7 +3372,7 @@
     },
     "elevator": {
         "description": "Deze laag toont liften en vraagt praktische info over de grootte van de lift en ofdat deze werkt, vooral met het oog op of de lift werkt of niet.",
-        "name": "lift",
+        "name": "Lift",
         "presets": {
             "0": {
                 "title": "een lift"