diff --git a/icons/poi_fuel.svg b/icons/poi_fuel.svg
new file mode 100644
index 000000000..319fc60b0
--- /dev/null
+++ b/icons/poi_fuel.svg
@@ -0,0 +1,4 @@
+<svg height="19" width="17" viewBox="0 0 10.88 12.159" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m 2.56,0.63952506 c -0.292175,0 -0.626841,0.19231545 -0.871994,0.44443054 C 1.442854,1.3360706 1.28,1.6412754 1.28,1.9195251 V 10.239305 H 0.63999999 v 1.28 H 8.32 v -1.28 H 7.68 V 6.3995253 c 0.0397,-0.00583 0.298117,0 0.331809,0 0.09683,3.661e-4 0.162958,0.032751 0.219256,0.08778 0.05398,0.05276 0.08893,0.1291665 0.08893,0.2082434 0,0.1197024 6e-6,0.2538085 6e-6,0.3439767 0,0.2465615 9.2e-4,0.1761603 0,0.2465615 V 8.304136 c -7.53e-4,0.3996224 0.06491,0.6591943 0.259204,0.9060271 0.168859,0.2145253 0.418651,0.405448 0.71249,0.4039402 C 9.59714,9.6142758 9.823927,9.4980142 9.987807,9.3039118 10.206372,9.0450387 10.241117,8.7159226 10.24,8.3192938 V 4.4795252 C 10.240016,4.2905105 10.240015,4.159245 10.2248,4.0528723 10.211066,3.9568906 10.184946,3.881176 10.13527,3.8015909 9.978139,3.6182333 9.931068,3.5550881 9.74362,3.3629436 9.142118,2.7475949 8.597904,2.2034932 8.597323,2.2029331 L 8.32,1.9195139 7.951602,2.2977911 8.72761,3.4760876 l 0.0079,0.017144 c 0.0042,0.012728 0.0079,0.033438 0.0079,0.060571 0.0011,0.058235 -0.02016,0.1417683 -0.05258,0.2000018 L 8.62226,3.8795197 C 8.54341,4.0250171 8.49641,4.2861228 8.498831,4.4955254 c 0.0019,0.1686593 0.03725,0.3519687 0.110859,0.4937187 0,0 0.07505,0.1440216 0.128,0.2045734 0.141102,0.1613526 0.311606,0.2994111 0.494793,0.4107078 0.113628,0.069036 0.36752,0.155 0.36752,0.155 V 8.2889645 C 9.598903,8.5267869 9.6,8.7544779 9.534613,8.8429914 9.480773,8.9158684 9.38049,8.9592938 9.288927,8.9592938 c -0.09156,0 -0.181048,-0.064161 -0.232349,-0.1382596 C 8.952558,8.6707873 8.960753,8.5405715 8.96,8.2813854 V 7.0395253 C 8.959968,6.9434093 8.959976,6.7797205 8.959987,6.631081 8.959993,6.542825 8.96,6.4598751 8.96,6.3995253 8.96,6.2002885 8.8864,6.0607668 8.769973,5.9449279 8.654971,5.830509 8.498955,5.7595141 8.32,5.7595141 l -0.64,1.12e-5 V 1.9195251 C 7.680014,1.6639434 7.561746,1.4076839 7.329006,1.1453167 7.096267,0.88294953 6.714844,0.63952506 6.4,0.63952506 Z" style="display:inline;stroke:#fff;stroke-width:1.28;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill"/>
+ <path style="display:inline;fill:#fff;fill-opacity:1;stroke:none;stroke-width:1.28;stroke-linejoin:round;stroke-dasharray:none;paint-order:markers stroke fill" d="M 2.56,1.9198051 H 6.4 l -2e-7,2.5595249 H 2.5599999 Z"/>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index d6055d37e..48cbf2850 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -383,6 +383,14 @@
       "description": "Intermittent lakes are translucent with a dashed line representing the lakeshore.",
       "doc_url": "https://openmaptiles.org/schema/#water"
     },
+    {
+      "key": "amenity",
+      "value": "fuel",
+      "object_types": ["node", "area"],
+      "description": "Fuel stations are marked by an icon representing a gas pump.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_fuel.svg"
+    },
     {
       "key": "amenity",
       "value": "school",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 9e1ae3866..e7df969d5 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -43,6 +43,14 @@ var iconDefs = {
     color: Color.poi.consumer,
     description: "Coffee shop",
   },
+  fuel: {
+    classes: {
+      fuel: ["fuel"],
+    },
+    sprite: "poi_fuel",
+    color: Color.poi.consumer,
+    description: "Gas station",
+  },
   hospital: {
     classes: {
       hospital: ["hospital"],
@@ -238,7 +246,11 @@ export const poi = {
     "text-color": [
       "match",
       ["get", "subclass"],
-      [...getSubclasses(iconDefs.bar), ...getSubclasses(iconDefs.coffee)],
+      [
+        ...getSubclasses(iconDefs.fuel),
+        ...getSubclasses(iconDefs.bar),
+        ...getSubclasses(iconDefs.coffee),
+      ],
       Color.poi.consumer,
       [
         "bus_station",
@@ -284,6 +296,7 @@ export const poi = {
         "hospital",
         "museum",
         "police",
+        ...getSubclasses(iconDefs.fuel),
         ...getSubclasses(iconDefs.pow_buddhist),
         ...getSubclasses(iconDefs.pow_christian),
         ...getSubclasses(iconDefs.pow_hindu),
@@ -322,7 +335,7 @@ export const poi = {
       [
         "match",
         ["get", "subclass"],
-        ["bus_stop", "tram_stop"],
+        ["bus_stop", "tram_stop", "fuel"],
         "",
         label.localizedName,
       ],