diff --git a/data/classificator.txt b/data/classificator.txt
index d48a54b31d..42b44bf190 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -130,6 +130,7 @@ world  +
         post_office  -
         prison  -
         pub  -
+        public_bath  -
         public_bookcase  -
         recycling  +
             centre  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 9774629573..3e45adc8ae 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 90b9384484..42eacd101f 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -8829,6 +8829,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-public_bath"
+  element {
+    scale: 17
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "amenity-public_bookcase"
   element {
@@ -43232,7 +43283,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -43249,7 +43300,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -43266,7 +43317,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -96526,7 +96577,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
@@ -96534,7 +96585,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
@@ -96551,7 +96602,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index cdf742b58b..b479ab2e63 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 f6c71913a1..8cea0cb280 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -8703,6 +8703,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-public_bath"
+  element {
+    scale: 17
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "amenity-public_bookcase"
   element {
@@ -42924,7 +42975,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -42941,7 +42992,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -42958,7 +43009,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -96092,7 +96143,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
@@ -96100,7 +96151,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
@@ -96117,7 +96168,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3ac0335f0f..d958dff215 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 3c928efb27..5ccfbe244a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -8703,6 +8703,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-public_bath"
+  element {
+    scale: 17
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "public_bath-m"
+      priority: 850
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9150
+    }
+  }
+}
 cont {
   name: "amenity-public_bookcase"
   element {
@@ -43067,7 +43118,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -43084,7 +43135,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -43101,7 +43152,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 850
       min_distance: 10
     }
@@ -96178,7 +96229,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
@@ -96186,7 +96237,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
@@ -96203,7 +96254,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "sauna-m"
+      name: "public_bath-m"
       priority: 1300
       min_distance: 24
     }
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 7c46ca1633..ea43566af3 100644
Binary files a/data/resources-6plus_clear/symbols.png and b/data/resources-6plus_clear/symbols.png differ
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index 60acd72b2f..6813e3a802 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -250,14 +250,14 @@
   <symbol minX="1856" maxX="1914" minY="522" maxY="580" name="prison-m"/>
   <symbol minX="1914" maxX="1972" minY="522" maxY="580" name="psychotherapist-m"/>
   <symbol minX="1972" maxX="2030" minY="522" maxY="580" name="public-building-m"/>
-  <symbol minX="0" maxX="58" minY="580" maxY="638" name="beauty-m"/>
-  <symbol minX="58" maxX="116" minY="580" maxY="638" name="beekeeper-m"/>
-  <symbol minX="116" maxX="174" minY="580" maxY="638" name="recycling-m"/>
-  <symbol minX="174" maxX="232" minY="580" maxY="638" name="remains-m"/>
-  <symbol minX="232" maxX="290" minY="580" maxY="638" name="beer-m"/>
-  <symbol minX="290" maxX="348" minY="580" maxY="638" name="restaurant-m"/>
-  <symbol minX="348" maxX="406" minY="580" maxY="638" name="sample_collection-m"/>
-  <symbol minX="406" maxX="464" minY="580" maxY="638" name="sauna-m"/>
+  <symbol minX="0" maxX="58" minY="580" maxY="638" name="public_bath-m"/>
+  <symbol minX="58" maxX="116" minY="580" maxY="638" name="beauty-m"/>
+  <symbol minX="116" maxX="174" minY="580" maxY="638" name="beekeeper-m"/>
+  <symbol minX="174" maxX="232" minY="580" maxY="638" name="recycling-m"/>
+  <symbol minX="232" maxX="290" minY="580" maxY="638" name="remains-m"/>
+  <symbol minX="290" maxX="348" minY="580" maxY="638" name="beer-m"/>
+  <symbol minX="348" maxX="406" minY="580" maxY="638" name="restaurant-m"/>
+  <symbol minX="406" maxX="464" minY="580" maxY="638" name="sample_collection-m"/>
   <symbol minX="464" maxX="522" minY="580" maxY="638" name="sawmill-m"/>
   <symbol minX="522" maxX="580" minY="580" maxY="638" name="school-m"/>
   <symbol minX="580" maxX="638" minY="580" maxY="638" name="seafood-shop-m"/>
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 6540e51455..1d5ae71a16 100644
Binary files a/data/resources-6plus_dark/symbols.png and b/data/resources-6plus_dark/symbols.png differ
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index 7ac283d9a5..aa8eb66cf3 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -249,14 +249,14 @@
   <symbol minX="1798" maxX="1856" minY="522" maxY="580" name="prison-m"/>
   <symbol minX="1856" maxX="1914" minY="522" maxY="580" name="psychotherapist-m"/>
   <symbol minX="1914" maxX="1972" minY="522" maxY="580" name="public-building-m"/>
-  <symbol minX="1972" maxX="2030" minY="522" maxY="580" name="beekeeper-m"/>
-  <symbol minX="0" maxX="58" minY="580" maxY="638" name="beer-m"/>
-  <symbol minX="58" maxX="116" minY="580" maxY="638" name="recycling-m"/>
-  <symbol minX="116" maxX="174" minY="580" maxY="638" name="remains-m"/>
-  <symbol minX="174" maxX="232" minY="580" maxY="638" name="subway-wuhan-m"/>
-  <symbol minX="232" maxX="290" minY="580" maxY="638" name="restaurant-m"/>
-  <symbol minX="290" maxX="348" minY="580" maxY="638" name="sample_collection-m"/>
-  <symbol minX="348" maxX="406" minY="580" maxY="638" name="sauna-m"/>
+  <symbol minX="1972" maxX="2030" minY="522" maxY="580" name="public_bath-m"/>
+  <symbol minX="0" maxX="58" minY="580" maxY="638" name="beekeeper-m"/>
+  <symbol minX="58" maxX="116" minY="580" maxY="638" name="beer-m"/>
+  <symbol minX="116" maxX="174" minY="580" maxY="638" name="recycling-m"/>
+  <symbol minX="174" maxX="232" minY="580" maxY="638" name="remains-m"/>
+  <symbol minX="232" maxX="290" minY="580" maxY="638" name="subway-wuhan-m"/>
+  <symbol minX="290" maxX="348" minY="580" maxY="638" name="restaurant-m"/>
+  <symbol minX="348" maxX="406" minY="580" maxY="638" name="sample_collection-m"/>
   <symbol minX="406" maxX="464" minY="580" maxY="638" name="sawmill-m"/>
   <symbol minX="464" maxX="522" minY="580" maxY="638" name="school-m"/>
   <symbol minX="522" maxX="580" minY="580" maxY="638" name="seafood-shop-m"/>
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index 54a12dfec7..d3ca25dbeb 100644
Binary files a/data/resources-hdpi_clear/symbols.png and b/data/resources-hdpi_clear/symbols.png differ
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 2ed96ac374..7e8f721432 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -250,14 +250,14 @@
   <symbol minX="279" maxX="310" minY="406" maxY="437" name="prison-m"/>
   <symbol minX="310" maxX="341" minY="406" maxY="437" name="psychotherapist-m"/>
   <symbol minX="341" maxX="372" minY="406" maxY="437" name="public-building-m"/>
-  <symbol minX="372" maxX="403" minY="406" maxY="437" name="bicycle-repair-station"/>
-  <symbol minX="403" maxX="434" minY="406" maxY="437" name="blacksmith-m"/>
-  <symbol minX="434" maxX="465" minY="406" maxY="437" name="recycling-m"/>
-  <symbol minX="465" maxX="496" minY="406" maxY="437" name="remains-m"/>
-  <symbol minX="496" maxX="527" minY="406" maxY="437" name="blood_donation-m"/>
-  <symbol minX="527" maxX="558" minY="406" maxY="437" name="restaurant-m"/>
-  <symbol minX="558" maxX="589" minY="406" maxY="437" name="sample_collection-m"/>
-  <symbol minX="589" maxX="620" minY="406" maxY="437" name="sauna-m"/>
+  <symbol minX="372" maxX="403" minY="406" maxY="437" name="public_bath-m"/>
+  <symbol minX="403" maxX="434" minY="406" maxY="437" name="bicycle-repair-station"/>
+  <symbol minX="434" maxX="465" minY="406" maxY="437" name="blacksmith-m"/>
+  <symbol minX="465" maxX="496" minY="406" maxY="437" name="recycling-m"/>
+  <symbol minX="496" maxX="527" minY="406" maxY="437" name="remains-m"/>
+  <symbol minX="527" maxX="558" minY="406" maxY="437" name="blood_donation-m"/>
+  <symbol minX="558" maxX="589" minY="406" maxY="437" name="restaurant-m"/>
+  <symbol minX="589" maxX="620" minY="406" maxY="437" name="sample_collection-m"/>
   <symbol minX="620" maxX="651" minY="406" maxY="437" name="sawmill-m"/>
   <symbol minX="651" maxX="682" minY="406" maxY="437" name="school-m"/>
   <symbol minX="682" maxX="713" minY="406" maxY="437" name="seafood-shop-m"/>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 26724c400a..34d41b930a 100644
Binary files a/data/resources-hdpi_dark/symbols.png and b/data/resources-hdpi_dark/symbols.png differ
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 68bc24e791..7217fcf5fb 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -249,14 +249,14 @@
   <symbol minX="248" maxX="279" minY="406" maxY="437" name="prison-m"/>
   <symbol minX="279" maxX="310" minY="406" maxY="437" name="psychotherapist-m"/>
   <symbol minX="310" maxX="341" minY="406" maxY="437" name="public-building-m"/>
-  <symbol minX="341" maxX="372" minY="406" maxY="437" name="blacksmith-m"/>
-  <symbol minX="372" maxX="403" minY="406" maxY="437" name="blood_donation-m"/>
-  <symbol minX="403" maxX="434" minY="406" maxY="437" name="recycling-m"/>
-  <symbol minX="434" maxX="465" minY="406" maxY="437" name="remains-m"/>
-  <symbol minX="465" maxX="496" minY="406" maxY="437" name="book-shop-m"/>
-  <symbol minX="496" maxX="527" minY="406" maxY="437" name="restaurant-m"/>
-  <symbol minX="527" maxX="558" minY="406" maxY="437" name="sample_collection-m"/>
-  <symbol minX="558" maxX="589" minY="406" maxY="437" name="sauna-m"/>
+  <symbol minX="341" maxX="372" minY="406" maxY="437" name="public_bath-m"/>
+  <symbol minX="372" maxX="403" minY="406" maxY="437" name="blacksmith-m"/>
+  <symbol minX="403" maxX="434" minY="406" maxY="437" name="blood_donation-m"/>
+  <symbol minX="434" maxX="465" minY="406" maxY="437" name="recycling-m"/>
+  <symbol minX="465" maxX="496" minY="406" maxY="437" name="remains-m"/>
+  <symbol minX="496" maxX="527" minY="406" maxY="437" name="book-shop-m"/>
+  <symbol minX="527" maxX="558" minY="406" maxY="437" name="restaurant-m"/>
+  <symbol minX="558" maxX="589" minY="406" maxY="437" name="sample_collection-m"/>
   <symbol minX="589" maxX="620" minY="406" maxY="437" name="sawmill-m"/>
   <symbol minX="620" maxX="651" minY="406" maxY="437" name="school-m"/>
   <symbol minX="651" maxX="682" minY="406" maxY="437" name="seafood-shop-m"/>
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index e7ef11aaf9..28d3d5a455 100644
Binary files a/data/resources-mdpi_clear/symbols.png and b/data/resources-mdpi_clear/symbols.png differ
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index d883547646..b052eb43c6 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -250,14 +250,14 @@
   <symbol minX="506" maxX="528" minY="198" maxY="220" name="prison-m"/>
   <symbol minX="528" maxX="550" minY="198" maxY="220" name="psychotherapist-m"/>
   <symbol minX="550" maxX="572" minY="198" maxY="220" name="public-building-m"/>
-  <symbol minX="572" maxX="594" minY="198" maxY="220" name="bicycle-repair-station"/>
-  <symbol minX="594" maxX="616" minY="198" maxY="220" name="blacksmith-m"/>
-  <symbol minX="616" maxX="638" minY="198" maxY="220" name="recycling-m"/>
-  <symbol minX="638" maxX="660" minY="198" maxY="220" name="remains-m"/>
-  <symbol minX="660" maxX="682" minY="198" maxY="220" name="blood_donation-m"/>
-  <symbol minX="682" maxX="704" minY="198" maxY="220" name="restaurant-m"/>
-  <symbol minX="704" maxX="726" minY="198" maxY="220" name="sample_collection-m"/>
-  <symbol minX="726" maxX="748" minY="198" maxY="220" name="sauna-m"/>
+  <symbol minX="572" maxX="594" minY="198" maxY="220" name="public_bath-m"/>
+  <symbol minX="594" maxX="616" minY="198" maxY="220" name="bicycle-repair-station"/>
+  <symbol minX="616" maxX="638" minY="198" maxY="220" name="blacksmith-m"/>
+  <symbol minX="638" maxX="660" minY="198" maxY="220" name="recycling-m"/>
+  <symbol minX="660" maxX="682" minY="198" maxY="220" name="remains-m"/>
+  <symbol minX="682" maxX="704" minY="198" maxY="220" name="blood_donation-m"/>
+  <symbol minX="704" maxX="726" minY="198" maxY="220" name="restaurant-m"/>
+  <symbol minX="726" maxX="748" minY="198" maxY="220" name="sample_collection-m"/>
   <symbol minX="748" maxX="770" minY="198" maxY="220" name="sawmill-m"/>
   <symbol minX="770" maxX="792" minY="198" maxY="220" name="school-m"/>
   <symbol minX="792" maxX="814" minY="198" maxY="220" name="seafood-shop-m"/>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index 7304d6b854..2958ef0a86 100644
Binary files a/data/resources-mdpi_dark/symbols.png and b/data/resources-mdpi_dark/symbols.png differ
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index b225552e12..721d7d4f39 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -249,14 +249,14 @@
   <symbol minX="484" maxX="506" minY="198" maxY="220" name="prison-m"/>
   <symbol minX="506" maxX="528" minY="198" maxY="220" name="psychotherapist-m"/>
   <symbol minX="528" maxX="550" minY="198" maxY="220" name="public-building-m"/>
-  <symbol minX="550" maxX="572" minY="198" maxY="220" name="blacksmith-m"/>
-  <symbol minX="572" maxX="594" minY="198" maxY="220" name="blood_donation-m"/>
-  <symbol minX="594" maxX="616" minY="198" maxY="220" name="recycling-m"/>
-  <symbol minX="616" maxX="638" minY="198" maxY="220" name="remains-m"/>
-  <symbol minX="638" maxX="660" minY="198" maxY="220" name="book-shop-m"/>
-  <symbol minX="660" maxX="682" minY="198" maxY="220" name="restaurant-m"/>
-  <symbol minX="682" maxX="704" minY="198" maxY="220" name="sample_collection-m"/>
-  <symbol minX="704" maxX="726" minY="198" maxY="220" name="sauna-m"/>
+  <symbol minX="550" maxX="572" minY="198" maxY="220" name="public_bath-m"/>
+  <symbol minX="572" maxX="594" minY="198" maxY="220" name="blacksmith-m"/>
+  <symbol minX="594" maxX="616" minY="198" maxY="220" name="blood_donation-m"/>
+  <symbol minX="616" maxX="638" minY="198" maxY="220" name="recycling-m"/>
+  <symbol minX="638" maxX="660" minY="198" maxY="220" name="remains-m"/>
+  <symbol minX="660" maxX="682" minY="198" maxY="220" name="book-shop-m"/>
+  <symbol minX="682" maxX="704" minY="198" maxY="220" name="restaurant-m"/>
+  <symbol minX="704" maxX="726" minY="198" maxY="220" name="sample_collection-m"/>
   <symbol minX="726" maxX="748" minY="198" maxY="220" name="sawmill-m"/>
   <symbol minX="748" maxX="770" minY="198" maxY="220" name="school-m"/>
   <symbol minX="770" maxX="792" minY="198" maxY="220" name="seafood-shop-m"/>
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index d6ef3a76dc..a6b5ae7dba 100644
Binary files a/data/resources-xhdpi_clear/symbols.png and b/data/resources-xhdpi_clear/symbols.png differ
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index 5bb8e756b5..8f225f088a 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -250,14 +250,14 @@
   <symbol minX="40" maxX="80" minY="373" maxY="413" name="prison-m"/>
   <symbol minX="80" maxX="120" minY="373" maxY="413" name="psychotherapist-m"/>
   <symbol minX="120" maxX="160" minY="373" maxY="413" name="public-building-m"/>
-  <symbol minX="160" maxX="200" minY="373" maxY="413" name="bicycle-repair-station"/>
-  <symbol minX="200" maxX="240" minY="373" maxY="413" name="blacksmith-m"/>
-  <symbol minX="240" maxX="280" minY="373" maxY="413" name="recycling-m"/>
-  <symbol minX="280" maxX="320" minY="373" maxY="413" name="remains-m"/>
-  <symbol minX="320" maxX="360" minY="373" maxY="413" name="blood_donation-m"/>
-  <symbol minX="360" maxX="400" minY="373" maxY="413" name="restaurant-m"/>
-  <symbol minX="400" maxX="440" minY="373" maxY="413" name="sample_collection-m"/>
-  <symbol minX="440" maxX="480" minY="373" maxY="413" name="sauna-m"/>
+  <symbol minX="160" maxX="200" minY="373" maxY="413" name="public_bath-m"/>
+  <symbol minX="200" maxX="240" minY="373" maxY="413" name="bicycle-repair-station"/>
+  <symbol minX="240" maxX="280" minY="373" maxY="413" name="blacksmith-m"/>
+  <symbol minX="280" maxX="320" minY="373" maxY="413" name="recycling-m"/>
+  <symbol minX="320" maxX="360" minY="373" maxY="413" name="remains-m"/>
+  <symbol minX="360" maxX="400" minY="373" maxY="413" name="blood_donation-m"/>
+  <symbol minX="400" maxX="440" minY="373" maxY="413" name="restaurant-m"/>
+  <symbol minX="440" maxX="480" minY="373" maxY="413" name="sample_collection-m"/>
   <symbol minX="480" maxX="520" minY="373" maxY="413" name="sawmill-m"/>
   <symbol minX="520" maxX="560" minY="373" maxY="413" name="school-m"/>
   <symbol minX="560" maxX="600" minY="373" maxY="413" name="seafood-shop-m"/>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 040668927f..b96d81601b 100644
Binary files a/data/resources-xhdpi_dark/symbols.png and b/data/resources-xhdpi_dark/symbols.png differ
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index 0a1d7e6273..9a64857c44 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -249,14 +249,14 @@
   <symbol minX="0" maxX="40" minY="373" maxY="413" name="prison-m"/>
   <symbol minX="40" maxX="80" minY="373" maxY="413" name="psychotherapist-m"/>
   <symbol minX="80" maxX="120" minY="373" maxY="413" name="public-building-m"/>
-  <symbol minX="120" maxX="160" minY="373" maxY="413" name="blacksmith-m"/>
-  <symbol minX="160" maxX="200" minY="373" maxY="413" name="blood_donation-m"/>
-  <symbol minX="200" maxX="240" minY="373" maxY="413" name="recycling-m"/>
-  <symbol minX="240" maxX="280" minY="373" maxY="413" name="remains-m"/>
-  <symbol minX="280" maxX="320" minY="373" maxY="413" name="book-shop-m"/>
-  <symbol minX="320" maxX="360" minY="373" maxY="413" name="restaurant-m"/>
-  <symbol minX="360" maxX="400" minY="373" maxY="413" name="sample_collection-m"/>
-  <symbol minX="400" maxX="440" minY="373" maxY="413" name="sauna-m"/>
+  <symbol minX="120" maxX="160" minY="373" maxY="413" name="public_bath-m"/>
+  <symbol minX="160" maxX="200" minY="373" maxY="413" name="blacksmith-m"/>
+  <symbol minX="200" maxX="240" minY="373" maxY="413" name="blood_donation-m"/>
+  <symbol minX="240" maxX="280" minY="373" maxY="413" name="recycling-m"/>
+  <symbol minX="280" maxX="320" minY="373" maxY="413" name="remains-m"/>
+  <symbol minX="320" maxX="360" minY="373" maxY="413" name="book-shop-m"/>
+  <symbol minX="360" maxX="400" minY="373" maxY="413" name="restaurant-m"/>
+  <symbol minX="400" maxX="440" minY="373" maxY="413" name="sample_collection-m"/>
   <symbol minX="440" maxX="480" minY="373" maxY="413" name="sawmill-m"/>
   <symbol minX="480" maxX="520" minY="373" maxY="413" name="school-m"/>
   <symbol minX="520" maxX="560" minY="373" maxY="413" name="seafood-shop-m"/>
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 8ffcc48121..ff530ecd91 100644
Binary files a/data/resources-xxhdpi_clear/symbols.png and b/data/resources-xxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 44977de366..dd5c7cede4 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -250,14 +250,14 @@
   <symbol minX="1624" maxX="1682" minY="717" maxY="775" name="prison-m"/>
   <symbol minX="1682" maxX="1740" minY="717" maxY="775" name="psychotherapist-m"/>
   <symbol minX="1740" maxX="1798" minY="717" maxY="775" name="public-building-m"/>
-  <symbol minX="1798" maxX="1856" minY="717" maxY="775" name="bicycle-repair-station"/>
-  <symbol minX="1856" maxX="1914" minY="717" maxY="775" name="blacksmith-m"/>
-  <symbol minX="1914" maxX="1972" minY="717" maxY="775" name="recycling-m"/>
-  <symbol minX="1972" maxX="2030" minY="717" maxY="775" name="remains-m"/>
-  <symbol minX="0" maxX="58" minY="775" maxY="833" name="blood_donation-m"/>
-  <symbol minX="58" maxX="116" minY="775" maxY="833" name="restaurant-m"/>
-  <symbol minX="116" maxX="174" minY="775" maxY="833" name="sample_collection-m"/>
-  <symbol minX="174" maxX="232" minY="775" maxY="833" name="sauna-m"/>
+  <symbol minX="1798" maxX="1856" minY="717" maxY="775" name="public_bath-m"/>
+  <symbol minX="1856" maxX="1914" minY="717" maxY="775" name="bicycle-repair-station"/>
+  <symbol minX="1914" maxX="1972" minY="717" maxY="775" name="blacksmith-m"/>
+  <symbol minX="1972" maxX="2030" minY="717" maxY="775" name="recycling-m"/>
+  <symbol minX="0" maxX="58" minY="775" maxY="833" name="remains-m"/>
+  <symbol minX="58" maxX="116" minY="775" maxY="833" name="blood_donation-m"/>
+  <symbol minX="116" maxX="174" minY="775" maxY="833" name="restaurant-m"/>
+  <symbol minX="174" maxX="232" minY="775" maxY="833" name="sample_collection-m"/>
   <symbol minX="232" maxX="290" minY="775" maxY="833" name="sawmill-m"/>
   <symbol minX="290" maxX="348" minY="775" maxY="833" name="school-m"/>
   <symbol minX="348" maxX="406" minY="775" maxY="833" name="seafood-shop-m"/>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 5aa06ad4e9..4d3d486ab7 100644
Binary files a/data/resources-xxhdpi_dark/symbols.png and b/data/resources-xxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index debd4f2e59..9a73ed106d 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -249,14 +249,14 @@
   <symbol minX="1566" maxX="1624" minY="717" maxY="775" name="prison-m"/>
   <symbol minX="1624" maxX="1682" minY="717" maxY="775" name="psychotherapist-m"/>
   <symbol minX="1682" maxX="1740" minY="717" maxY="775" name="public-building-m"/>
-  <symbol minX="1740" maxX="1798" minY="717" maxY="775" name="blacksmith-m"/>
-  <symbol minX="1798" maxX="1856" minY="717" maxY="775" name="blood_donation-m"/>
-  <symbol minX="1856" maxX="1914" minY="717" maxY="775" name="recycling-m"/>
-  <symbol minX="1914" maxX="1972" minY="717" maxY="775" name="remains-m"/>
-  <symbol minX="1972" maxX="2030" minY="717" maxY="775" name="book-shop-m"/>
-  <symbol minX="0" maxX="58" minY="775" maxY="833" name="restaurant-m"/>
-  <symbol minX="58" maxX="116" minY="775" maxY="833" name="sample_collection-m"/>
-  <symbol minX="116" maxX="174" minY="775" maxY="833" name="sauna-m"/>
+  <symbol minX="1740" maxX="1798" minY="717" maxY="775" name="public_bath-m"/>
+  <symbol minX="1798" maxX="1856" minY="717" maxY="775" name="blacksmith-m"/>
+  <symbol minX="1856" maxX="1914" minY="717" maxY="775" name="blood_donation-m"/>
+  <symbol minX="1914" maxX="1972" minY="717" maxY="775" name="recycling-m"/>
+  <symbol minX="1972" maxX="2030" minY="717" maxY="775" name="remains-m"/>
+  <symbol minX="0" maxX="58" minY="775" maxY="833" name="book-shop-m"/>
+  <symbol minX="58" maxX="116" minY="775" maxY="833" name="restaurant-m"/>
+  <symbol minX="116" maxX="174" minY="775" maxY="833" name="sample_collection-m"/>
   <symbol minX="174" maxX="232" minY="775" maxY="833" name="sawmill-m"/>
   <symbol minX="232" maxX="290" minY="775" maxY="833" name="school-m"/>
   <symbol minX="290" maxX="348" minY="775" maxY="833" name="seafood-shop-m"/>
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/resources-xxxhdpi_clear/symbols.png
index e94ec974b0..90b024d151 100644
Binary files a/data/resources-xxxhdpi_clear/symbols.png and b/data/resources-xxxhdpi_clear/symbols.png differ
diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/resources-xxxhdpi_clear/symbols.sdf
index 38d39c8e53..9967291612 100644
--- a/data/resources-xxxhdpi_clear/symbols.sdf
+++ b/data/resources-xxxhdpi_clear/symbols.sdf
@@ -250,14 +250,14 @@
   <symbol minX="680" maxX="748" minY="990" maxY="1058" name="prison-m"/>
   <symbol minX="748" maxX="816" minY="990" maxY="1058" name="psychotherapist-m"/>
   <symbol minX="816" maxX="884" minY="990" maxY="1058" name="public-building-m"/>
-  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="bicycle-repair-station"/>
-  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="blacksmith-m"/>
-  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="recycling-m"/>
-  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="remains-m"/>
-  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="blood_donation-m"/>
-  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="restaurant-m"/>
-  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="sample_collection-m"/>
-  <symbol minX="1360" maxX="1428" minY="990" maxY="1058" name="sauna-m"/>
+  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="public_bath-m"/>
+  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="bicycle-repair-station"/>
+  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="blacksmith-m"/>
+  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="recycling-m"/>
+  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="remains-m"/>
+  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="blood_donation-m"/>
+  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="restaurant-m"/>
+  <symbol minX="1360" maxX="1428" minY="990" maxY="1058" name="sample_collection-m"/>
   <symbol minX="1428" maxX="1496" minY="990" maxY="1058" name="sawmill-m"/>
   <symbol minX="1496" maxX="1564" minY="990" maxY="1058" name="school-m"/>
   <symbol minX="1564" maxX="1632" minY="990" maxY="1058" name="seafood-shop-m"/>
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/resources-xxxhdpi_dark/symbols.png
index 2ddab0edf8..3645a8cf69 100644
Binary files a/data/resources-xxxhdpi_dark/symbols.png and b/data/resources-xxxhdpi_dark/symbols.png differ
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/resources-xxxhdpi_dark/symbols.sdf
index 48ee5ab0f6..ca749e50c1 100644
--- a/data/resources-xxxhdpi_dark/symbols.sdf
+++ b/data/resources-xxxhdpi_dark/symbols.sdf
@@ -249,14 +249,14 @@
   <symbol minX="612" maxX="680" minY="990" maxY="1058" name="prison-m"/>
   <symbol minX="680" maxX="748" minY="990" maxY="1058" name="psychotherapist-m"/>
   <symbol minX="748" maxX="816" minY="990" maxY="1058" name="public-building-m"/>
-  <symbol minX="816" maxX="884" minY="990" maxY="1058" name="blacksmith-m"/>
-  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="blood_donation-m"/>
-  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="recycling-m"/>
-  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="remains-m"/>
-  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="book-shop-m"/>
-  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="restaurant-m"/>
-  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="sample_collection-m"/>
-  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="sauna-m"/>
+  <symbol minX="816" maxX="884" minY="990" maxY="1058" name="public_bath-m"/>
+  <symbol minX="884" maxX="952" minY="990" maxY="1058" name="blacksmith-m"/>
+  <symbol minX="952" maxX="1020" minY="990" maxY="1058" name="blood_donation-m"/>
+  <symbol minX="1020" maxX="1088" minY="990" maxY="1058" name="recycling-m"/>
+  <symbol minX="1088" maxX="1156" minY="990" maxY="1058" name="remains-m"/>
+  <symbol minX="1156" maxX="1224" minY="990" maxY="1058" name="book-shop-m"/>
+  <symbol minX="1224" maxX="1292" minY="990" maxY="1058" name="restaurant-m"/>
+  <symbol minX="1292" maxX="1360" minY="990" maxY="1058" name="sample_collection-m"/>
   <symbol minX="1360" maxX="1428" minY="990" maxY="1058" name="sawmill-m"/>
   <symbol minX="1428" maxX="1496" minY="990" maxY="1058" name="school-m"/>
   <symbol minX="1496" maxX="1564" minY="990" maxY="1058" name="seafood-shop-m"/>
diff --git a/data/types.txt b/data/types.txt
index 34ac1e3942..4a5865505b 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1570,3 +1570,4 @@ amenity|recycling|container
 *leisure|adult_gaming_centre
 *leisure|amusement_arcade
 *amenity|place_of_worship|christian|mormon
+*amenity|public_bath
diff --git a/data/visibility.txt b/data/visibility.txt
index b6e888493e..a70dd04396 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -130,6 +130,7 @@ world  00000000000000000000  +
         post_office  00000000000000000111  -
         prison  00000000000000000000  -
         pub  00000000000000000000  -
+        public_bath  00000000000000000000  -
         public_bookcase  00000000000000000000  -
         recycling  00000000000000000000  +
             centre  00000000000000000000  -