diff --git a/icons/poi_supermarket.svg b/icons/poi_supermarket.svg
new file mode 100644
index 000000000..561510454
--- /dev/null
+++ b/icons/poi_supermarket.svg
@@ -0,0 +1,3 @@
+<svg height="19" width="19" viewBox="0 0 12.16 12.16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000;fill-opacity:1;stroke:#fff;stroke-width:1.27986;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" d="M 1.6464285,1.5570727 H 1.3907259 C 1.1883537,1.5606128 1.0065743,1.6585793 1.0065743,1.8733562 1.0041043,2.0466745 1.158377,2.1953429 1.3903595,2.197077 l 0.256069,0.039975 c 0.3733272,0.054631 0.5582254,0.4041328 0.5935928,0.6120636 l 0.850977,6.2456491 c 0.1263519,0.7163351 0.7589726,0.7821945 1.4863902,0.7824216 h 6.0269995 c 0.239568,-0.00222 0.37756,-0.082306 0.37756,-0.3215823 0,-0.2394767 -0.137984,-0.318689 -0.37756,-0.3184264 H 4.5916898 c -0.1239585,0 -0.7141986,0.032341 -0.7745978,-0.258719 L 3.6899846,8.3659241 10.041304,7.8483044 c 0.607942,-0.057538 1.13959,-0.421442 1.276723,-1.0164985 0,0 0.566069,-3.0184888 0.566069,-3.1141362 0,-0.2645093 -0.0574,-0.4420797 -0.209485,-0.5806282 C 11.379365,2.8680762 10.894978,2.8673846 10.514709,2.8370902 H 3.0757756 c 0,0 0.02045,-0.1967076 -0.1273898,-0.4698257 C 2.8005471,2.0941474 2.5462835,1.8791668 2.2759808,1.7324779 2.0056783,1.5857889 1.6464285,1.5570727 1.6464285,1.5570727 Z m 2.7782158,8.9424303 c -0.5150544,0 -0.9758385,0.433879 -0.9758385,0.948732 0,0.514852 0.4684952,0.988986 0.9835494,0.988986 0.5150291,0 0.9559297,-0.474134 0.9559297,-0.988986 -2.53e-5,-0.514853 -0.4486116,-0.948732 -0.9636406,-0.948732 z m 4.819558,0 c -0.5150545,0 -0.9636407,0.433879 -0.9636407,0.948732 0,0.514852 0.460967,0.988986 0.9760211,0.988986 0.5150294,0 0.9621043,-0.474134 0.9621043,-0.988986 -2.5e-5,-0.514853 -0.4594556,-0.948732 -0.9744847,-0.948732 z" transform="matrix(1.00023 0 0 .99999 -.367 -.917)"/>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index 48cbf2850..868967ced 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -632,7 +632,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_taoist.svg"
     },
-
+    {
+      "key": "shop",
+      "value": "supermarket",
+      "object_types": ["node", "area"],
+      "description": "Supermarkets are marked by an icon representing a grocery cart.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_supermarket.svg"
+    },
     {
       "key": "highway",
       "value": "motorway",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index e7df969d5..c2447533d 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -180,6 +180,14 @@ var iconDefs = {
     color: Color.poi.infrastructure,
     description: "School",
   },
+  supermarket: {
+    classes: {
+      grocery: ["supermarket"],
+    },
+    sprite: "poi_supermarket",
+    color: Color.poi.consumer,
+    description: "Supermarket",
+  },
   college: {
     classes: {
       college: ["college", "university"],
@@ -250,6 +258,7 @@ export const poi = {
         ...getSubclasses(iconDefs.fuel),
         ...getSubclasses(iconDefs.bar),
         ...getSubclasses(iconDefs.coffee),
+        ...getSubclasses(iconDefs.supermarket),
       ],
       Color.poi.consumer,
       [
@@ -306,6 +315,7 @@ export const poi = {
         ...getSubclasses(iconDefs.pow_shinto),
         ...getSubclasses(iconDefs.pow_taoist),
         ...getSubclasses(iconDefs.school),
+        ...getSubclasses(iconDefs.supermarket),
         "townhall",
         "tram_stop",
       ],
@@ -335,7 +345,7 @@ export const poi = {
       [
         "match",
         ["get", "subclass"],
-        ["bus_stop", "tram_stop", "fuel"],
+        ["bus_stop", "tram_stop", "fuel", "supermarket"],
         "",
         label.localizedName,
       ],