diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9df76eb8dc..dd899b2b4c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -13559,7 +13559,7 @@
             "name": "Ferry Stop / Platform"
         },
         "public_transport/platform_light_rail": {
-            "icon": "rail-light",
+            "icon": "poi-light-rail",
             "fields": [
                 "name",
                 "ref_platform",
@@ -13608,7 +13608,7 @@
             "name": "Light Rail Stop / Platform"
         },
         "public_transport/platform_monorail": {
-            "icon": "rail-metro",
+            "icon": "poi-monorail",
             "fields": [
                 "name",
                 "ref_platform",
@@ -13653,7 +13653,7 @@
             "name": "Monorail Stop / Platform"
         },
         "public_transport/platform_subway": {
-            "icon": "rail-metro",
+            "icon": "poi-subway",
             "fields": [
                 "name",
                 "ref_platform",
@@ -13747,7 +13747,7 @@
             "name": "Train Stop / Platform"
         },
         "public_transport/platform_tram": {
-            "icon": "rail-light",
+            "icon": "poi-tram",
             "fields": [
                 "name",
                 "ref_platform",
@@ -13797,7 +13797,7 @@
             "name": "Tram Stop / Platform"
         },
         "public_transport/platform_trolleybus": {
-            "icon": "bus",
+            "icon": "poi-trolleybus",
             "fields": [
                 "name",
                 "ref_platform",
@@ -14006,7 +14006,7 @@
             "name": "Ferry Station / Terminal"
         },
         "public_transport/station_light_rail": {
-            "icon": "rail-light",
+            "icon": "poi-light-rail",
             "fields": [
                 "name",
                 "network",
@@ -14058,7 +14058,7 @@
             "name": "Light Rail Station"
         },
         "public_transport/station_monorail": {
-            "icon": "rail-metro",
+            "icon": "poi-monorail",
             "fields": [
                 "name",
                 "network",
@@ -14104,7 +14104,7 @@
             "name": "Monorail Station"
         },
         "public_transport/station_subway": {
-            "icon": "rail-metro",
+            "icon": "poi-subway",
             "fields": [
                 "name",
                 "network",
@@ -14241,7 +14241,7 @@
             "name": "Train Station"
         },
         "public_transport/station_tram": {
-            "icon": "rail-light",
+            "icon": "poi-tram",
             "fields": [
                 "name",
                 "network",
@@ -14282,7 +14282,7 @@
             "name": "Tram Station"
         },
         "public_transport/station_trolleybus": {
-            "icon": "bus",
+            "icon": "poi-trolleybus",
             "fields": [
                 "name",
                 "network",
@@ -14481,7 +14481,7 @@
             "name": "Ferry Stopping Location"
         },
         "public_transport/stop_position_light_rail": {
-            "icon": "rail-light",
+            "icon": "poi-light-rail",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -14524,7 +14524,7 @@
             "name": "Light Rail Stopping Location"
         },
         "public_transport/stop_position_monorail": {
-            "icon": "rail-metro",
+            "icon": "poi-monorail",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -14563,7 +14563,7 @@
             "name": "Monorail Stopping Location"
         },
         "public_transport/stop_position_subway": {
-            "icon": "rail-metro",
+            "icon": "poi-subway",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -14645,7 +14645,7 @@
             "name": "Train Stopping Location"
         },
         "public_transport/stop_position_tram": {
-            "icon": "rail-light",
+            "icon": "poi-tram",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -14689,7 +14689,7 @@
             "name": "Tram Stopping Location"
         },
         "public_transport/stop_position_trolleybus": {
-            "icon": "bus",
+            "icon": "poi-trolleybus",
             "fields": [
                 "name",
                 "ref_stop_position",
@@ -14810,7 +14810,7 @@
             "searchable": false
         },
         "railway/tram_stop": {
-            "icon": "rail-light",
+            "icon": "poi-tram",
             "fields": [
                 "name",
                 "network",
@@ -18802,7 +18802,7 @@
             "name": "Riding Route"
         },
         "type/route/light_rail": {
-            "icon": "route-tram",
+            "icon": "route-light-rail",
             "fields": [
                 "name",
                 "ref_route",
diff --git a/data/presets/presets/building/_train_station.json b/data/presets/presets/building/_train_station.json
index f83e337a8d..81d7eda0a8 100644
--- a/data/presets/presets/building/_train_station.json
+++ b/data/presets/presets/building/_train_station.json
@@ -15,5 +15,5 @@
     },
     "matchScore": 0.5,
     "name": "Train Station",
-    "searchable":false
+    "searchable": false
 }
diff --git a/data/presets/presets/public_transport/platform_light_rail.json b/data/presets/presets/public_transport/platform_light_rail.json
index 61fcfcaf85..6b376861a5 100644
--- a/data/presets/presets/public_transport/platform_light_rail.json
+++ b/data/presets/presets/public_transport/platform_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-light-rail",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_monorail.json b/data/presets/presets/public_transport/platform_monorail.json
index 611b247d85..3505e6c3dc 100644
--- a/data/presets/presets/public_transport/platform_monorail.json
+++ b/data/presets/presets/public_transport/platform_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-metro",
+    "icon": "poi-monorail",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_subway.json b/data/presets/presets/public_transport/platform_subway.json
index 3656eed2c4..7167409822 100644
--- a/data/presets/presets/public_transport/platform_subway.json
+++ b/data/presets/presets/public_transport/platform_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-metro",
+    "icon": "poi-subway",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_tram.json b/data/presets/presets/public_transport/platform_tram.json
index 51f190867f..2677ab5438 100644
--- a/data/presets/presets/public_transport/platform_tram.json
+++ b/data/presets/presets/public_transport/platform_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-tram",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/platform_trolleybus.json b/data/presets/presets/public_transport/platform_trolleybus.json
index e4de6e627b..b897aba99b 100644
--- a/data/presets/presets/public_transport/platform_trolleybus.json
+++ b/data/presets/presets/public_transport/platform_trolleybus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "bus",
+    "icon": "poi-trolleybus",
     "fields": [
         "name",
         "ref_platform",
diff --git a/data/presets/presets/public_transport/station_light_rail.json b/data/presets/presets/public_transport/station_light_rail.json
index ff71e3af89..a1181aba9d 100644
--- a/data/presets/presets/public_transport/station_light_rail.json
+++ b/data/presets/presets/public_transport/station_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-light-rail",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_monorail.json b/data/presets/presets/public_transport/station_monorail.json
index 45b6c52eb8..6b6d1aac64 100644
--- a/data/presets/presets/public_transport/station_monorail.json
+++ b/data/presets/presets/public_transport/station_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-metro",
+    "icon": "poi-monorail",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_subway.json b/data/presets/presets/public_transport/station_subway.json
index 304b1bd4db..526c003d69 100644
--- a/data/presets/presets/public_transport/station_subway.json
+++ b/data/presets/presets/public_transport/station_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-metro",
+    "icon": "poi-subway",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_tram.json b/data/presets/presets/public_transport/station_tram.json
index f336aa7864..dc8efbce1e 100644
--- a/data/presets/presets/public_transport/station_tram.json
+++ b/data/presets/presets/public_transport/station_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-tram",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/station_trolleybus.json b/data/presets/presets/public_transport/station_trolleybus.json
index 47c5c54ed5..519e2eeb6d 100644
--- a/data/presets/presets/public_transport/station_trolleybus.json
+++ b/data/presets/presets/public_transport/station_trolleybus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "bus",
+    "icon": "poi-trolleybus",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/public_transport/stop_position_light_rail.json b/data/presets/presets/public_transport/stop_position_light_rail.json
index e2bb0994fd..c1e8a9eabb 100644
--- a/data/presets/presets/public_transport/stop_position_light_rail.json
+++ b/data/presets/presets/public_transport/stop_position_light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-light-rail",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_monorail.json b/data/presets/presets/public_transport/stop_position_monorail.json
index 3c59a4144a..8c23674a13 100644
--- a/data/presets/presets/public_transport/stop_position_monorail.json
+++ b/data/presets/presets/public_transport/stop_position_monorail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-metro",
+    "icon": "poi-monorail",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_subway.json b/data/presets/presets/public_transport/stop_position_subway.json
index e797d7f089..046b412ef2 100644
--- a/data/presets/presets/public_transport/stop_position_subway.json
+++ b/data/presets/presets/public_transport/stop_position_subway.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-metro",
+    "icon": "poi-subway",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_tram.json b/data/presets/presets/public_transport/stop_position_tram.json
index 7d4a24b523..58fe6fbb6b 100644
--- a/data/presets/presets/public_transport/stop_position_tram.json
+++ b/data/presets/presets/public_transport/stop_position_tram.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-tram",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/public_transport/stop_position_trolleybus.json b/data/presets/presets/public_transport/stop_position_trolleybus.json
index 5c597c7f20..39b79dcb11 100644
--- a/data/presets/presets/public_transport/stop_position_trolleybus.json
+++ b/data/presets/presets/public_transport/stop_position_trolleybus.json
@@ -1,5 +1,5 @@
 {
-    "icon": "bus",
+    "icon": "poi-trolleybus",
     "fields": [
         "name",
         "ref_stop_position",
diff --git a/data/presets/presets/railway/_tram_stop.json b/data/presets/presets/railway/_tram_stop.json
index fe334e72b5..e78912aa3a 100644
--- a/data/presets/presets/railway/_tram_stop.json
+++ b/data/presets/presets/railway/_tram_stop.json
@@ -1,5 +1,5 @@
 {
-    "icon": "rail-light",
+    "icon": "poi-tram",
     "fields": [
         "name",
         "network",
diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json
index fa26c5763b..ba5bf2de0d 100644
--- a/data/presets/presets/type/route/light_rail.json
+++ b/data/presets/presets/type/route/light_rail.json
@@ -1,5 +1,5 @@
 {
-    "icon": "route-tram",
+    "icon": "route-light-rail",
     "fields": [
         "name",
         "ref_route",