diff --git a/assets/layers/advertising/advertising.json b/assets/layers/advertising/advertising.json
index 2b216f634..70a21a84c 100644
--- a/assets/layers/advertising/advertising.json
+++ b/assets/layers/advertising/advertising.json
@@ -323,13 +323,15 @@
                       "or": [
                         "shelter=yes",
                         "amenity=shelter",
-                        "building=shelter"
+                        "building=shelter",
+                        "support=street_furniture:transit_shelter"
                       ]
                     },
                     {
                       "or": [
                         "public_transport=platform",
-                        "highway=bus_stop"
+                        "highway=bus_stop",
+                        "support=street_furniture:transit_shelter"
                       ]
                     }
                   ]
@@ -491,6 +493,18 @@
         "walls_and_buildings"
       ]
     },
+    {
+      "tags": [
+        "advertising=poster_box",
+        "support=street_furniture:transit_shelter"
+      ],
+      "title": {
+        "en": "a poster box part of a public transport shelter"
+      },
+      "snapToLayer": [
+        "shelter"
+      ]
+    },
     {
       "tags": [
         "advertising=board"
@@ -637,6 +651,19 @@
       ],
       "maxSnapDistance": 5
     },
+    {
+      "tags": [
+        "advertising=screen",
+        "support=street_furniture:transit_shelter"
+      ],
+      "title": {
+        "en": "a screen mounted on a transit shelter"
+      },
+      "snapToLayer": [
+        "shelter"
+      ],
+      "maxSnapDistance": 5
+    },
     {
       "tags": [
         "advertising=tarp"
diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json
index 0b00bf07a..d08e574fb 100644
--- a/assets/themes/advertising/advertising.json
+++ b/assets/themes/advertising/advertising.json
@@ -43,7 +43,19 @@
     "Offsel"
   ],
   "layers": [
-    "advertising"
+    "advertising",
+    {
+      "builtin": "shelter",
+      "override": {
+        "minzoom": 17,
+        "lineRendering+": [
+          {
+            "color": "#000",
+            "width": 2
+          }
+        ]
+      }
+    }
   ],
   "widenFactor": 0.01,
   "maintainer": "Offsel"
diff --git a/langs/layers/ca.json b/langs/layers/ca.json
index f04cd8c68..add9c3d86 100644
--- a/langs/layers/ca.json
+++ b/langs/layers/ca.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "un mupi sobre la paret"
             },
-            "3": {
+            "4": {
                 "description": "Un xicotet tauló d'anuncics per a anuncis del veïnat, normalment destitat a peatons",
                 "title": "un tauló d'anunis"
             },
-            "4": {
+            "5": {
                 "description": "Una extructura cilíndica exterior que mostra publicitat",
                 "title": "una columna"
             },
-            "5": {
+            "6": {
                 "title": "una bandera"
             },
-            "6": {
+            "7": {
                 "title": "una pantalla"
             },
-            "7": {
+            "8": {
                 "title": "una patalla sobre una paret"
             },
-            "8": {
+            "10": {
                 "description": "Una peça de tèxtil impermeable amb un missatge imprès, fixada permanentment a una paret",
                 "title": "una lona"
             },
-            "9": {
+            "11": {
                 "title": "un tòtem"
             },
-            "10": {
+            "12": {
                 "description": "S'utilitza per a cartells publicitaris, rètols de neó, logotips i cartells en entrades institucionals",
                 "title": "un lletrer"
             },
-            "11": {
+            "13": {
                 "title": "una escupltura"
             },
-            "12": {
+            "14": {
                 "title": "una paret pintada"
             }
         },
diff --git a/langs/layers/cs.json b/langs/layers/cs.json
index 90c4b6a41..9ef69176f 100644
--- a/langs/layers/cs.json
+++ b/langs/layers/cs.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "plakátovací skříň připevněná na stěnu"
             },
-            "3": {
+            "4": {
                 "description": "Malý billboard pro sousedskou reklamu, zpravidla určený pro chodce",
                 "title": "billboard"
             },
-            "4": {
+            "5": {
                 "description": "Válcová venkovní konstrukce, která zobrazuje reklamy",
                 "title": "sloup"
             },
-            "5": {
+            "6": {
                 "title": "vlajka"
             },
-            "6": {
+            "7": {
                 "title": "obrazovka"
             },
-            "7": {
+            "8": {
                 "title": "obrazovka připevněná na stěnu"
             },
-            "8": {
+            "10": {
                 "description": "Kus nepromokavého textilu s natištěným vzkazem, trvale připevněný na stěnu",
                 "title": "plachta"
             },
-            "9": {
+            "11": {
                 "title": "totem"
             },
-            "10": {
+            "12": {
                 "description": "Používá se pro reklamní nápisy, neonové nápisy, loga a vstupní nápisy institucí",
                 "title": "cedule"
             },
-            "11": {
+            "13": {
                 "title": "socha"
             },
-            "12": {
+            "14": {
                 "title": "nástěnná malba"
             }
         },
diff --git a/langs/layers/de.json b/langs/layers/de.json
index 948f80ece..072399f5b 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "eine wandmontierte Posterbox"
             },
-            "3": {
+            "4": {
                 "description": "Kleines Anschlagbrett für Nachbarschaftswerbung, normalerweise an Fußgänger gerichtet",
                 "title": "ein Anschlagbrett"
             },
-            "4": {
+            "5": {
                 "description": "Eine zylindrische Struktur im Freien, die Werbung zeigt",
                 "title": "eine Litfaßsäule"
             },
-            "5": {
+            "6": {
                 "title": "eine Flagge"
             },
-            "6": {
+            "7": {
                 "title": "einen Bildschirm"
             },
-            "7": {
+            "8": {
                 "title": "ein wandmontierter Bildschirm"
             },
-            "8": {
+            "10": {
                 "description": "Ein wasserfestes Textil mit einer aufgedruckten Botschaft, das dauerhaft an einer Wand verankert ist",
                 "title": "eine Plane"
             },
-            "9": {
+            "11": {
                 "title": "ein Totem"
             },
-            "10": {
+            "12": {
                 "description": "Verwendet für Werbeschilder, Leuchtreklamen, Logos und institutionelle Eingangsschilder",
                 "title": "ein Schild"
             },
-            "11": {
+            "13": {
                 "title": "eine Skulptur"
             },
-            "12": {
+            "14": {
                 "title": "eine Wandmalerei"
             }
         },
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 4a969adb4..cd52626b0 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -39,37 +39,43 @@
                 "title": "a poster box mounted on a wall"
             },
             "3": {
+                "title": "a poster box part of a public transport shelter"
+            },
+            "4": {
                 "description": "Small billboard for neighbourhood advertising, generally intended for pedestrians",
                 "title": "a board"
             },
-            "4": {
+            "5": {
                 "description": "A cylindrical outdoor structure which shows advertisements",
                 "title": "a column"
             },
-            "5": {
+            "6": {
                 "title": "a flag"
             },
-            "6": {
+            "7": {
                 "title": "a screen"
             },
-            "7": {
+            "8": {
                 "title": "a screen mounted on a wall"
             },
-            "8": {
+            "9": {
+                "title": "a screen mounted on a transit shelter"
+            },
+            "10": {
                 "description": "A piece of waterproof textile with a printed message, permanently anchored on a wall",
                 "title": "a tarp"
             },
-            "9": {
+            "11": {
                 "title": "a totem"
             },
-            "10": {
+            "12": {
                 "description": "Used for advertising signs, neon signs, logos & institutional entrance signs",
                 "title": "a sign"
             },
-            "11": {
+            "13": {
                 "title": "a sculpture"
             },
-            "12": {
+            "14": {
                 "title": "a wall painting"
             }
         },
diff --git a/langs/layers/es.json b/langs/layers/es.json
index 6bb551a5a..c48d5e284 100644
--- a/langs/layers/es.json
+++ b/langs/layers/es.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "un mupi sobre la pared"
             },
-            "3": {
+            "4": {
                 "description": "Un pequeño tablón de anuncios para anuncios del vecindario, normalmente destinado a peatones",
                 "title": "un tablón de anuncios"
             },
-            "4": {
+            "5": {
                 "description": "Una estructura cilíndrica exterior que muestra publicidad",
                 "title": "una columna"
             },
-            "5": {
+            "6": {
                 "title": "una bandera"
             },
-            "6": {
+            "7": {
                 "title": "una pantalla"
             },
-            "7": {
+            "8": {
                 "title": "una pantalla sobre una pared"
             },
-            "8": {
+            "10": {
                 "description": "Una pieza de tela impermeable con un mensaje impreso, anclada permanentemente en una pared",
                 "title": "una lona"
             },
-            "9": {
+            "11": {
                 "title": "un tótem"
             },
-            "10": {
+            "12": {
                 "description": "Se utiliza para carteles publicitarios, letreros de neón, logotipos y carteles en entradas institucionales",
                 "title": "un señal"
             },
-            "11": {
+            "13": {
                 "title": "una escultura"
             },
-            "12": {
+            "14": {
                 "title": "una pared pintada"
             }
         },
diff --git a/langs/layers/eu.json b/langs/layers/eu.json
index 9200f8f4e..937736949 100644
--- a/langs/layers/eu.json
+++ b/langs/layers/eu.json
@@ -32,14 +32,14 @@
                 "description": "Atari zabaleko publizitate-egitura handia, trafiko handiko eremuetan egon ohi dena, adibidez errepideen ondoan",
                 "title": "iragarki panela"
             },
-            "10": {
+            "12": {
                 "description": "Iragarki publizitarioetarako, neon-karteletarako, logotipoetarako eta erakundeen sarrera-seinaleetarako erabiltzen da",
                 "title": "letrero bat"
             },
-            "11": {
+            "13": {
                 "title": "eskultura bat"
             },
-            "12": {
+            "14": {
                 "title": "pareta margotu bat"
             }
         },
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index f7d180ecc..8f5599bd7 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -36,38 +36,38 @@
             "2": {
                 "title": "un panneau à affiches monté sur un mur"
             },
-            "3": {
+            "4": {
                 "description": "Petit panneau pour l’affichage de proximité, généralement à destination des piétons",
                 "title": "un petit panneau"
             },
-            "4": {
+            "5": {
                 "description": "Une structure extérieure cylindrique qui affiche de la publicité",
                 "title": "une colonne"
             },
-            "5": {
+            "6": {
                 "title": "un drapeau"
             },
-            "6": {
+            "7": {
                 "title": "un écran"
             },
-            "7": {
+            "8": {
                 "title": "un écran fixé au mur"
             },
-            "8": {
+            "10": {
                 "description": "Une pièce de textile imperméable avec un message imprimé, ancrée de façon permanente sur un mur.",
                 "title": "une bâche"
             },
-            "9": {
+            "11": {
                 "title": "un totem"
             },
-            "10": {
+            "12": {
                 "description": "Désigne une enseigne publicitaire, une enseigne néon, les logos ou des indications d'entrées",
                 "title": "une enseigne"
             },
-            "11": {
+            "13": {
                 "title": "une sculpture"
             },
-            "12": {
+            "14": {
                 "title": "une peinture murale"
             }
         },
diff --git a/langs/layers/it.json b/langs/layers/it.json
index 2577a752a..7bb29573c 100644
--- a/langs/layers/it.json
+++ b/langs/layers/it.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "un cartellone pubblicitario fissato al muro"
             },
-            "3": {
+            "4": {
                 "description": "PIccolo pannello per la pubblicità di vicinanza, generalmente destinato ai pedoni",
                 "title": "un piccolo pannello"
             },
-            "4": {
+            "5": {
                 "description": "Una struttura cilindrica all'esterno con affissa della pubblicità",
                 "title": "una colonna"
             },
-            "5": {
+            "6": {
                 "title": "una bandiera"
             },
-            "6": {
+            "7": {
                 "title": "uno schermo"
             },
-            "7": {
+            "8": {
                 "title": "uno schermo fissato al muro"
             },
-            "8": {
+            "10": {
                 "description": "Un telo impermeabile con un messaggio stampato, fissato in modo permanente al muro",
                 "title": "un telone"
             },
-            "9": {
+            "11": {
                 "title": "un totem"
             },
-            "10": {
+            "12": {
                 "description": "Utilizzato per insegna pubblicitaria, un'insegna al neon, i loghi o le indicazioni d'entrata",
                 "title": "un'insegna"
             },
-            "11": {
+            "13": {
                 "title": "una scultura"
             },
-            "12": {
+            "14": {
                 "title": "un murales"
             }
         },
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 4c08a1dba..31bcecd45 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -27,28 +27,28 @@
     "advertising": {
         "name": "Reclame",
         "presets": {
-            "3": {
+            "4": {
                 "description": "Een klein uithangbord voor buurtadvertenties, meestal gericht op voetgangers",
                 "title": "een uithangbord"
             },
-            "4": {
+            "5": {
                 "description": "Een cylindervormige structuur die buiten staat waarop advertenties staan",
                 "title": "een aanplakzuil"
             },
-            "5": {
+            "6": {
                 "title": "een vlag"
             },
-            "6": {
+            "7": {
                 "title": "een scherm"
             },
-            "7": {
+            "8": {
                 "title": "een scherm op een muur"
             },
-            "8": {
+            "10": {
                 "description": "Een stuk groot, weerbestendig textiel met opgedrukte reclameboodschap die permanent aan de muur hangt",
                 "title": "een spandoek"
             },
-            "12": {
+            "14": {
                 "title": "een muurschildering"
             }
         },
diff --git a/langs/layers/pl.json b/langs/layers/pl.json
index c3864591c..48c3ed344 100644
--- a/langs/layers/pl.json
+++ b/langs/layers/pl.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "skrzynka plakatowa montowana na ścianie"
             },
-            "3": {
+            "4": {
                 "description": "Mały bilbord dla reklam lokalnych, przeznaczony głównie dla pieszych",
                 "title": "tablica"
             },
-            "4": {
+            "5": {
                 "description": "Cylindryczna konstrukcja zewnętrzna, na której pokazywane są reklamy",
                 "title": "kolumna"
             },
-            "5": {
+            "6": {
                 "title": "flaga"
             },
-            "6": {
+            "7": {
                 "title": "ekran"
             },
-            "7": {
+            "8": {
                 "title": "ekran zamontowany na ścianie"
             },
-            "8": {
+            "10": {
                 "description": "Kawałek wodoodpornej tkaniny z nadrukowanym przesłaniem, trwale przymocowany do ściany",
                 "title": "plandeka"
             },
-            "9": {
+            "11": {
                 "title": "totem"
             },
-            "10": {
+            "12": {
                 "description": "Używany do znaków reklamowych, neonów, logo i znaków wejściowych do instytucji",
                 "title": "znak"
             },
-            "11": {
+            "13": {
                 "title": "rzeźba"
             },
-            "12": {
+            "14": {
                 "title": "mural ścienny"
             }
         },
diff --git a/langs/layers/pt.json b/langs/layers/pt.json
index 075fc6359..d8f2eaf62 100644
--- a/langs/layers/pt.json
+++ b/langs/layers/pt.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "uma caixa de pôster montada em uma parede"
             },
-            "3": {
+            "4": {
                 "description": "Pequeno outdoor para publicidade de bairro, geralmente destinado a pedestres",
                 "title": "a bordo"
             },
-            "4": {
+            "5": {
                 "description": "Uma estrutura exterior cilíndrica que mostra anúncios",
                 "title": "uma coluna"
             },
-            "5": {
+            "6": {
                 "title": "uma bandeira"
             },
-            "6": {
+            "7": {
                 "title": "uma tela"
             },
-            "7": {
+            "8": {
                 "title": "uma tela montada em uma parede"
             },
-            "8": {
+            "10": {
                 "description": "Uma peça de tecido impermeável com uma mensagem impressa, permanentemente ancorada na parede",
                 "title": "uma lona"
             },
-            "9": {
+            "11": {
                 "title": "um totem"
             },
-            "10": {
+            "12": {
                 "description": "Usado para sinais publicitários, sinais de néon, logotipos e sinais de entrada institucionais",
                 "title": "um sinal"
             },
-            "11": {
+            "13": {
                 "title": "uma escultura"
             },
-            "12": {
+            "14": {
                 "title": "uma pintura de parede"
             }
         },
diff --git a/langs/layers/pt_BR.json b/langs/layers/pt_BR.json
index 882c2ef1a..46ea81bdf 100644
--- a/langs/layers/pt_BR.json
+++ b/langs/layers/pt_BR.json
@@ -38,38 +38,38 @@
             "2": {
                 "title": "uma caixa de pôster montada em uma parede"
             },
-            "3": {
+            "4": {
                 "description": "Pequeno outdoor para publicidade local, geralmente destinado a pedestres",
                 "title": "um painel publicitário"
             },
-            "4": {
+            "5": {
                 "description": "Uma estrutura cilíndrica ao ar livre que exibe anúncios",
                 "title": "uma coluna"
             },
-            "5": {
+            "6": {
                 "title": "uma bandeira"
             },
-            "6": {
+            "7": {
                 "title": "uma tela"
             },
-            "7": {
+            "8": {
                 "title": "uma tela montada em uma parede"
             },
-            "8": {
+            "10": {
                 "description": "Um pedaço de tecido impermeável com uma mensagem impressa, permanentemente fixado a uma parede",
                 "title": "uma lona"
             },
-            "9": {
+            "11": {
                 "title": "um totem"
             },
-            "10": {
+            "12": {
                 "description": "Usado para placas de publicidade, letreiros de neon, logotipos e placas de entrada institucionais",
                 "title": "uma placa"
             },
-            "11": {
+            "13": {
                 "title": "uma escultura"
             },
-            "12": {
+            "14": {
                 "title": "uma pintura mural"
             }
         },
diff --git a/langs/layers/zh_Hans.json b/langs/layers/zh_Hans.json
index 122903857..3159a582d 100644
--- a/langs/layers/zh_Hans.json
+++ b/langs/layers/zh_Hans.json
@@ -33,28 +33,28 @@
             "2": {
                 "title": "安装在墙上的海报盒子"
             },
-            "5": {
+            "6": {
                 "title": "一个旗子"
             },
-            "6": {
+            "7": {
                 "title": "一块屏幕"
             },
-            "7": {
+            "8": {
                 "title": "一块挂在墙上的屏幕"
             },
-            "8": {
+            "10": {
                 "title": "防水布"
             },
-            "9": {
+            "11": {
                 "title": "图腾"
             },
-            "10": {
+            "12": {
                 "title": "标志"
             },
-            "11": {
+            "13": {
                 "title": "雕像"
             },
-            "12": {
+            "14": {
                 "title": "墙上的画"
             }
         },