diff --git a/data/presets.yaml b/data/presets.yaml
index 5dcf1bb1a..67487b1ac 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1120,6 +1120,9 @@ en:
       shop/pet: 
         name: Pet Store
         terms: "<translate with synonyms or related terms for 'Pet Store', separated by commas>"
+      shop/photo: 
+        name: Photography Store
+        terms: "<translate with synonyms or related terms for 'Photography Store', separated by commas>"
       shop/shoes: 
         name: Shoe Store
         terms: "<translate with synonyms or related terms for 'Shoe Store', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4089189e7..3efafbff8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2490,7 +2490,8 @@
             "landuse": "farmyard"
         },
         "terms": [],
-        "name": "Farmyard"
+        "name": "Farmyard",
+        "icon": "farm"
     },
     "landuse/forest": {
         "fields": [
@@ -2633,7 +2634,8 @@
         "tags": {
             "leisure": "dog_park"
         },
-        "name": "Dog Park"
+        "name": "Dog Park",
+        "icon": "dog-park"
     },
     "leisure/garden": {
         "icon": "garden",
@@ -2960,7 +2962,8 @@
         "tags": {
             "man_made": "lighthouse"
         },
-        "name": "Lighthouse"
+        "name": "Lighthouse",
+        "icon": "lighthouse"
     },
     "man_made/observation": {
         "geometry": [
@@ -3787,7 +3790,7 @@
         "name": "Liquor Store"
     },
     "shop/bakery": {
-        "icon": "shop",
+        "icon": "bakery",
         "fields": [
             "address",
             "building_area",
@@ -3979,7 +3982,7 @@
         "name": "Chemist"
     },
     "shop/clothes": {
-        "icon": "shop",
+        "icon": "clothing-store",
         "fields": [
             "address",
             "building_area",
@@ -4499,7 +4502,7 @@
         "name": "Outdoor Store"
     },
     "shop/pet": {
-        "icon": "shop",
+        "icon": "dog-park",
         "fields": [
             "address",
             "building_area",
@@ -4515,6 +4518,23 @@
         },
         "name": "Pet Store"
     },
+    "shop/photo": {
+        "icon": "camera",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "shop": "photo"
+        },
+        "name": "Photography Store"
+    },
     "shop/shoes": {
         "icon": "shop",
         "fields": [
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index b49dc658c..c2587ceb3 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -7,5 +7,6 @@
         "landuse": "farmyard"
     },
     "terms": [],
-    "name": "Farmyard"
+    "name": "Farmyard",
+    "icon": "farm"
 }
\ No newline at end of file
diff --git a/data/presets/presets/leisure/dog_park.json b/data/presets/presets/leisure/dog_park.json
index 356e7516a..de2b301f0 100644
--- a/data/presets/presets/leisure/dog_park.json
+++ b/data/presets/presets/leisure/dog_park.json
@@ -8,5 +8,6 @@
     "tags": {
         "leisure": "dog_park"
     },
-    "name": "Dog Park"
-}
\ No newline at end of file
+    "name": "Dog Park",
+    "icon": "dog-park"
+}
diff --git a/data/presets/presets/man_made/lighthouse.json b/data/presets/presets/man_made/lighthouse.json
index 2abea4a83..65824061d 100644
--- a/data/presets/presets/man_made/lighthouse.json
+++ b/data/presets/presets/man_made/lighthouse.json
@@ -6,5 +6,6 @@
     "tags": {
         "man_made": "lighthouse"
     },
-    "name": "Lighthouse"
-}
\ No newline at end of file
+    "name": "Lighthouse",
+    "icon": "lighthouse"
+}
diff --git a/data/presets/presets/shop/bakery.json b/data/presets/presets/shop/bakery.json
index 01450a71b..51113eacf 100644
--- a/data/presets/presets/shop/bakery.json
+++ b/data/presets/presets/shop/bakery.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "bakery",
     "fields": [
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/clothes.json b/data/presets/presets/shop/clothes.json
index b77f9d0ee..4e0cbc454 100644
--- a/data/presets/presets/shop/clothes.json
+++ b/data/presets/presets/shop/clothes.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "clothing-store",
     "fields": [
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/pet.json b/data/presets/presets/shop/pet.json
index a898a7c57..c4cb0cd01 100644
--- a/data/presets/presets/shop/pet.json
+++ b/data/presets/presets/shop/pet.json
@@ -1,5 +1,5 @@
 {
-    "icon": "shop",
+    "icon": "dog-park",
     "fields": [
         "address",
         "building_area",
diff --git a/data/presets/presets/shop/photo.json b/data/presets/presets/shop/photo.json
new file mode 100644
index 000000000..306b40789
--- /dev/null
+++ b/data/presets/presets/shop/photo.json
@@ -0,0 +1,17 @@
+{
+    "icon": "camera",
+    "fields": [
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "shop": "photo"
+    },
+    "name": "Photography Store"
+}
\ No newline at end of file
diff --git a/dist/locales/en.json b/dist/locales/en.json
index da2c3ddab..aa5c88dc1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1911,6 +1911,10 @@
                 "name": "Pet Store",
                 "terms": ""
             },
+            "shop/photo": {
+                "name": "Photography Store",
+                "terms": ""
+            },
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""