diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 2323bfaade..b0c63fc556 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -13245,34 +13245,10 @@
     zh-Hans = 缆索铁路轨道
 
   [type.railway.halt]
-    en = Train Station
-    ar = محطة سكك حديدية
-    cs = Železniční stanice
-    da = Togstation
+    ref = type.railway.station
     de = Haltepunkt
-    el = Σιδηροδρομικός σταθμός
-    es = Estación de tren
-    fa = ایستگاه قطار
-    fi = Rautatieasema
-    fr = Gare
-    hu = Vonatmegálló
-    id = Rel kereta api
-    it = Stazione ferroviaria
-    ja = 鉄道駅
-    ko = 기차역
-    nb = Togstasjon
-    nl = Station
     pl = Przystanek kolejowy
     pt = Apeadeiro
-    pt-BR = Estação de trem
-    ro = Feroviar
-    ru = Ж/д станция
-    sk = Železničná stanica
-    sv = Tågstation
-    th = สถานีรถไฟ
-    tr = Gar
-    uk = Залізничний вокзал
-    vi = Đường tàu hỏa
     zh-Hans = 小站
     zh-Hant = 小站
 
@@ -13629,66 +13605,13 @@
     zh-Hant = 火車站
 
   [type.railway.station.light_rail]
-    en = Train Station
-    ar = محطة سكك حديدية
-    cs = Železniční stanice
-    da = Togstation
+    ref = type.railway.station
     de = Stadtbahnbahnhof
-    el = Σιδηροδρομικός σταθμός
-    es = Estación de tren
-    fa = ایستگاه قطار
-    fi = Rautatieasema
-    fr = Gare
-    hu = Vonatmegálló
-    id = Rel kereta api
-    it = Stazione ferroviaria
-    ja = 鉄道駅
-    ko = 기차역
-    nb = Togstasjon
-    nl = Station
-    pl = Dworzec kolejowy
-    pt = Estação de comboios
-    pt-BR = Estação de trem
-    ro = Feroviar
-    ru = Ж/д станция
-    sk = Železničná stanica
-    sv = Tågstation
-    th = สถานีรถไฟ
-    tr = Gar
-    uk = Залізничний вокзал
-    vi = Đường tàu hỏa
     zh-Hans = 轻轨车站
     zh-Hant = 輕軌車站
 
   [type.railway.station.monorail]
-    en = Train Station
-    ar = محطة سكك حديدية
-    cs = Železniční stanice
-    da = Togstation
-    de = Bahnhof
-    el = Σιδηροδρομικός σταθμός
-    es = Estación de tren
-    fa = ایستگاه قطار
-    fi = Rautatieasema
-    fr = Gare
-    hu = Vonatmegálló
-    id = Rel kereta api
-    it = Stazione ferroviaria
-    ja = 鉄道駅
-    ko = 기차역
-    nb = Togstasjon
-    nl = Station
-    pl = Dworzec kolejowy
-    pt = Estação de comboios
-    pt-BR = Estação de trem
-    ro = Feroviar
-    ru = Ж/д станция
-    sk = Železničná stanica
-    sv = Tågstation
-    th = สถานีรถไฟ
-    tr = Gar
-    uk = Залізничний вокзал
-    vi = Đường tàu hỏa
+    ref = type.railway.station
     zh-Hans = 单轨车站
     zh-Hant = 單軌車站
 
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 2a1852e09d..50a05e48f7 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -304,9 +304,6 @@ node[office=lawyer],
 area[office=lawyer]
 {z-index: 2600;}
 
-node[amenity=bus_station],
-area[amenity=bus_station],
-node[amenity=ferry_terminal],
 node[man_made=lighthouse],
 area[man_made=lighthouse],
 node[barrier=border_control],
@@ -347,11 +344,6 @@ node[amenity=biergarten],
 area[amenity=biergarten]
 {z-index: 2782;}
 
-node[railway=halt],
-node[railway=station],
-area[building=train_station],
-node[railway=tram_stop],
-area[railway=tram_stop],
 node[historic=monument],
 area[historic=monument],
 node[historic=memorial],
@@ -454,12 +446,30 @@ node[shop=mall],
 area[shop=mall]
 {z-index: 2930;}
 
-node[public_transport=station],
-area[public_transport=station],
 node[railway=subway_entrance],
-node[railway=station][transport=subway],
 node[highway=bus_stop],
 area[highway=bus_stop]
+{z-index: 2950;}
+
+node[railway=halt],
+node[railway=tram_stop],
+area[railway=tram_stop]
+{z-index: 2960;}
+
+node[amenity=bus_station],
+node[public_transport=station],
+{z-index: 2970;}
+
+area[amenity=bus_station],
+area[public_transport=station]
+{z-index: 2980;}
+
+node[railway=station],
+node[amenity=ferry_terminal],
+node[railway=station][transport=subway]
+{z-index: 2990;}
+
+area[building=train_station],
 {z-index: 3000;}
 
 /* 2. NATURAL */
@@ -645,13 +655,17 @@ area|z15-[amenity=water_point]
 
 /* 3. TRANSPORT */
 
-node|z12-[railway=halt],
-node|z14-[railway=station],
-node|z16-[railway=subway_entrance]
+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;}
-node|z12-[railway=halt]::int_name,
-node|z14-[railway=station]::int_name,
-node|z16-[railway=subway_entrance]::int_name
+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,
+node|z16-[railway=subway_entrance]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;text-optional: true;}
 
 node|z12-[railway=station][transport=subway][city=moscow],
@@ -708,11 +722,13 @@ node|z12-[aeroway=aerodrome]::int_name,
 
 /*check offset int_name*/
 
-node|z11[railway=halt]
+area|z11[building=train_station],
 {icon-image: train-s.svg;icon-min-distance: 10;text-optional: true;}
-node|z12[railway=halt]
+area|z12[building=train_station],
+node|z12[railway=station][!transport],
 {icon-image: train-s.svg;text-offset: 1;font-size: 9;text-optional: true;}
-node|z12[railway=halt]::int_name
+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],
@@ -804,8 +820,8 @@ area|z18-[railway=tram_stop]
 
 /* 3.4 Bus Station */
 
-node|z12-13[amenity=bus_station],
-area|z12-13[amenity=bus_station]
+node|z13[amenity=bus_station],
+area|z13[amenity=bus_station]
 {icon-image: bus-s.svg;icon-min-distance: 1;text-optional: true;}
 node|z14[amenity=bus_station],
 area|z14[amenity=bus_station]
diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss
index 5052214448..4bcd23bb8b 100644
--- a/data/styles/clear/include/Subways.mapcss
+++ b/data/styles/clear/include/Subways.mapcss
@@ -69,7 +69,7 @@ node|z17-[railway=station][transport=subway][city=bangkok] {icon-image: subway-b
 node|z17[railway=subway_entrance][city=bangkok] {icon-image: subway-bangkok-s.svg;text-optional: true;}
 node|z18-[railway=subway_entrance][city=bangkok] {icon-image: subway-bangkok-m.svg;text-optional: true;}
 
-/* Barselona Subway Station */
+/* Barcelona Subway Station */
 node|z13[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;}
 node|z15-16[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index d8db8e609a..061ff51d25 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -5,17 +5,6 @@
 3.TRANSPORT
   3.1 Train Station
   3.2 Subway Station
-    3.2.1 Moscow Subway Station
-    3.2.2 Saint Petersburg Subway Station
-    3.2.3 Minsk Subway Station
-    3.2.4 Kiev Subway Station
-    3.2.5 London Subway Station
-    3.2.6 Paris Subway Station
-    3.2.7 Barselona Subway Station
-    3.2.8 Madrid Subway Station
-    3.2.9 Berlin Subway Station
-    3.2.10 Roma Subway Station
-    3.2.11 New York Subway Station
   3.3 Tram Station
   3.4 Bus Station
   3.5 Ferry terminal
@@ -83,14 +72,6 @@ node[amenity=pub],
 area[amenity=pub]
 {z-index: 2782;}
 
-node[highway=bus_stop],
-area[highway=bus_stop],
-node[amenity=bus_station],
-area[amenity=bus_station],
-node[public_transport=station],
-area[public_transport=station],
-{z-index: 2800;}
-
 node[amenity=car_wash],
 area[amenity=car_wash],
 node[amenity=car_rental],
@@ -157,7 +138,6 @@ area[building=university],
 {z-index: 2900;}
 
 
-node[railway=halt],
 node[barrier=border_control],
 node[barrier=toll_booth],
 area[barrier=toll_booth],
@@ -166,15 +146,23 @@ area[barrier=lift_gate],
 node[railway=level_crossing],
 {z-index: 2950;}
 
-node[railway=station],
-node[railway=tram_stop],
-area[railway=tram_stop],
+node[highway=bus_stop],
+area[highway=bus_stop],
 node[shop=mall],
 area[shop=mall]
 {z-index: 3000;}
 
+node[railway=halt],
+node[railway=tram_stop],
+area[railway=tram_stop],
+node[public_transport=station],
+area[public_transport=station],
+{z-index: 3020;}
+
+node[amenity=bus_station],
+area[amenity=bus_station],
 node[tourism=viewpoint]
-{z-index: 3001;}
+{z-index: 3050;}
 
 area[aeroway=airport],
 area[aeroway=aerodrome],
@@ -184,6 +172,7 @@ node[amenity=parking],
 area[amenity=parking],
 node[amenity=parking_space],
 area[amenity=parking_space],
+node[railway=station],
 node[railway=station][transport=subway],
 {z-index: 3100;}
 
@@ -254,12 +243,12 @@ area|z12-[landuse=forest][!name],
 
 /* 3. TRANSPORT */
 
+node|z13-[railway=station],
 node|z14-[railway=halt],
-node|z14-[railway=station],
 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;}
+node|z13-[railway=station]::int_name,
 node|z14-[railway=halt]::int_name,
-node|z14-[railway=station]::int_name,
 node|z16-[railway=subway_entrance]::int_name
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
@@ -292,6 +281,9 @@ node|z12-[aeroway=aerodrome]::int_name,
 /*check offset 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;}