diff --git a/data/fields/advertising.json b/data/fields/advertising.json
new file mode 100644
index 00000000..8f0cf729
--- /dev/null
+++ b/data/fields/advertising.json
@@ -0,0 +1,5 @@
+{
+    "key": "advertising",
+    "type": "typeCombo",
+    "label": "Type"
+}
diff --git a/data/presets/advertising.json b/data/presets/advertising.json
new file mode 100644
index 00000000..588fcaed
--- /dev/null
+++ b/data/presets/advertising.json
@@ -0,0 +1,29 @@
+{
+    "icon": "temaki-billboard",
+    "fields": [
+        "advertising",
+        "operator",
+        "lit",
+        "visibility"
+    ],
+    "moreFields": [
+        "access_simple",
+        "height",
+        "message"
+    ],
+    "geometry": [
+        "point",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "advertising": "*"
+    },
+    "terms": [
+        "advertising screen",
+        "flag",
+        "neon sign",
+        "sign"
+    ],
+    "name": "Advertising Device"
+}
diff --git a/data/presets/advertising/billboard.json b/data/presets/advertising/billboard.json
index f8fa2d3c..23c2665d 100644
--- a/data/presets/advertising/billboard.json
+++ b/data/presets/advertising/billboard.json
@@ -1,15 +1,12 @@
 {
     "icon": "temaki-billboard",
     "fields": [
-        "operator",
-        "lit",
-        "support",
-        "visibility"
+        "{advertising}",
+        "support"
     ],
     "moreFields": [
-        "access_simple",
-        "direction",
-        "height"
+        "{advertising}",
+        "direction"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/advertising/board.json b/data/presets/advertising/board.json
index 5af5c209..3d457552 100644
--- a/data/presets/advertising/board.json
+++ b/data/presets/advertising/board.json
@@ -1,15 +1,12 @@
 {
     "icon": "temaki-bulletin_board",
     "fields": [
-        "operator",
-        "lit",
-        "support",
-        "visibility"
+        "{advertising}",
+        "support"
     ],
     "moreFields": [
-        "access_simple",
-        "direction",
-        "height"
+        "{advertising}",
+        "direction"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/advertising/column.json b/data/presets/advertising/column.json
index f094e64b..6cfb0c91 100644
--- a/data/presets/advertising/column.json
+++ b/data/presets/advertising/column.json
@@ -1,13 +1,10 @@
 {
     "icon": "temaki-storage_tank",
     "fields": [
-        "operator",
-        "lit",
-        "visibility"
+        "{advertising}"
     ],
     "moreFields": [
-        "access_simple",
-        "height"
+        "{advertising}"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/advertising/poster_box.json b/data/presets/advertising/poster_box.json
index 6ffad82e..1d7e7b7d 100644
--- a/data/presets/advertising/poster_box.json
+++ b/data/presets/advertising/poster_box.json
@@ -1,16 +1,12 @@
 {
     "icon": "temaki-poster_box",
     "fields": [
-        "operator",
-        "lit",
-        "support",
-        "visibility"
+        "{advertising}",
+        "support"
     ],
     "moreFields": [
-        "access_simple",
-        "direction",
-        "height",
-        "message"
+        "{advertising}",
+        "direction"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/advertising/totem.json b/data/presets/advertising/totem.json
index d8e9de0c..0720f74f 100644
--- a/data/presets/advertising/totem.json
+++ b/data/presets/advertising/totem.json
@@ -1,14 +1,10 @@
 {
     "fields": [
-        "operator",
-        "lit",
-        "visibility"
+        "{advertising}"
     ],
     "moreFields": [
-        "access_simple",
-        "direction",
-        "height",
-        "message"
+        "{advertising}",
+        "direction"
     ],
     "geometry": [
         "point",
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index d7cabe3a..0325f0e7 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -164,6 +164,9 @@ en:
       admin_level:
         # admin_level=*
         label: Admin Level
+      advertising:
+        # advertising=*
+        label: Type
       aerialway:
         # aerialway=*
         label: Type
@@ -5223,6 +5226,11 @@ en:
         # addr:*=* | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Address
         terms: <translate with synonyms or related terms for 'Address', separated by commas>
+      advertising:
+        # advertising=* | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Advertising Device
+        # 'terms: advertising screen,flag,neon sign,sign'
+        terms: <translate with synonyms or related terms for 'Advertising Device', separated by commas>
       advertising/billboard:
         # advertising=billboard | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Billboard