diff --git a/icons/poi_fire_station.svg b/icons/poi_fire_station.svg
new file mode 100644
index 000000000..e31d63c78
--- /dev/null
+++ b/icons/poi_fire_station.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 9.9999869,2.0000005 C 10.364897,2.4211076 11.236686,3.372 12,3.372 c 0.763318,0 1.595677,-0.9106143 2,-1.3719995 l 3,2.9433862 c -0.483907,0.8309332 -1.576,2.0557035 -1.576,3.1488485 0,0.7862863 0.281425,1.5310155 0.544,2.1964208 0.226874,0.575267 0.663081,1.230786 0.663081,1.910493 0,2.440975 -1.879079,3.20704 -3.658462,4.171335 L 12.333334,16.71693 C 11.480596,17.179051 10.716372,17.200295 9.9999942,18 9.2836807,17.200312 8.5191362,17.179547 7.6666668,16.716932 L 7.0273686,16.37 C 5.248485,15.404642 3.3689075,14.640038 3.3689075,12.199149 c 0,-0.679673 0.4358009,-1.335235 0.6626959,-1.910493 0.2625556,-0.6654138 0.5447228,-1.4101429 0.5447228,-2.1964208 0,-1.093145 -1.0258979,-2.3889899 -1.5763258,-3.1488485 L 6,2.0000005 c 0.3676222,0.4194715 1.2366843,1.3724729 2,1.3724729 0.7633155,0 1.6192039,-0.9384755 2.000038,-1.3724729 z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.864" stroke-width="1.178" style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-miterlimit:3.864;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"/>
+ <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index 1310dcc3f..70a362a43 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -589,6 +589,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_police_shield.svg"
     },
+    {
+      "key": "amenity",
+      "value": "fire_station",
+      "object_types": ["node", "area"],
+      "description": "Fire stations are marked by an icon representing a firefighter's badge.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_fire_station.svg"
+    },
     {
       "key": "amenity",
       "value": "townhall",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index d9a5ddbcc..8fc48fc6b 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -83,6 +83,14 @@ var iconDefs = {
     color: Color.poi.consumer,
     description: "Gas station",
   },
+  fire_station: {
+    classes: {
+      fire_station: ["fire_station"],
+    },
+    sprite: "poi_fire_station",
+    color: Color.poi.infrastructure,
+    description: "Fire station",
+  },
   hospital: {
     classes: {
       hospital: ["hospital"],
@@ -342,6 +350,7 @@ export const poi = {
       Color.poi.attraction,
       [
         "hospital",
+        "fire_station",
         "parking",
         "police",
         "school",
@@ -376,6 +385,7 @@ export const poi = {
       14,
       [
         "bus_stop",
+        "fire_station",
         "hospital",
         "library",
         "museum",