diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 931f7e1dca..e77a3fd140 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -495,9 +495,6 @@ node[railway=subway_entrance][city=moscow],
 node[railway=station][transport=subway]
 {z-index: 2990;}
 
-area[building=train_station],
-{z-index: 3000;}
-
 /* 2. NATURAL */
 
 node|z10-[natural=volcano],
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 836f88c2d2..83f73cf049 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -159,9 +159,8 @@ node[amenity=charging_station],
 area[amenity=charging_station]
 {z-index: 3590;}
 
-area[building=train_station],
 node[highway=speed_camera],
-{z-index: 8000;}
+{z-index: 75000;}
 
 /* 2. NATURAL */
 
@@ -997,9 +996,9 @@ area|z18-[highway=rest_area],
 {font-size: 14.5;}
 
 node|z13[highway=speed_camera]
-{icon-image: speedcam-s.svg; z-index: 75000;}
+{icon-image: speedcam-s.svg;}
 node|z14-[highway=speed_camera]
-{icon-image: speedcam-m.svg; z-index: 75000;}
+{icon-image: speedcam-m.svg;}
 
 node|z17[amenity=car_wash],
 area|z17[amenity=car_wash]