diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json
index e4d1304c9b..0b024ebf90 100644
--- a/assets/themes/pets/pets.json
+++ b/assets/themes/pets/pets.json
@@ -40,10 +40,12 @@
   ],
   "layers": [
     "dogpark",
+    "veterinary",
+    "animal_shelter",
     {
       "builtin": "food",
       "override": {
-        "id": "dogfoodb",
+        "id": "food_dog_friendly",
         "name": {
           "en": "Dog friendly eateries",
           "da": "Hundevenlige madsteder",
@@ -62,28 +64,15 @@
         },
         "pointRendering": [
           {
-            "location": [
-              "point",
-              "centroid"
-            ],
-            "marker": [
-              {
-                "icon": "./assets/themes/pets/dog-food.svg"
-              }
-            ],
-            "iconSize": "30,30"
+            "iconBadges+": [
+              "icons.dogicon"
+            ]
           }
         ],
         "=presets": [],
         "source": {
-          "=osmTags": {
-            "and": [
-              {
-                "or": [
-                  "amenity=restaurant",
-                  "amenity=cafe"
-                ]
-              },
+          "osmTags": {
+            "and+": [
               {
                 "or": [
                   "dog=unleashed",
@@ -97,10 +86,20 @@
       }
     },
     {
-      "builtin": "shops",
-      "id": "dogshop",
+      "builtin": "food",
       "override": {
-        "id": "dogshop",
+        "minzoom": 18,
+        "isCounted": false,
+        "filter": {
+          "sameAs": "food_dog_friendly"
+        },
+        "name": null
+      }
+    },
+    {
+      "builtin": "shops",
+      "override": {
+        "id": "shop_dog_friendly",
         "name": {
           "en": "Dog-friendly shops",
           "da": "hundevenlig butik",
@@ -117,77 +116,21 @@
           "it": "Negozi che accettano i cani",
           "ko": "반려견 친화적 상점"
         },
-        "title": {
-          "render": {
-            "en": "Dog-friendly shops",
-            "da": "hundevenlig butik",
-            "de": "Hundefreundliche Geschäfte",
-            "nb_NO": "Hundevennlige butikker",
-            "nl": "Hondvriendelijke winkels",
-            "fr": "Magasins acceptant les chiens",
-            "ca": "Botigues amigues dels gossos",
-            "pa_PK": "کُتیاں دی اِجازت دیاں دکاناں",
-            "es": "Tiendas que admiten perros",
-            "cs": "Obchody vhodné pro vstup se psy",
-            "zh_Hant": "寵物友善商家",
-            "pl": "Sklepy przyjazne psom",
-            "it": "Negozi che accettano i cani",
-            "hu": "Kutyabarát üzletek",
-            "ko": "반려견 친화적 상점"
-          },
-          "mappings": [
-            {
-              "if": "name~*",
-              "then": {
-                "*": "{name}"
-              }
-            }
-          ]
-        },
         "pointRendering": [
           {
-            "location": [
-              "point",
-              "centroid"
-            ],
-            "marker": [
-              {},
-              {
-                "icon": {
-                  "render": "./assets/themes/pets/dogshop.svg",
-                  "+mappings": [
-                    {
-                      "if": {
-                        "and": [
-                          "shop=pet"
-                        ]
-                      },
-                      "then": "./assets/themes/pets/petshop.svg"
-                    }
-                  ]
-                }
-              }
-            ],
-            "iconSize": "30,30"
-          }
-        ],
-        "=lineRendering": [
-          {
-            "#": "Rendering of a line",
-            "color": "#ff0",
-            "width": 5
+            "iconBadges+": [
+              "icons.dogicon"
+            ]
           }
         ],
         "=presets": [],
         "source": {
-          "=osmTags": {
-            "and": [
-              "shop~*",
+          "osmTags": {
+            "and+": [
               {
                 "or": [
                   "dog=leashed",
-                  "dog=yes",
-                  "shop=pet"
+                  "dog=yes"
                 ]
               }
             ]
@@ -195,12 +138,13 @@
         }
       }
     },
-    "veterinary",
     {
-      "builtin": "food",
+      "builtin": "shops",
       "override": {
         "minzoom": 18,
-        "filter": null,
+        "filter": {
+          "sameAs": "shop_dog_friendly"
+        },
         "name": null
       }
     },
@@ -211,51 +155,6 @@
         "filter": null,
         "name": null
       }
-    },
-    {
-      "builtin": "shops",
-      "override": {
-        "minzoom": 18,
-        "filter": null,
-        "presets": [
-          {
-            "title": {
-              "en": "dog-friendly shop",
-              "da": "EN hundevenlig butik",
-              "de": "hundefreundliches Geschäft",
-              "nb_NO": "hundevennlig butikk",
-              "nl": "Hondvriendelijke winkels",
-              "fr": "magasin acceptant les chiens",
-              "ca": "botiga amiga dels gossos",
-              "pa_PK": "کُتیاں دی اِجازت دی دکان",
-              "es": "tienda que admite perros",
-              "cs": "obchod vhodný pro vstup se psem",
-              "zh_Hant": "寵物友善商家",
-              "pl": "sklep przyjazny psom",
-              "ko": "반려견 친화적 상점"
-            },
-            "tags": [
-              "dog=yes",
-              "shop=yes"
-            ],
-            "description": {
-              "en": "A shop where you can bring a dog almost everywhere",
-              "da": "En butik hvor man kan tage en hund med næsten overalt",
-              "de": "Ein Geschäft, in das man Hunde fast überall mitnehmen kann",
-              "nl": "Een winkel waar je je hond in bijna overal mag meenemen",
-              "fr": "Un magasin où vous pouvez amener votre chien presque partout",
-              "ca": "Una botiga on pots dur al gos gairebé a tot arreu",
-              "es": "Una tienda donde puedes llevar a un perro casi a todas partes",
-              "cs": "Obchod, ve kterém si můžete vzít psa téměř kamkoli",
-              "zh_Hant": "你幾乎可以攜帶寵物到處去的商店",
-              "pl": "Sklep, w którym niemal wszędzie można zabrać psa",
-              "ko": "반려견과 함께할 수 있는 상점"
-            }
-          }
-        ],
-        "name": null
-      }
-    },
-    "animal_shelter"
+    }
   ]
 }