diff --git a/icons/poi_coffee_cup.svg b/icons/poi_coffee_cup.svg
new file mode 100644
index 000000000..defeb2415
--- /dev/null
+++ b/icons/poi_coffee_cup.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="cafe" width="20" height="17.092" version="1.1" viewBox="0 0 20 17.092" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15.815 4.185h-2.9075v-2.9075h-11.63v5.815c0.019335 3.2115 2.6384 5.7992 5.8499 5.7798 2.0505-0.01236 3.9429-1.1037 4.9806-2.8723h3.7071c1.6058 0 2.9075-1.3017 2.9075-2.9075 0-1.6058-1.3017-2.9075-2.9075-2.9075zm0 4.3613h-3.111c0.12895-0.47407 0.19742-0.96253 0.20352-1.4538v-1.4538h2.9075c0.80291 0 1.4538 0.65085 1.4538 1.4538 0 0.80291-0.65085 1.4538-1.4538 1.4538zm-2.9075 6.5419c0 0.40138-0.3255 0.72688-0.72688 0.72688h-10.176c-0.40138 0-0.72688-0.3255-0.72688-0.72688s0.3255-0.72688 0.72688-0.72688h10.176c0.40138 0 0.72688 0.3255 0.72688 0.72688z" fill="#bf5700" stroke="#f9f5f0" stroke-width="2.5549" style="paint-order:stroke fill markers"/>
+</svg>
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 391afc7f4..9d090a537 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -3,6 +3,7 @@ import * as Color from "../constants/color.js";
 
 var iconDefs = {
   bar: ["bar", "beer", "pub"],
+  coffee: ["cafe"],
   hospital: "hospital",
   medical: ["doctors", "clinic"],
   parking: "parking",
@@ -20,7 +21,7 @@ export const poi = {
     "text-color": [
       "match",
       ["get", "subclass"],
-      [...iconDefs.bar],
+      [...iconDefs.bar, ...iconDefs.coffee],
       Color.poi.consumer,
       ["hospital", "parking"],
       Color.poi.infrastructure,
@@ -35,7 +36,7 @@ export const poi = {
       ["get", "subclass"],
       "hospital",
       15,
-      [...iconDefs.bar],
+      [...iconDefs.bar, ...iconDefs.coffee],
       16,
       ["clinic", "doctors", "parking"],
       17,
@@ -57,6 +58,8 @@ export const poi = {
       ["get", "subclass"],
       iconDefs.bar,
       "poi_martini_glass",
+      iconDefs.coffee,
+      "poi_coffee_cup",
       iconDefs.medical,
       "poi_health_cross",
       iconDefs.hospital,
@@ -90,6 +93,11 @@ export const legendEntries = [
     layers: [poi.id],
     filter: ["in", ["get", "subclass"], ["literal", iconDefs.medical]],
   },
+  {
+    description: "Coffee shop",
+    layers: [poi.id],
+    filter: ["in", ["get", "subclass"], ["literal", iconDefs.coffee]],
+  },
   {
     description: "Bar or pub",
     layers: [poi.id],