diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 1f258e603e..26a1d49823 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -149,8 +149,6 @@ artwork_type=bust : artwork_type=statue
 
 place=allotments : place=neighbourhood
 
-crossing=traffic_signals : highway=traffic_signals
-
 # Replace top tags from here https://taginfo.openstreetmap.org/search?q=recycling on the common ones.
 recycling:electrical_appliances=yes       : recycling:small_appliances=yes
 recycling:small_electrical_appliances=yes : recycling:small_appliances=yes
diff --git a/data/styles/default/dark/symbols/traffic_signals.svg b/data/styles/default/dark/symbols/traffic_signals.svg
new file mode 100644
index 0000000000..d2cfebd747
--- /dev/null
+++ b/data/styles/default/dark/symbols/traffic_signals.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" width="24" height="24" version="1.1" viewBox="0 0 24 24" xml:space="preserve" id="svg3"><defs id="defs3"/>
+ <rect style="" id="rect1" width="10" height="24" x="7" y="0" ry="4" fill="#4d4d4d"/><ellipse cx="12" cy="5" fill="#ff2a2a" id="circle1" rx="2.9999995" ry="2.9999998" style=""/><ellipse cx="12" cy="12" fill="#ffcc00" id="circle2" rx="2.9999998" ry="3.0000002" style=""/><ellipse cx="12" cy="19.004646" fill="#00d40a" id="circle3" style="" rx="2.9999998" ry="3.0046463"/><metadata id="metadata3"><rdf:RDF><cc:Work rdf:about=""/></rdf:RDF></metadata></svg>
diff --git a/data/styles/default/light/symbols/traffic_signals.svg b/data/styles/default/light/symbols/traffic_signals.svg
new file mode 100644
index 0000000000..4e5793151b
--- /dev/null
+++ b/data/styles/default/light/symbols/traffic_signals.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" width="24" height="24" version="1.1" viewBox="0 0 24 24" xml:space="preserve" id="svg3"><defs id="defs3"/>
+ <rect style="" id="rect9" width="10" height="24" x="7" y="0" ry="4"/><ellipse cx="12" cy="5" fill="#ff2a2a" id="circle1" rx="2.9999995" ry="2.9999998" style=""/><ellipse cx="12" cy="12" fill="#ffcc00" id="circle2" rx="2.9999998" ry="3.0000002" style=""/><ellipse cx="12" cy="19.004646" fill="#00d40a" id="circle3" style="" rx="2.9999998" ry="3.0046463"/><metadata id="metadata3"><rdf:RDF><cc:Work rdf:about=""/></rdf:RDF></metadata></svg>
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 924636ef1e..ebd4b4fdcc 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -124,6 +124,10 @@ node|z14-[aeroway=aerodrome]::int_name,
 
 /*check offset int_name*/
 
+/* 3.2 Road Icons */
+node|z19-[highway=traffic_signals],
+{icon-image: traffic_signals.svg}
+
 
 node|z12[railway=station][!transport],
 {icon-image: train-s.svg;text-offset: 1;font-size: 11;}
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index c80e64ee68..0bb7310a3d 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -174,6 +174,9 @@ amenity-charging_station-motorcar                   # icon z14- (also has captio
 amenity-fuel                                        # icon z12- (also has caption(optional) z12-)
 === 3200
 
+highway-traffic_signals                             # icon z19-
+=== 3165
+
 amenity-charging_station                            # icon z16- (also has caption(optional) z16-)
 amenity-vending_machine-fuel                        # icon z17- (also has caption(optional) z17-)
 === 3150