Index: trunk/data/validator/highway.mapcss
===================================================================
--- trunk/data/validator/highway.mapcss	(revision 15313)
+++ trunk/data/validator/highway.mapcss	(revision 15314)
@@ -144,6 +144,6 @@
 }
 
-/* #11270, #9297, #15439, #16424 */
-way[railway =~ /^(light_rail|miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
+/* #11270, #9297, #15439, #16424, #17022 */
+way[railway =~ /^(miniature|narrow_gauge|preserved|rail)$/][!highway] > node { set .is_in_railway }
 way[highway =~ /^(bridleway|cycleway|footway|path|steps)$/] > node { set .is_in_minor_road }
 way[highway =~ /^(bus_guideway|living_street|motorway|motorway_link|pedestrian|primary|primary_link|raceway|residential|road|secondary|secondary_link|service|tertiary|tertiary_link|track|trunk|trunk_link|unclassified)$/] > node { set .is_in_major_road }
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 15313)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 15314)
@@ -3623,9 +3623,9 @@
     color: railyard#552200;
 }
-/* draw tram on top of other way (highway=*) or
+/* draw tram and light_rail on top of other way (highway=*) or
    as a standalone style */
 way[highway][railway=tram]::core_railway,
 way[!highway][railway=tram] {
-    object-z-index: 1;
+    z-index: 1;
     modifier: false; /* don't draw default way if there is no line on default layer */
     width: 1;
@@ -3649,5 +3649,8 @@
 }
 
-way[railway=light_rail] {
+way[highway][railway=light_rail]::core_railway,
+way[!highway][railway=light_rail] {
+    z-index: 1;
+    modifier: false; /* don't draw default way if there is no line on default layer */
     width: 2;
     color: otherrail#808080;
@@ -3767,6 +3770,10 @@
     dashes-background-color: construction#ffff00;
 }
-way[railway=construction][construction=light_rail] {
+way[railway=construction][construction=light_rail][highway]::core_railway,
+way[railway=construction][construction=light_rail][!highway] {
+    z-index: 1;
     width: 2;
+    dashes: 9,9;
+    color: construction#ffff00;
 }
 way[railway=construction][construction=tram][highway]::core_railway,