diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index 80d59f125..b983c79b2 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -658,6 +658,7 @@
     <string name="type.leisure.marina">Marina</string>
     <string name="type.leisure.nature_reserve">Nature Reserve</string>
     <string name="type.leisure.outdoor_seating">Outdoor Seating</string>
+    <string name="type.leisure.firepit">Firepit</string>
     <string name="type.leisure.park">Park</string>
     <string name="type.leisure.park.no.access">Private Park</string>
     <string name="type.leisure.park.permissive">Park</string>
diff --git a/data/categories.txt b/data/categories.txt
index d3f736415..a22673ce8 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -4921,6 +4921,9 @@ sk:2Záhrada
 sw:Bustani
 fa:باغ تفریحی
 
+leisure-firepit
+en:5Firepit
+
 amenity-bench
 en:Bench
 ru:Скамейка|лавка
diff --git a/data/editor.config b/data/editor.config
index 645bc0f7b..c13fb13b4 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1093,6 +1093,8 @@
         <include field="name" />
         <include field="opening_hours" />
       </type>
+      <type id="leisure-firepit">
+      </type>
       <type id="leisure-dog_park">
         <include field="name" />
         <include field="opening_hours" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 68e9d2927..c93fc2118 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -667,7 +667,7 @@ deprecated|deprecated;547;x
 deprecated|deprecated;548;x
 deprecated|deprecated;549;x
 waterway|lock_gate;550;
-deprecated|deprecated;551;x
+leisure|firepit;551;
 deprecated|deprecated;552;x
 deprecated|deprecated;553;x
 deprecated|deprecated;554;x
diff --git a/data/styles/default/dark/symbols/firepit-m.svg b/data/styles/default/dark/symbols/firepit-m.svg
new file mode 100644
index 000000000..154622f65
--- /dev/null
+++ b/data/styles/default/dark/symbols/firepit-m.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg height="14" id="svg109" version="1.1"
+    viewBox="0 0 14 14" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <defs id="defs113" />
+  <metadata id="metadata115">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path style="fill:#C15746;fill-opacity:0.6;stroke:none"
+      d="M 5.8613281 -0.01171875 C 7.4948435 3.3410494 -1.0755672 5.5380484 6.3769531 10.130859 L 6.6992188 10.013672 C 4.8436378 7.328355 12.374438 4.1804808 5.8613281 -0.01171875 z M 9.25 3.4238281 C 10.300411 6.5115557 6.7139152 7.3962701 7.8398438 9.5976562 L 9.5292969 8.984375 C 10.207099 7.3309044 11.943051 5.9976828 9.25 3.4238281 z M 1.4746094 8.9980469 A 0.50005 0.50005 0 0 0 1.3300781 9.9707031 L 5.5449219 11.503906 L 1.3320312 13.035156 A 0.49426052 0.49426052 0 0 0 1.6679688 13.964844 L 6.9902344 12.029297 L 12.330078 13.970703 A 0.50043461 0.50043461 0 0 0 12.669922 13.029297 L 8.4550781 11.496094 L 12.667969 9.9648438 A 0.49422068 0.49422068 0 0 0 12.509766 9.0039062 A 0.49422068 0.49422068 0 0 0 12.332031 9.0351562 L 7.0097656 10.970703 L 1.6699219 9.0292969 A 0.50005 0.50005 0 0 0 1.4746094 8.9980469 z "
+      id="path4157-6" />
+</svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 0bea74c01..ddac0c397 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1083,6 +1083,7 @@ node|z18-[man_made=water_tower],
 node|z18-[man_made=tower],
 node|z18-[amenity=bbq],
 area|z18-[amenity=bbq],
+node|z18-[leisure=firepit],
 node|z18-[amenity=brothel],
 area|z18-[amenity=brothel],
 node|z18-[amenity=stripclub],
@@ -1849,6 +1850,9 @@ node|z18-[amenity=bbq],
 area|z18-[amenity=bbq]
 {icon-image: bbq-m.svg;font-size: 11;}
 
+node|z18-[leisure=firepit],
+{icon-image: firepit-m.svg;font-size: 11;}
+
 node|z18-[man_made=survey_point],
 {icon-image: survey_point-m.svg;font-size: 11;}
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 49b67a2e4..ba94b140b 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1170,6 +1170,7 @@ office                                              # icon z18- (also has captio
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
+leisure-firepit
 amenity-bbq                                         # icon z18- (also has caption(optional) z18-)
 amenity-public_bookcase                             # icon z18- (also has caption(optional) z18-)
 cemetery-grave                                      # icon z17- (also has caption(optional) z17-)
@@ -2095,6 +2096,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
+# leisure-firepit
 # amenity-bbq                                       # caption(optional) z18- (also has icon z18-)
 # amenity-public_bookcase                           # caption(optional) z18- (also has icon z18-)
 # cemetery-grave                                    # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/default/light/symbols/firepit-m.svg b/data/styles/default/light/symbols/firepit-m.svg
new file mode 100644
index 000000000..8703855b1
--- /dev/null
+++ b/data/styles/default/light/symbols/firepit-m.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg height="14" id="svg109" version="1.1"
+    viewBox="0 0 14 14" width="14" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <defs id="defs113" />
+  <metadata id="metadata115">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:title></dc:title>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path style="fill:#C15746;fill-opacity:1;stroke:none"
+      d="M 5.8613281 -0.01171875 C 7.4948435 3.3410494 -1.0755672 5.5380484 6.3769531 10.130859 L 6.6992188 10.013672 C 4.8436378 7.328355 12.374438 4.1804808 5.8613281 -0.01171875 z M 9.25 3.4238281 C 10.300411 6.5115557 6.7139152 7.3962701 7.8398438 9.5976562 L 9.5292969 8.984375 C 10.207099 7.3309044 11.943051 5.9976828 9.25 3.4238281 z M 1.4746094 8.9980469 A 0.50005 0.50005 0 0 0 1.3300781 9.9707031 L 5.5449219 11.503906 L 1.3320312 13.035156 A 0.49426052 0.49426052 0 0 0 1.6679688 13.964844 L 6.9902344 12.029297 L 12.330078 13.970703 A 0.50043461 0.50043461 0 0 0 12.669922 13.029297 L 8.4550781 11.496094 L 12.667969 9.9648438 A 0.49422068 0.49422068 0 0 0 12.509766 9.0039062 A 0.49422068 0.49422068 0 0 0 12.332031 9.0351562 L 7.0097656 10.970703 L 1.6699219 9.0292969 A 0.50005 0.50005 0 0 0 1.4746094 8.9980469 z "
+      id="path4157-6" />
+</svg>
\ No newline at end of file
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 751d73306..1e128be0e 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -213,6 +213,7 @@ node|z16-[leisure=picnic_table],
 area|z16-[leisure=picnic_table],
 node|z16-[amenity=bbq],
 area|z16-[amenity=bbq],
+node|z16-[leisure=firepit],
 node|z13-[amenity=shelter],
 area|z13-[amenity=shelter],
 node|z13-[amenity=shelter][shelter_type=basic_hut],
@@ -276,6 +277,9 @@ node|z16-[amenity=bbq],
 area|z16-[amenity=bbq],
 {icon-image: bbq-m.svg; font-size: 11;}
 
+node|z16-[leisure=firepit],
+{icon-image: firepit-m.svg; font-size: 11;}
+
 node|z12-[amenity=shelter],
 node|z12-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-s.svg; icon-min-distance: 10; font-size: 11;}
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index e6f1a9003..d6bc66da6 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1172,6 +1172,7 @@ office                                              # icon z18- (also has captio
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
+leisure-firepit
 amenity-bbq                                         # icon z16- (also has caption(optional) z16-)
 amenity-public_bookcase                             # icon z18- (also has caption(optional) z18-)
 cemetery-grave                                      # icon z17- (also has caption(optional) z17-)
@@ -2100,6 +2101,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
+# leisure-firepit
 # amenity-bbq                                       # caption(optional) z16- (also has icon z16-)
 # amenity-public_bookcase                           # caption(optional) z18- (also has icon z18-)
 # cemetery-grave                                    # caption(optional) z17- (also has icon z17-)
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 5a2d8f1b1..b992a7890 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2479,6 +2479,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"leisure", "fitness_centre"},
     {"leisure", "fitness_station"},
     {"leisure", "garden"},
+    {"leisure", "firepit"},
     {"leisure", "golf_course"},
     {"leisure", "ice_rink"},
     {"leisure", "marina"},
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index b241ff2e1..b9cde2710 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -736,6 +736,7 @@
 "type.leisure.marina" = "Marina";
 "type.leisure.nature_reserve" = "Nature Reserve";
 "type.leisure.outdoor_seating" = "Outdoor Seating";
+"type.leisure.firepit" = "Firepit";
 "type.leisure.park" = "Park";
 "type.leisure.park.no.access" = "Private Park";
 "type.leisure.park.permissive" = "Park";