diff --git a/data/presets.yaml b/data/presets.yaml
index bc1dff4c2..9708240f9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -167,6 +167,9 @@ en:
       barrier:
         # barrier=*
         label: Type
+      beauty:
+        # beauty=*
+        label: Shop Type
       bench:
         # bench=*
         label: Bench
@@ -3350,8 +3353,12 @@ en:
       shop/beauty/nails:
         # 'shop=beauty, beauty=nails'
         name: Nail Salon
-        # 'terms: Nail Salon,nails'
+        # 'terms: manicure,pedicure'
         terms: '<translate with synonyms or related terms for ''Nail Salon'', separated by commas>'
+      shop/beauty/tanning:
+        # 'shop=beauty, beauty=tanning'
+        name: Tanning Salon
+        terms: '<translate with synonyms or related terms for ''Tanning Salon'', separated by commas>'
       shop/bed:
         # shop=bed
         name: Bedding/Mattress Store
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 26109b5c0..534fba5cf 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -222,6 +222,11 @@
         "type": "typeCombo",
         "label": "Type"
     },
+    "beauty": {
+        "key": "beauty",
+        "type": "combo",
+        "label": "Shop Type"
+    },
     "bench": {
         "key": "bench",
         "type": "check",
diff --git a/data/presets/fields/beauty.json b/data/presets/fields/beauty.json
new file mode 100644
index 000000000..e3ded3f79
--- /dev/null
+++ b/data/presets/fields/beauty.json
@@ -0,0 +1,5 @@
+{
+    "key": "beauty",
+    "type": "combo",
+    "label": "Shop Type"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 77864d9a3..a1bf496a8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8488,7 +8488,8 @@
             "operator",
             "address",
             "building_area",
-            "opening_hours"
+            "opening_hours",
+            "beauty"
         ],
         "geometry": [
             "point",
@@ -8507,9 +8508,9 @@
     "shop/beauty/nails": {
         "icon": "shop",
         "fields": [
-            "shop",
-            "building_area",
+            "operator",
             "address",
+            "building_area",
             "opening_hours"
         ],
         "geometry": [
@@ -8517,8 +8518,8 @@
             "area"
         ],
         "terms": [
-            "Nail Salon",
-            "nails"
+            "manicure",
+            "pedicure"
         ],
         "tags": {
             "shop": "beauty",
@@ -8526,6 +8527,24 @@
         },
         "name": "Nail Salon"
     },
+    "shop/beauty/tanning": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "beauty",
+            "beauty": "tanning"
+        },
+        "name": "Tanning Salon"
+    },
     "shop/bed": {
         "icon": "lodging",
         "fields": [
diff --git a/data/presets/presets/shop/beauty.json b/data/presets/presets/shop/beauty.json
index 0a7de093b..c4a4b4195 100644
--- a/data/presets/presets/shop/beauty.json
+++ b/data/presets/presets/shop/beauty.json
@@ -4,7 +4,8 @@
         "operator",
         "address",
         "building_area",
-        "opening_hours"
+        "opening_hours",
+        "beauty"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/shop/beauty/nails.json b/data/presets/presets/shop/beauty/nails.json
index 3642fce77..59e87b9e6 100644
--- a/data/presets/presets/shop/beauty/nails.json
+++ b/data/presets/presets/shop/beauty/nails.json
@@ -1,10 +1,9 @@
-
 {
     "icon": "shop",
     "fields": [
-    	"shop",
-        "building_area",
+        "operator",
         "address",
+        "building_area",
         "opening_hours"
     ],
     "geometry": [
@@ -12,8 +11,8 @@
         "area"
     ],
     "terms": [
-        "Nail Salon",
-        "nails"
+        "manicure",
+        "pedicure"
     ],
     "tags": {
         "shop": "beauty",
diff --git a/data/presets/presets/shop/beauty/tanning.json b/data/presets/presets/shop/beauty/tanning.json
new file mode 100644
index 000000000..7366e6af1
--- /dev/null
+++ b/data/presets/presets/shop/beauty/tanning.json
@@ -0,0 +1,18 @@
+{
+    "icon": "shop",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "shop": "beauty",
+        "beauty": "tanning"
+    },
+    "name": "Tanning Salon"
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index 19ae029fd..9b127cb92 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1982,6 +1982,10 @@
             "key": "beauty",
             "value": "nails"
         },
+        {
+            "key": "beauty",
+            "value": "tanning"
+        },
         {
             "key": "shop",
             "value": "bed"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c3c34c9e3..00168a838 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -780,6 +780,9 @@
             "barrier": {
                 "label": "Type"
             },
+            "beauty": {
+                "label": "Shop Type"
+            },
             "bench": {
                 "label": "Bench"
             },
@@ -3609,7 +3612,11 @@
             },
             "shop/beauty/nails": {
                 "name": "Nail Salon",
-                "terms": "Nail Salon,nails"
+                "terms": "manicure,pedicure"
+            },
+            "shop/beauty/tanning": {
+                "name": "Tanning Salon",
+                "terms": ""
             },
             "shop/bed": {
                 "name": "Bedding/Mattress Store",