diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 67497595d6..cec2947a5c 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -179,7 +179,6 @@ line[barrier=retaining_wall],
 area[building],
 area[building:part],
 area[landuse=garages],
-area[building=train_station],
 {z-index: 150;}
 
 area[aeroway=terminal]
@@ -670,13 +669,11 @@ line|z19-[man_made=cutline],
 area|z14[building],
 area|z14[waterway=dam],
 area|z14[landuse=garages],
-area|z14[building=train_station],
 {fill-color: @building;fill-opacity: 0.5;casing-width: 0;}
 
 area|z15[building],
 area|z15[waterway=dam],
 area|z15[landuse=garages],
-area|z15[building=train_station],
 {fill-color: @building;fill-opacity: 0.6;casing-width: 0;}
 
 area|z14-15[aeroway=terminal],
@@ -684,7 +681,6 @@ area|z16[building],
 area|z16[building:part],
 area|z16[waterway=dam],
 area|z16[landuse=garages],
-area|z16[building=train_station],
 {fill-color: @building;fill-opacity: 0.8;casing-width: 1;casing-color: @building_border;}
 
 area|z16[aeroway=terminal],
@@ -692,7 +688,6 @@ area|z17[building],
 area|z17[building:part],
 area|z17[waterway=dam],
 area|z17[landuse=garages],
-area|z17[building=train_station],
 {fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
 
 area|z17-[aeroway=terminal],
@@ -700,7 +695,6 @@ area|z18-[building],
 area|z18-[building:part],
 area|z18-[waterway=dam],
 area|z18-[landuse=garages],
-area|z18-[building=train_station],
 {fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
 
 
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 3160619727..6b8c781b1e 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -698,13 +698,11 @@ area|z19-[man_made=water_well],
 
 /* 3. TRANSPORT */
 
-area|z11-[building=train_station],
 node|z12-[railway=station][!transport],
 node|z13-[railway=halt],
 node|z14-[railway=station][transport=subway],
 node|z16-[railway=subway_entrance],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;text-optional: true;}
-area|z11-[building=train_station]::int_name,
 node|z12-[railway=station][!transport]::int_name,
 node|z13-[railway=halt]::int_name,
 node|z14-[railway=station][transport=subway]::int_name,
@@ -757,55 +755,41 @@ node|z12-[aeroway=aerodrome]::int_name,
 
 /* 3.1 Train Station */
 
-/*check offset int_name*/
+/* ToDo: check offset int_name */
 
-area|z11[building=train_station],
-{icon-image: train-s.svg;icon-min-distance: 10;text-optional: true;}
-area|z12[building=train_station],
 node|z12[railway=station][!transport],
 {icon-image: train-s.svg;text-offset: 1;font-size: 9;text-optional: true;}
-area|z12[building=train_station]::int_name,
 node|z12[railway=station][!transport]::int_name,
 {text-offset: 1;font-size: 8;text-optional: true;}
 node|z13[railway=station],
 node|z13[railway=halt],
-area|z13[building=train_station]
 {icon-image: train-s.svg;text-offset: 1;font-size: 10;text-optional: true;}
 node|z13[railway=station]::int_name,
 node|z13[railway=halt]::int_name,
-area|z13[building=train_station]::int_name,
 {text-offset: 1;font-size: 9;}
 node|z14[railway=station],
 node|z14[railway=halt],
-area|z14[building=train_station]
 {icon-image: train-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;text-optional: true;}
 node|z14[railway=station]::int_name,
 node|z14[railway=halt]::int_name,
-area|z14[building=train_station]::int_name,
 {text-offset: 1;font-size: 10;text-halo-opacity: 0.7;text-optional: true;}
 node|z15[railway=station],
 node|z15[railway=halt],
-area|z15[building=train_station]
 {icon-image: train-m.svg;text-offset: 1;font-size: 12;text-halo-opacity: 0.8;text-optional: true;}
 node|z15[railway=station]::int_name,
 node|z15[railway=halt]::int_name,
-area|z15[building=train_station]::int_name,
 {text-offset: 1;font-size: 10;text-halo-opacity: 0.8;text-optional: true;}
 node|z16[railway=station],
 node|z16[railway=halt],
-area|z16[building=train_station]
 {icon-image: train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.8;text-optional: true;}
 node|z16[railway=station]::int_name,
 node|z16[railway=halt]::int_name,
-area|z16[building=train_station]::int_name,
 {text-offset: 1;font-size: 11;text-halo-opacity: 0.8;text-optional: true;}
 node|z17-[railway=station],
 node|z17-[railway=halt],
-area|z17-[building=train_station]
 {icon-image: train-m.svg;text-offset: 1;font-size: 13;text-halo-opacity: 0.9;text-optional: true;}
 node|z17-[railway=station]::int_name,
 node|z17-[railway=halt]::int_name,
-area|z17-[building=train_station]::int_name,
 {text-offset: 1;font-size: 12;text-halo-opacity: 0.9;text-optional: true;}
 
 /* 3.2 Subway Station */
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 9ddc3befc5..783b70403f 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -151,7 +151,6 @@ line[barrier=retaining_wall],
 area[building],
 area[building:part],
 area[landuse=garages],
-area[building=train_station],
 {z-index: 150;}
 
 area[aeroway=terminal]
@@ -578,7 +577,6 @@ line|z19-[man_made=cutline],
 area|z15[building],
 area|z15[waterway=dam],
 area|z15[landuse=garages],
-area|z15[building=train_station],
 {fill-color: @building;fill-opacity: 0.65;casing-width: 1;casing-color: @building_border;}
 
 area|z14-[aeroway=terminal],
@@ -586,7 +584,6 @@ area|z16-[building],
 area|z16-[building:part],
 area|z16-[waterway=dam],
 area|z16-[landuse=garages],
-area|z16-[building=train_station],
 {fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}
 
 
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index a3dace4986..6aa882ee16 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -280,45 +280,34 @@ node|z12-[aeroway=aerodrome]::int_name,
 
 
 node|z12[railway=station][!transport],
-area|z12[building=train_station],
 {icon-image: train-s.svg;text-offset: 1;font-size: 11;}
 node|z13[railway=station],
-area|z13[building=train_station],
 {icon-image: train-m.svg;text-offset: 1;font-size: 11.75;}
 node|z13[railway=station]::int_name,
-area|z13[building=train_station]::int_name,
 {text-offset: 1;font-size: 9;}
 node|z14[railway=station],
 node|z14[railway=halt],
-area|z14[building=train_station],
 {icon-image: train-m.svg;text-offset: 1;font-size: 12.25;text-halo-opacity: 0.7;}
 node|z14[railway=station]::int_name,
 node|z14[railway=halt]::int_name,
-area|z14[building=train_station]::int_name,
 {text-offset: 1;font-size: 10;text-halo-opacity: 0.7;}
 node|z15[railway=station],
 node|z15[railway=halt],
-area|z15[building=train_station],
 {icon-image: train-m.svg;text-offset: 1;font-size: 12.5;text-halo-opacity: 0.8;}
 node|z15[railway=station]::int_name,
 node|z15[railway=halt]::int_name,
-area|z15[building=train_station]::int_name,
 {text-offset: 1;font-size: 10;text-halo-opacity: 0.8;}
 node|z16[railway=station],
 node|z16[railway=halt],
-area|z16[building=train_station],
 {icon-image: train-m.svg;text-offset: 1;font-size: 13.75;text-halo-opacity: 0.8;}
 node|z16[railway=station]::int_name,
 node|z16[railway=halt]::int_name,
-area|z16[building=train_station]::int_name,
 {text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
 node|z17-[railway=station],
 node|z17-[railway=halt],
-area|z17-[building=train_station],
 {icon-image: train-m.svg;text-offset: 1;font-size: 14;text-halo-opacity: 0.9;}
 node|z17-[railway=station]::int_name,
 node|z17-[railway=halt]::int_name,
-area|z17-[building=train_station]::int_name,
 {text-offset: 1;font-size: 12;text-halo-opacity: 0.9;}
 
 /* 3.3 Tram Station */