diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 7ef28b00b7..d45a26c55b 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -790,6 +790,8 @@ node|z16-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-m.svg;}
 node|z16-[amenity=shelter][shelter_type=basic_hut],
 {icon-image: alpine_hut-m.svg;}
+node|z17-[amenity=shelter][shelter_type=public_transport],
+{icon-image: shelter-public_transport-m.svg;}
 
 node|z16-[tourism=caravan_site],
 {icon-image: caravan_site-m.svg; font-size: 11;}
diff --git a/data/styles/clear/style-clear/symbols/shelter-public_transport-m.svg b/data/styles/clear/style-clear/symbols/shelter-public_transport-m.svg
new file mode 100644
index 0000000000..681af23c7a
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/shelter-public_transport-m.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" stroke="#717065" stroke-linecap="round" stroke-linejoin="round">
+  <path d="m2.5 5.5h13"/>
+  <path d="m3.5 5.5v9"/>
+  <path d="m14.5 5.5v9"/>
+  <path d="m12 12.5h-6" stroke-width="1.5"/>
+  <path d="m6.5 12.5v2"/>
+  <path d="m11.5 12.5v2"/>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/shelter-public_transport-m.svg b/data/styles/clear/style-night/symbols/shelter-public_transport-m.svg
new file mode 100644
index 0000000000..4a2838ee5f
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shelter-public_transport-m.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <g fill="none" stroke="#777777" stroke-linecap="round" stroke-linejoin="round">
+  <path d="m2.5 5.5h13"/>
+  <path d="m3.5 5.5v9"/>
+  <path d="m14.5 5.5v9"/>
+  <path d="m12 12.5h-6" stroke-width="1.5"/>
+  <path d="m6.5 12.5v2"/>
+  <path d="m11.5 12.5v2"/>
+</g>
+</svg>
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 9fd59c0a20..86415ce822 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -266,6 +266,10 @@ area|z16-[amenity=shelter],
 node|z16-[amenity=shelter][shelter_type=lean_to],
 node|z16-[amenity=shelter][shelter_type=basic_hut],
 {font-size: 12; icon-min-distance: 0;}
+node|z13[amenity=shelter][shelter_type=public_transport],
+{icon-image: none; text: none;}
+node|z14-[amenity=shelter][shelter_type=public_transport],
+{icon-image: shelter-public_transport-m.svg;}
 
 node|z13-[tourism=caravan_site],
 area|z13-[tourism=caravan_site],
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 786ae8c9f6..ab1c71bd74 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -978,7 +978,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 === 1550
 
 amenity-shelter                                     # icon z13- (also has caption(optional) z13-)
-amenity-shelter-public_transport                    # icon z13- (also has caption(optional) z13-)
+amenity-shelter-public_transport                    # icon z14- (also has caption(optional) z14-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
@@ -1885,7 +1885,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8450
 
 # amenity-shelter                                   # caption(optional) z13- (also has icon z13-)
-# amenity-shelter-public_transport                  # caption(optional) z13- (also has icon z13-)
+# amenity-shelter-public_transport                  # caption(optional) z14- (also has icon z14-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500