Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7814)
+++ /trunk/data/defaultpresets.xml	(revision 7815)
@@ -1035,5 +1035,5 @@
         </item> <!-- Rest Area -->
         <separator/>
-        <item name="Traffic Signal" icon="presets/traffic-light.png" type="node" preset_name_label="true">
+        <item name="Traffic Signal" icon="styles/standard/vehicle/traffic_signals.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=traffic_signals"
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7814)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7815)
@@ -650,5 +650,25 @@
 }
 node[highway=traffic_signals] {
-    icon-image: "vehicle/restriction/traffic-light.png";
+    icon-image: "vehicle/traffic_signals.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing] {
+    icon-image: "vehicle/traffic_signals_crossing.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing_ref=zebra] {
+    icon-image: "vehicle/traffic_signals_crossing_ref_zebra.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing=island] {
+    icon-image: "vehicle/traffic_signals_crossing_island.svg";
+    set icon_z17;
+    text: auto;
+}
+node[highway=traffic_signals][crossing=traffic_signals] {
+    icon-image: "vehicle/traffic_signals_crossing_traffic_signals.svg";
     set icon_z17;
     text: auto;
@@ -690,5 +710,5 @@
 }
 node[highway=crossing][crossing=traffic_signals] {
-    icon-image: "vehicle/crossing_traffic_signals.png";
+    icon-image: "vehicle/crossing_traffic_signals.svg";
     set icon_z17;
     text: auto;