diff --git a/data/classificator.txt b/data/classificator.txt
index c179d6a0b7..53bc96c5bb 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -149,7 +149,9 @@ world  +
         restaurant  -
         sanitary_dump_station  -
         school  -
-        shelter  -
+        shelter  +
+            public_transport  -
+            {}
         shower  -
         stripclub  -
         taxi  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0a2f153feb..8646463123 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 18854c524b..feef099e92 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -12261,6 +12261,137 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-shelter-public_transport"
+  element {
+    scale: 13
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
 cont {
   name: "amenity-shower"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d5e00cb8a9..9d8058eb17 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 73f57b5332..a7de71e85e 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -11959,6 +11959,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-shelter-public_transport"
+  element {
+    scale: 17
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
 cont {
   name: "amenity-shower"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index b48090a0cc..41d6e90fa7 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 58b122f994..ce5a9da3d9 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -11959,6 +11959,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-shelter-public_transport"
+  element {
+    scale: 17
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
 cont {
   name: "amenity-shower"
   element {
diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin
index fa31b6d747..d29ebbf3fc 100644
Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ
diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt
index ce3edb6af5..d35da99299 100644
--- a/data/drules_proto_outdoors_clear.txt
+++ b/data/drules_proto_outdoors_clear.txt
@@ -12122,6 +12122,140 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-shelter-public_transport"
+  element {
+    scale: 13
+    symbol {
+      name: "shelter-s"
+      priority: 1500
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
 cont {
   name: "amenity-shower"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 7687bd4238..a62b7288fc 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index c7d337fcfe..9d5d1ddf8f 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -12122,6 +12122,140 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-shelter-public_transport"
+  element {
+    scale: 13
+    symbol {
+      name: "shelter-s"
+      priority: 1500
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "shelter-m"
+      priority: 1500
+    }
+    caption {
+      primary {
+        height: 12
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -8500
+    }
+  }
+}
 cont {
   name: "amenity-shower"
   element {
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 750ed3df6d..1b55120498 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -989,7 +989,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 === 1550
 
 amenity-shelter                                     # icon z17- (also has caption(optional) z17-)
-amenity-shelter-public_transport
+amenity-shelter-public_transport                    # icon z17- (also has caption(optional) z17-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
@@ -1893,6 +1893,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # === -8450
 
 # amenity-shelter                                   # caption(optional) z17- (also has icon z17-)
+# amenity-shelter-public_transport                  # caption(optional) z17- (also has icon z17-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 92cb13ee01..fcac76801b 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -989,7 +989,7 @@ tourism-artwork-painting                            # icon z15- (also has captio
 === 1550
 
 amenity-shelter                                     # icon z13- (also has caption(optional) z13-)
-amenity-shelter-public_transport
+amenity-shelter-public_transport                    # icon z13- (also has caption(optional) z13-)
 leisure-fitness_station                             # icon z17- (also has caption(optional) z17-)
 leisure-playground                                  # icon z17- (also has caption(optional) z17-, area z16-)
 === 1500
@@ -1893,6 +1893,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-)
 # leisure-fitness_station                           # caption(optional) z17- (also has icon z17-)
 # leisure-playground                                # caption(optional) z17- (also has icon z17-, area z16-)
 # === -8500
diff --git a/data/types.txt b/data/types.txt
index 607ea075bb..b62306343e 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -453,7 +453,7 @@ mapswithme
 mapswithme
 mapswithme
 *landuse|orchard
-mapswithme
+*amenity|shelter|public_transport
 *highway|living_street|tunnel
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index 8e46ca90f2..f5f14ff0e6 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -149,7 +149,9 @@ world  000000000000000000000  +
         restaurant  000000000000000011111  -
         sanitary_dump_station  000000000000000111111  -
         school  000000000000000000000  -
-        shelter  000000000000000000000  -
+        shelter  000000000000000000000  +
+            public_transport  000000000000000000000  -
+            {}
         shower  000000000000000000000  -
         stripclub  000000000000000000000  -
         taxi  000000000000000000000  -