diff --git a/assets/layers/transit_stops/ferry.svg b/assets/layers/transit_stops/ferry.svg
new file mode 100644
index 000000000..44ee50cf5
--- /dev/null
+++ b/assets/layers/transit_stops/ferry.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500">
+<title>ANCHOR</title>
+<g stroke="black" fill="none">
+ <circle cx="250" cy="80" r="40" stroke-width="20"/>
+ <path d="M 250,125 V 440 M 150,185 H 350 M 100,347 C 130,460 370,460 400,347" stroke-width="30"/>
+</g>
+<g fill="black">
+ <circle cx="250" cy="115" r="20"/>
+ <path d="M 55,365 L 75,260 150,330 Z M 225,440 L 250,470 275,440 Z M 445,365 L 425,260 350,330 Z"/>
+</g>
+<div xmlns="" id="divScriptsUsed" style="display: none"/><script xmlns="" id="globalVarsDetection" src="moz-extension://85428172-fe12-427b-ac2a-46cc4f37cea0/js/wrs_env.js"/></svg>
\ No newline at end of file
diff --git a/assets/layers/transit_stops/ferry.svg.license b/assets/layers/transit_stops/ferry.svg.license
new file mode 100644
index 000000000..66d129eb7
--- /dev/null
+++ b/assets/layers/transit_stops/ferry.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: DePiep
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/transit_stops/license_info.json b/assets/layers/transit_stops/license_info.json
index 6f9a07dd7..b01f09c1e 100644
--- a/assets/layers/transit_stops/license_info.json
+++ b/assets/layers/transit_stops/license_info.json
@@ -11,5 +11,35 @@
     "sources": [
       "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/highway/bus_stop.svg"
     ]
+  },
+  {
+    "path": "ferry.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "DePiep"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:BSicon_ANCHOR.svg"
+    ]
+  },
+  {
+    "path": "subway.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Siyuwj"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:BSicon_SUBWAY-CHN.svg"
+    ]
+  },
+  {
+    "path": "tram.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "BjørnN"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:BSicon_TRAM1.svg"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/layers/transit_stops/subway.svg b/assets/layers/transit_stops/subway.svg
new file mode 100644
index 000000000..38b093ec6
--- /dev/null
+++ b/assets/layers/transit_stops/subway.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="图层_2"
+   x="0px"
+   y="0px"
+   width="1100"
+   height="1100"
+   viewBox="0 0 1100 1100"
+   enable-background="new 0 0 500 500"
+   xml:space="preserve"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="BSicon_SUBWAY-CHN.svg"><metadata
+     id="metadata17"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs15" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview13"
+     showgrid="false"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="931.55143"
+     inkscape:cy="600.05849"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="图层_2"
+     inkscape:document-rotation="0" /><path
+     id="rect893"
+     style="opacity:1;fill:#000000;stroke:none;stroke-width:5.35389;stroke-miterlimit:10;stroke-dasharray:none"
+     d="M 427.9668 280 C 372.03142 280 327 325.03142 327 380.9668 L 327 729.0332 C 327 777.76822 361.18609 818.21983 406.98242 827.82812 L 291 1000 L 351 1000 L 432.50977 879 L 661.49023 879 L 743 1000 L 803 1000 L 687.01758 827.82812 C 732.81391 818.21983 767 777.76822 767 729.0332 L 767 380.9668 C 767 325.03142 721.96858 280 666.0332 280 L 427.9668 280 z M 493.17188 298 L 600.82812 298 C 609.23298 298 616 304.76702 616 313.17188 L 616 347.42969 C 616 355.83454 609.23299 362.59961 600.82812 362.59961 L 493.17188 362.59961 C 484.76702 362.59961 478 355.83454 478 347.42969 L 478 313.17188 C 478 304.76702 484.76701 298 493.17188 298 z M 420.40039 378.5 L 670.40039 378.5 C 698.10039 378.5 720.40039 400.8 720.40039 428.5 L 720.40039 498.5 C 720.40039 526.2 698.10039 548.5 670.40039 548.5 L 420.40039 548.5 C 392.70039 548.5 370.40039 526.2 370.40039 498.5 L 370.40039 428.5 C 370.40039 400.8 392.70039 378.5 420.40039 378.5 z M 421.96289 686.87891 L 422 686.87891 C 447.95738 686.87891 469 707.92153 469 733.87891 C 469 759.83629 447.95738 780.87891 422 780.87891 C 396.04262 780.87891 375 759.83629 375 733.87891 C 374.99999 707.93601 396.02 686.89939 421.96289 686.87891 z M 671.96289 686.87891 L 672 686.87891 C 697.95738 686.87891 719 707.92153 719 733.87891 C 719 759.83629 697.95738 780.87891 672 780.87891 C 646.04262 780.87891 625 759.83629 625 733.87891 C 624.99999 707.93601 646.02 686.89939 671.96289 686.87891 z " /><path
+     id="path852"
+     style="fill:#000000;stroke:none;stroke-width:5.30544"
+     d="m 125.54793,964.142 c -0.4394,-165.32487 -1.0063,-331.8464 2.5075,-497.09678 15.3487,-160.29688 130.2979,-304.99034 282.9433,-356.36484 153.4477,-54.967807 336.3503,-9.11239 445.2166,112.36708 76.1891,80.74759 118.3471,193.0285 112.2182,304.20579 0.6161,145.2861 0.2421,291.60186 0.1978,436.88875 H 901.874 c -1.1193,-164.46202 0.57953,-329.00793 -3.19737,-493.40251 -14.4252,-143.60363 -125.8634,-270.68771 -266.3193,-303.96588 -123.1472,-31.48846 -261.1871,10.39271 -345.4035,105.90361 -62.9281,67.77457 -96.4043,161.10936 -90.8869,253.39078 -1.062,146.02217 -1.1439,292.0493 -1.6739,438.074 z"
+     sodipodi:nodetypes="ccccccccccccc" /></svg>
diff --git a/assets/layers/transit_stops/subway.svg.license b/assets/layers/transit_stops/subway.svg.license
new file mode 100644
index 000000000..216ef8b51
--- /dev/null
+++ b/assets/layers/transit_stops/subway.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Siyuwj
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/transit_stops/tram.svg b/assets/layers/transit_stops/tram.svg
new file mode 100644
index 000000000..ee3a0a8d9
--- /dev/null
+++ b/assets/layers/transit_stops/tram.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="500" height="500">
+  <g fill="none" stroke="#000">
+    <path stroke-width="5" d="m102 174 54-37 54 37-54 37Z"/>
+    <path stroke-width="14" d="M30 220h440"/>
+  </g>
+  <path d="m40 227-30 60v34a13 13 0 0 0 13 13h454a13 13 0 0 0 13-13v-34l-30-60Zm68-14 5-5h84l5 5ZM52 343a14 14 0 0 0 44 0Zm52 0a24 24 0 0 1-4 12h38a24 24 0 0 1-4-12Zm38 0a14 14 0 0 0 44 0Zm172 0a14 14 0 0 0 44 0Zm52 0a24 24 0 0 1-4 12h38a24 24 0 0 1-4-12Zm38 0a14 14 0 0 0 44 0Z"/>
+  <g fill="#fff">
+    <path d="M67 287H47c-30 0-30 0 0-60h20Zm366 0h20c30 0 30 0 0-60h-20ZM74 227h34v99H74z"/>
+    <rect width="77" height="60" x="117" y="227" rx="10"/>
+    <rect width="77" height="60" x="203" y="227" rx="10"/>
+    <rect width="77" height="60" x="289" y="227" rx="10"/>
+    <path d="M374 227h52v99h-52z"/>
+  </g>
+<div xmlns="" id="divScriptsUsed" style="display: none"/><script xmlns="" id="globalVarsDetection" src="moz-extension://85428172-fe12-427b-ac2a-46cc4f37cea0/js/wrs_env.js"/></svg>
\ No newline at end of file
diff --git a/assets/layers/transit_stops/tram.svg.license b/assets/layers/transit_stops/tram.svg.license
new file mode 100644
index 000000000..e23bb2a49
--- /dev/null
+++ b/assets/layers/transit_stops/tram.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: BjørnN
+SPDX-License-Identifier: CC0-1.0
\ No newline at end of file
diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index fe4814dc9..58a86fab7 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -22,7 +22,9 @@
   "source": {
     "osmTags": {
       "or": [
-        "highway=bus_stop"
+        "highway=bus_stop",
+        "railway=platform",
+        "amenity=ferry_terminal"
       ]
     }
   },
@@ -32,7 +34,7 @@
       "en": "Transit Stop",
       "de": "Haltestelle",
       "da": "Stoppested",
-      "nl": "Bushalte",
+      "nl": "OV-halte",
       "ca": "Parada de transport públic",
       "cs": "Tranzitní zastávka",
       "es": "Parada de transporte",
@@ -65,13 +67,39 @@
         {
           "icon": {
             "render": "./assets/layers/transit_stops/bus_stop.svg",
-            "mappings": []
+            "mappings": [
+              {
+                "if": "train=yes",
+                "then": "./assets/svg/train.svg"
+              },
+              {
+                "if": "subway=yes",
+                "then": "./assets/layers/transit_stops/subway.svg"
+              },
+              {
+                "if": "tram=yes",
+                "then": "./assets/layers/transit_stops/tram.svg"
+              },
+              {
+                "if": "light_rail=yes",
+                "then": "./assets/svg/train.svg"
+              },
+              {
+                "if": "ferry=yes",
+                "then": "./assets/layers/transit_stops/ferry.svg"
+              }
+            ]
           }
         }
       ]
     }
   ],
-  "lineRendering": [],
+  "lineRendering": [
+    {
+      "color": "#74717190",
+      "fillColor": "#74717190"
+    }
+  ],
   "tagRenderings": [
     {
       "id": "stop_name",
@@ -134,6 +162,30 @@
         }
       ]
     },
+    {
+      "id": "ref",
+      "question": {
+        "en": "What is the platform reference of this stop?"
+      },
+      "render": {
+        "en": "The platform reference of this stop is <b>{ref}</b>."
+      },
+      "freeform": {
+        "key": "ref",
+        "type": "string",
+        "placeholder": {
+          "en": "e.g. A1 or 1"
+        }
+      },
+      "mappings": [
+        {
+          "if": "ref=",
+          "then": {
+            "en": "This stop has no platform reference"
+          }
+        }
+      ]
+    },
     "images",
     {
       "id": "shelter",
@@ -561,4 +613,4 @@
     "tactile_paving"
   ],
   "allowMove": false
-}
+}
\ No newline at end of file
diff --git a/assets/themes/waste_assen/waste_assen.json b/assets/themes/waste_assen/waste_assen.json
index 31f064e70..870a57bf7 100644
--- a/assets/themes/waste_assen/waste_assen.json
+++ b/assets/themes/waste_assen/waste_assen.json
@@ -129,7 +129,8 @@
               "osmTags": "_has_closeby_feature=no",
               "question": "Zonder nabijgelegen vuilnisbak"
             }
-          ]
+          ],
+          "#": "ignore-possible-duplicate"
         }
       ]
     },
@@ -253,7 +254,8 @@
               "osmTags": "_has_closeby_feature=no",
               "question": "Zonder nabijgelegen recyclingcontainer"
             }
-          ]
+          ],
+          "#": "ignore-possible-duplicate"
         }
       ]
     },