diff --git a/layers/poi/style.json b/layers/poi/style.json
index 33c08857..ad246b5f 100644
--- a/layers/poi/style.json
+++ b/layers/poi/style.json
@@ -22,7 +22,13 @@
             ]
           ]
         },
-        "icon-image": "{subclass}",
+        "icon-image": [
+          "match",
+          ["get", "subclass"],
+          "chocolate",
+          "confectionery",
+          ["get", "subclass"]
+        ],
         "text-field": "{name:latin}\n{name:nonlatin}",
         "visibility": "visible",
         "text-anchor": "top",
@@ -99,7 +105,13 @@
             ]
           ]
         },
-        "icon-image": "{subclass}",
+        "icon-image": [
+          "match",
+          ["get", "subclass"],
+          "chocolate",
+          "confectionery",
+          ["get", "subclass"]
+        ],
         "text-field": "{name:latin}\n{name:nonlatin}",
         "visibility": "visible",
         "text-anchor": "top",