diff --git a/icons/poi_restaurant_circle.svg b/icons/poi_restaurant_circle.svg
new file mode 100644
index 000000000..c75db433e
--- /dev/null
+++ b/icons/poi_restaurant_circle.svg
@@ -0,0 +1,5 @@
+<svg height="20" width="20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="9.5" fill="#fff" stroke="#000"/>
+ <path style="stroke:#fff;stroke-width:1.34983;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" d="m 4.6563504,3.8749126 c -0.024617,0 -0.049298,0.00289 -0.073464,0.00675 C 4.4421224,3.9044393 4.3214056,3.9910294 4.259358,4.1139979 3.5471662,5.5214258 3.8435632,7.2054367 4.9996589,8.3108315 l 2.0683193,1.9761735 c 0.2040609,0.195332 0.4809903,0.303924 0.767143,0.303924 0.030604,0 0.061237,-0.0016 0.091831,-0.004 l 1.2008695,-0.09727 5.2357883,5.400371 c 0.0813,0.08395 0.195076,0.132813 0.315052,0.135076 h 0.0086 c 0.117289,0 0.228884,-0.04383 0.312224,-0.122921 l 0.897122,-0.857738 c 0.08286,-0.07903 0.128562,-0.186709 0.128562,-0.298518 0,-0.111791 -0.04605,-0.219473 -0.128562,-0.298522 L 4.9671638,3.9991834 C 4.8838483,3.9195002 4.7720451,3.8749126 4.6563504,3.8749126 Z"/>
+ <path style="stroke:#fff;stroke-width:1.50092;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" d="m 14.096728,3.05046 c -0.107027,0 -0.214184,0.040466 -0.296025,0.1220661 L 11.264598,5.7050299 C 10.654981,6.31417 10.602203,7.286362 10.799569,8.064376 l -6.9253111,6.839733 c -0.170723,0.170231 -0.170723,0.447424 0,0.617683 l 0.8998603,0.900054 c 0.1707229,0.170261 0.4483101,0.170261 0.6185618,0 l 6.827476,-6.9610348 c 0.779064,0.1963647 1.774278,0.1883571 2.383204,-0.4202888 l 2.537575,-2.5325035 c 0.163711,-0.1631719 0.163683,-0.4280398 0,-0.5912116 -0.163237,-0.1629231 -0.427368,-0.1629231 -0.590577,0 l -2.254807,2.2501344 c -0.213279,0.2127546 -0.55845,0.2127546 -0.771729,0 -0.212337,-0.2125892 -0.212337,-0.5566307 0,-0.7691639 l 2.24155,-2.2383687 c 0.169447,-0.1693735 0.169447,-0.4449817 0,-0.6147425 -0.170251,-0.1691518 -0.444695,-0.1691518 -0.614143,0 L 12.909677,6.784506 c -0.213279,0.212976 -0.55845,0.212976 -0.771727,0 -0.212837,-0.2125057 -0.212837,-0.5582947 0,-0.7706342 l 2.253331,-2.250134 c 0.163682,-0.1631719 0.163682,-0.4278184 0,-0.5912117 C 14.309661,3.0909271 14.203756,3.05046 14.096728,3.05046 Z"/>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index af0b7d139..bc140e022 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -606,9 +606,9 @@
       "key": "amenity",
       "value": "food_court",
       "object_types": ["node", "area"],
-      "description": "Restaurants are marked by an icon representing a knife and fork.",
+      "description": "Food courts are marked by an icon representing a knife and fork inscribed in a circle.",
       "doc_url": "https://openmaptiles.org/schema/#poi",
-      "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_restaurant.svg"
+      "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_restaurant_circle.svg"
     },
     {
       "key": "amenity",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index b3c61b632..762e244d8 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -75,13 +75,13 @@ var iconDefs = {
     color: Color.poi.consumer,
     description: "Coffee shop",
   },
-  fuel: {
+  food_court: {
     classes: {
-      fuel: ["fuel"],
+      fast_food: ["food_court"],
     },
-    sprite: "poi_fuel",
+    sprite: "poi_restaurant_circle",
     color: Color.poi.consumer,
-    description: "Gas station",
+    description: "Food court",
   },
   fire_station: {
     classes: {
@@ -91,6 +91,14 @@ var iconDefs = {
     color: Color.poi.infrastructure,
     description: "Fire station",
   },
+  fuel: {
+    classes: {
+      fuel: ["fuel"],
+    },
+    sprite: "poi_fuel",
+    color: Color.poi.consumer,
+    description: "Gas station",
+  },
   hospital: {
     classes: {
       hospital: ["hospital"],
@@ -247,7 +255,7 @@ var iconDefs = {
   restaurant: {
     classes: {
       restaurant: ["restaurant"],
-      fast_food: ["fast_food", "food_court"],
+      fast_food: ["fast_food"],
     },
     sprite: "poi_restaurant",
     color: Color.poi.consumer,
@@ -343,6 +351,7 @@ export const poi = {
         ...getSubclasses(iconDefs.supermarket),
         ...getSubclasses(iconDefs.car_shop),
         ...getSubclasses(iconDefs.car_repair),
+        ...getSubclasses(iconDefs.food_court),
         ...getSubclasses(iconDefs.hotel),
         ...getSubclasses(iconDefs.hostel),
         ...getSubclasses(iconDefs.restaurant),
@@ -396,6 +405,7 @@ export const poi = {
       [
         "bus_stop",
         "fire_station",
+        "food_court",
         "hospital",
         "library",
         "museum",
@@ -451,7 +461,7 @@ export const poi = {
       [
         "match",
         ["get", "subclass"],
-        ["bus_stop", "tram_stop", "fuel", "supermarket"],
+        ["bus_stop", "tram_stop", "fuel", "supermarket", "food_court"],
         "",
         label.localizedName,
       ],