diff --git a/data/presets.yaml b/data/presets.yaml
index 7ac22e735..b8ad42953 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -7499,6 +7499,11 @@ en:
         name: Bus Stop
         # 'terms: bus,platform,public transit,public transportation,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Bus Stop'', separated by commas>'
+      public_transport/platform/bus_tram_point:
+        # 'public_transport=platform, bus=yes, tram=yes'
+        name: Tram & Bus Stop
+        # 'terms: bus,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Tram & Bus Stop'', separated by commas>'
       public_transport/platform/ferry:
         # 'public_transport=platform, ferry=yes'
         name: Ferry Platform
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e24506e7d..c920862d6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -992,6 +992,7 @@
   "public_transport/platform/train_point": {"icon": "temaki-train", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "train": "yes"}, "reference": {"key": "railway", "value": "platform"}, "searchable": false, "name": "Train Stop / Platform"},
   "public_transport/platform/aerialway": {"icon": "temaki-board_gondola_lift", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Platform"},
   "public_transport/platform/bus_point": {"icon": "temaki-bus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop"},
+  "public_transport/platform/bus_tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes", "tram": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "tram": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Tram & Bus Stop"},
   "public_transport/platform/bus": {"icon": "temaki-board_bus", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Platform"},
   "public_transport/platform/ferry": {"icon": "temaki-board_ferry", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Platform"},
   "public_transport/platform/light_rail": {"icon": "temaki-board_light_rail", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Platform"},
diff --git a/data/presets/presets/public_transport/platform/bus_tram_point.json b/data/presets/presets/public_transport/platform/bus_tram_point.json
new file mode 100644
index 000000000..5bc30fccb
--- /dev/null
+++ b/data/presets/presets/public_transport/platform/bus_tram_point.json
@@ -0,0 +1,37 @@
+{
+    "icon": "temaki-tram",
+    "fields": [
+        "{public_transport/platform_point}"
+    ],
+    "moreFields": [
+        "{public_transport/platform_point}"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "tram": "yes",
+        "highway": "bus_stop"
+    },
+    "reference": {
+        "key": "public_transport",
+        "value": "platform"
+    },
+    "terms": [
+        "bus",
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Tram & Bus Stop"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 87de5b6ad..a634154d5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -966,7 +966,7 @@
     {"key": "subway", "value": "yes", "description": "🄿 Subway Stop / Platform (unsearchable), 🄿 Subway Platform, 🄿 Subway Station, 🄿 Subway Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/subway.svg"},
     {"key": "train", "value": "yes", "description": "🄿 Train Stop / Platform (unsearchable), 🄿 Train Platform, 🄿 Train Station, 🄿 Train Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/train.svg"},
     {"key": "bus", "value": "yes", "description": "🄿 Bus Stop, 🄿 Bus Platform, 🄿 Bus Station / Terminal, 🄿 Bus Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/bus.svg"},
-    {"key": "tram", "value": "yes", "description": "🄿 Tram Stop / Platform, 🄿 Tram Platform, 🄿 Tram Station, 🄿 Tram Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"},
+    {"key": "tram", "value": "yes", "description": "🄿 Tram & Bus Stop, 🄿 Tram Stop / Platform, 🄿 Tram Platform, 🄿 Tram Station, 🄿 Tram Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tram.svg"},
     {"key": "trolleybus", "value": "yes", "description": "🄿 Trolleybus Stop, 🄿 Trolleybus Platform, 🄿 Trolleybus Station / Terminal, 🄿 Trolleybus Stopping Location", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/trolleybus.svg"},
     {"key": "aerialway", "value": "station", "description": "🄿 Aerialway Station", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/gondola_lift.svg"},
     {"key": "railway", "value": "halt", "description": "🄿 Train Station (Halt / Request), 🄿 Train Station (Halt / Request) (unsearchable)", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/rail_flag.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index cf597ab99..c056a42e7 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -9272,6 +9272,10 @@
                     "name": "Bus Stop",
                     "terms": "bus,platform,public transit,public transportation,transit,transportation"
                 },
+                "public_transport/platform/bus_tram_point": {
+                    "name": "Tram & Bus Stop",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
                 "public_transport/platform/bus": {
                     "name": "Bus Platform",
                     "terms": "bus,platform,public transit,public transportation,transit,transportation"