diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss
index 9891b1691a..b2bb2124d4 100644
--- a/data/styles/clear/include/Subways.mapcss
+++ b/data/styles/clear/include/Subways.mapcss
@@ -329,14 +329,13 @@ node|z15-[railway=station][transport=subway][city=kharkiv] {icon-image: subway-k
 node|z16-[railway=subway_entrance][city=kharkiv] {icon-image: subway-kharkiv-s.svg;}
 node|z18-[railway=subway_entrance][city=kharkiv] {icon-image: subway-kharkiv-m.svg;}
 
-/* Kiev Subway Station TODO: simplify?*/
+/* Kiev Subway Station */
 node|z12-13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;text-offset: 1;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.svg;}
 node|z15-16[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;}
 node|z17-[railway=station][transport=subway][city=kiev] {icon-image: none;text: none;} /*only show subway entrance past z17*/
 node|z17-[railway=station][transport=subway][city=kiev]::int_name {icon-image: none;text: none;}
-node|z16[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;}
-node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;font-size: 13;}
+node|z16-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-m.svg;}
 
 /* Kobe Subway Station */
 node|z13-[railway=station][transport=subway][city=kobe] {icon-image: subway-kobe-s.svg;}
@@ -458,16 +457,13 @@ node|z15-[railway=station][transport=subway][city=milan] {icon-image: subway-mil
 node|z16-[railway=subway_entrance][city=milan] {icon-image: subway-milan-s.svg;}
 node|z18-[railway=subway_entrance][city=milan] {icon-image: subway-milan-m.svg;}
 
-/* Minsk Subway Station TODO: simplify?*/
+/* Minsk Subway Station */
 node|z12-13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 1;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
-node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;text-offset: 1;}
-node|z15[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 1;}
-node|z16[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}
+node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.svg;}
+node|z15-16[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;}
 node|z17-[railway=station][transport=subway][city=minsk] {icon-image: none;text: none;} /*only show subway_entrance past z17*/
 node|z17-[railway=station][transport=subway][city=minsk]::int_name {icon-image: none;text: none;}
-node|z16[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 1;}
-node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 1;font-size: 12;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
-node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;}
+node|z16-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;}
 
 /* Moscow Subway Station TODO: simplify?*/
 node|z12-[railway=station][transport=subway][city=moscow],
@@ -682,17 +678,17 @@ node|z13[railway=station][transport=subway][city=spb]
 node|z13[railway=station][transport=subway][city=spb]::int_name
 {text-offset: 1;font-size: 10;text-halo-opacity: 0.6;}
 node|z14[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-s.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.7;}
+{icon-image: subway-spb-s.svg;font-size: 11;text-halo-opacity: 0.7;}
 node|z14[railway=station][transport=subway][city=spb]::int_name
-{text-offset: 1;font-size: 10;text-halo-opacity: 0.7;}
+{font-size: 10;text-halo-opacity: 0.7;}
 node|z15[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-m.svg;text-offset: 1;font-size: 11;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-m.svg;font-size: 11;text-halo-opacity: 0.8;}
 node|z15[railway=station][transport=subway][city=spb]::int_name
-{text-offset: 1;font-size: 10;text-halo-opacity: 0.8;}
-node|z16[railway=station][transport=subway][city=spb] /* check */
-{icon-image: subway-spb-m.svg;text-offset: 1;font-size: 10;text-color: @district_label;text-halo-radius: 0;}
+{font-size: 10;text-halo-opacity: 0.8;}
+node|z16[railway=station][transport=subway][city=spb]
+{icon-image: subway-spb-m.svg;font-size: 12;}
 node|z16[railway=station][transport=subway][city=spb]::int_name
-{text-offset: 1;font-size: 9;text-color: @district_label;text-halo-radius: 0;} /* check */
+{font-size: 10;}
 
 /* Do not draw station metro icon, because entrances will be visible now */
 node|z17-[railway=station][transport=subway][city=spb]