diff --git a/assets/layers/stairs/escalator.svg b/assets/layers/stairs/escalator.svg
new file mode 100644
index 000000000..454a4656a
--- /dev/null
+++ b/assets/layers/stairs/escalator.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 515 400" xmlns="http://www.w3.org/2000/svg">
+<path d="m218.2 69.69c18.75 0 33.92-15.17 33.9-33.9.02-18.7-15.15-33.88-33.9-33.9-18.68.03-33.85 15.2-33.9 33.9.05 18.73 15.22 33.9 33.9 33.9"/>
+<path d="m251.8 130.7v-21.3c-.02-45.55-67.11-45.05-67.1 0v87.1h.1l-63.4 63.4c-5.95 5.93-6.68 6.19-18.4 6.2h-38.8c-38.98-.01-62.37 35.04-62.4 64.8.03 29.66 23.42 67.22 65.9 67.2 0 0 52.72.03 69 0 16.31.03 36.07-6.2 52.4-21.5l202.1-201.6c4.31-3.8 6.71-5 14.1-5h50c23.98 0 57.98-27.22 58-66.5-.03-38.82-34.28-64.72-60-64.8h-78.8c-16.33-.01-37.28 6.65-49.8 19.2l-72.9 72.8"/>
+<path d="m379.2 72.19h70.9c17.22.04 28.82 19.32 28.8 30.8.03 11.53-8.21 32.99-29.3 33h-42.6c-18.08-.01-26.08 2.53-36.5 12.9l-203.6 203.7c-8.28 8.25-18.74 11.52-32.2 11.5h-67.1c-17.28.02-32.48-14.58-32.5-33.7.02-19.22 14.52-29.96 29.5-30h46.1c13.42.04 22.25-3.79 29.9-11.5l207.1-207.1c8.56-8.5 16.98-9.56 31.5-9.6" fill="#fff"/>
+<div xmlns="" id="divScriptsUsed" style="display: none"/><script xmlns="" id="globalVarsDetection" src="moz-extension://191fb6fc-6816-4a50-b97f-142979bf7e1e/js/wrs_env.js"/></svg>
\ No newline at end of file
diff --git a/assets/layers/stairs/escalator.svg.license b/assets/layers/stairs/escalator.svg.license
new file mode 100644
index 000000000..22d0b4478
--- /dev/null
+++ b/assets/layers/stairs/escalator.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: AIGA
+SPDX-License-Identifier: Public Domain
\ No newline at end of file
diff --git a/assets/layers/stairs/license_info.json b/assets/layers/stairs/license_info.json
index 6e638d37d..6a6547bcf 100644
--- a/assets/layers/stairs/license_info.json
+++ b/assets/layers/stairs/license_info.json
@@ -7,11 +7,21 @@
     ],
     "sources": []
   },
+  {
+    "path": "escalator.svg",
+    "license": "Public Domain",
+    "authors": [
+      "AIGA"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Aiga_escalator.svg"
+    ]
+  },
   {
     "path": "stairs.svg",
     "license": "CC-BY SA 4.0",
     "authors": [
-      " \tFont Awesome"
+      "Font Awesome"
     ],
     "sources": [
       "https://commons.wikimedia.org/wiki/File:Stairs-solid.svg"
diff --git a/assets/layers/stairs/stairs.json b/assets/layers/stairs/stairs.json
index ceda4c28b..3accb9c0e 100644
--- a/assets/layers/stairs/stairs.json
+++ b/assets/layers/stairs/stairs.json
@@ -33,7 +33,14 @@
     },
     "mappings": [
       {
-        "if": "conveying=yes",
+        "if": {
+          "or": [
+            "conveying=yes",
+            "conveying=forward",
+            "conveying=backward",
+            "conveying=reversible"
+          ]
+        },
         "then": {
           "en": "Escalator",
           "nl": "Roltrap",
@@ -53,7 +60,22 @@
           "color": "white"
         },
         {
-          "icon": "./assets/layers/stairs/stairs.svg"
+          "icon": {
+            "render": "./assets/layers/stairs/stairs.svg",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    "conveying=yes",
+                    "conveying=forward",
+                    "conveying=backward",
+                    "conveying=reversible"
+                  ]
+                },
+                "then": "./assets/layers/stairs/escalator.svg"
+              }
+            ]
+          }
         }
       ],
       "location": [
@@ -63,9 +85,51 @@
   ],
   "lineRendering": [
     {
-      "color": "gray",
+      "color": {
+        "render": "gray",
+        "mappings": [
+          {
+            "if": {
+              "or": [
+                "conveying=yes",
+                "conveying=forward",
+                "conveying=backward",
+                "conveying=reversible"
+              ]
+            },
+            "then": "blue"
+          }
+        ]
+      },
       "width": 10,
-      "dashArray": "1 1"
+      "dashArray": "1 2",
+      "imageAlongWay": [
+        {
+          "if": {
+            "or": [
+              "conveying=yes",
+              "conveying=forward"
+            ]
+          },
+          "then": "./assets/png/oneway.png"
+        },
+        {
+          "if": {
+            "or": [
+              "conveying=backward"
+            ]
+          },
+          "then": "./assets/png/oneway_reversed.png"
+        },
+        {
+          "if": {
+            "or": [
+              "conveying=reversible"
+            ]
+          },
+          "then": "./assets/png/twoway.png"
+        }
+      ]
     }
   ],
   "tagRenderings": [
@@ -106,6 +170,26 @@
             "es": "Esta es una escalera mecánica"
           }
         },
+        {
+          "if": {
+            "or": [
+              "conveying=forward",
+              "conveying=backward"
+            ]
+          },
+          "then": {
+            "en": "This is an escalator moving in the direction of the arrows",
+            "nl": "Dit is een roltrap die beweegt in de richting van de pijlen"
+          },
+          "hideInAnswer": true
+        },
+        {
+          "if": "conveying=reversible",
+          "then": {
+            "en": "This is a reversible escalator",
+            "nl": "Dit is een roltrap die van richting kan veranderen"
+          }
+        },
         {
           "if": "conveying=no",
           "then": {
@@ -131,7 +215,11 @@
           },
           "hideInAnswer": true
         }
-      ]
+      ],
+      "question": {
+        "en": "Is this an escalator?",
+        "nl": "Is dit een roltrap?"
+      }
     },
     {
       "id": "handrail",
@@ -372,4 +460,4 @@
     "enableImproveAccuracy": true,
     "enableRelocation": false
   }
-}
+}
\ No newline at end of file
diff --git a/assets/layers/stairs/stairs.svg.license b/assets/layers/stairs/stairs.svg.license
index 64535f156..969eb44c1 100644
--- a/assets/layers/stairs/stairs.svg.license
+++ b/assets/layers/stairs/stairs.svg.license
@@ -1,2 +1,2 @@
-SPDX-FileCopyrightText:  	Font Awesome
+SPDX-FileCopyrightText: Font Awesome
 SPDX-License-Identifier: CC-BY SA 4.0
\ No newline at end of file
diff --git a/assets/png/license_info.json b/assets/png/license_info.json
index 548e52793..60faccb28 100644
--- a/assets/png/license_info.json
+++ b/assets/png/license_info.json
@@ -15,6 +15,14 @@
     ],
     "sources": []
   },
+  {
+    "path": "oneway_reversed.png",
+    "license": "CC0-1.0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
+  },
   {
     "path": "twoway.png",
     "license": "CC0-1.0",
diff --git a/assets/png/oneway_reversed.png b/assets/png/oneway_reversed.png
new file mode 100644
index 000000000..38fc0911a
Binary files /dev/null and b/assets/png/oneway_reversed.png differ
diff --git a/assets/png/oneway_reversed.png.license b/assets/png/oneway_reversed.png.license
new file mode 100644
index 000000000..ed0288300
--- /dev/null
+++ b/assets/png/oneway_reversed.png.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Pieter Vander Vennet
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file