diff --git a/shop.json b/shop.json
index dadc6bb3d..56f7b2ba9 100644
--- a/shop.json
+++ b/shop.json
@@ -3,10 +3,82 @@
     "query": "(node[shop];way[shop];relation[shop];);",
     "minZoom": 16,
     "feature": {
+        "pre": "{% set current = const.default %}{% for v in const.shops %}{% if tags.shop in v.types %}{% set current = v %}{% endif %}{% endfor %}",
         "body": "{{ tagTrans('shop', tags.shop) }}",
         "description": "{{ tagTrans('shop', tags.shop) }}",
-        "markerSign": "{% set c = { alcohol: 'fa-beer', baby_goods: '&#128700;', bag: 'fa-shopping-bag', bakery: 'fa-birthday-cake', beverages: 'fa-beer', boutique: '&#128090;', butcher: 'fa-cutlery', cheese: 'fa-cutlery', chocolate: 'fa-cutlery', clothes: '&#128090;', coffee: 'ia-coffee', confectionery: 'fa-birthday-cake', convenience: 'fa-shopping-basket', deli: 'fa-cutlery', dairy: 'fa-cutlery', department_store: 'fa-building', fabric: '&#128090;', farm: 'fa-cutlery', fashion: '&#128090;', general: 'fa-shopping-bag', greengrocer: 'fa-cutlery', hairdresser: '&#128113;', ice_cream: '&#127848;', jewelry: '&#128141;', kiosk: 'fa-newspaper-o', leather: '&#128090;', mall: 'fa-building', pasta: 'fa-cutlery', pastry: 'fa-birthday-cake', seafood: 'fa-cutlery', sewing: '&#128090;', shoes: '&#128095;', spices: 'fa-cutlery', supermarket: 'fa-shopping-cart', tailor: '&#128090;', tea: 'fa-coffee', watches: '&#8986;' }[tags.shop]|default('fa-shopping-bag') %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
+        "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
         "__": "need better icons for: bakery, butcher, cheese, ice_cream, ",
         "__": "no icons for: brewing_supplies, charity, second_hand, variety_store"
+    },
+    "const": {
+        "default": {
+            "sign": "fa-shopping-bag"
+        },
+        "shops": [
+            {
+                "types": [ "alcohol", "beverages" ],
+                "sign": "fa-beer"
+            },
+            {
+                "types": [ "baby_goods" ],
+                "sign": "&#128700;"
+            },
+            {
+                "types": [ "bag", "general" ],
+                "sign": "fa-shopping-bag"
+            },
+            {
+                "types": [ "bakery", "confectionery", "pastry" ],
+                "sign": "fa-birthday-cake"
+            },
+            {
+                "types": [ "boutique", "clothes", "fabric", "fashion", "leather", "sewing", "tailor" ],
+                "sign": "&#128090;"
+            },
+            {
+                "types": [ "butcher", "cheese", "chocolate", "deli", "dairy", "farm", "greengrocer", "pasta", "spices" ],
+                "sign": "fa-cutlery"
+            },
+            {
+                 "types": [ "coffee", "tea" ],
+                 "sign": "fa-coffee"
+            },
+            {
+                "types": [ "convenience" ],
+                "sign": "fa-shopping-basket"
+            },
+            {
+                "types": [ "department_store", "mall" ],
+                "sign": "fa-building"
+            },
+            {
+                "types":  [ "hairdresser" ],
+                "sign": "&#128113;"
+            },
+            {
+                "types": [ "ice_cream" ],
+                "sign": "&#127848;"
+            },
+            {
+                "types": [ "jewelry" ],
+                "sign": "&#128141;"
+            },
+            {
+                "types": [ "kiosk" ],
+                "sign": "fa-newspaper-o"
+            },
+            {
+                "types": [ "shoes" ],
+                "sign": "&#128095;"
+            },
+            {
+                "types": [ "supermarket" ],
+                "sign": "fa-shopping-cart"
+            },
+            {
+                "types": [ "watches" ],
+                "sign": "&#8986;"
+            }
+        ]
     }
 }