diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 7688b23177..8e6eff9c95 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -462,6 +462,7 @@ area[public_transport=station]
 
 node[railway=station],
 node[amenity=ferry_terminal],
+node[railway=subway_entrance][city=moscow],
 node[railway=station][transport=subway]
 {z-index: 2990;}
 
@@ -666,13 +667,13 @@ node|z16-[railway=subway_entrance]::int_name,
 
 node|z12-[railway=station][transport=subway][city=moscow],
 node|z12-[railway=station][transport=subway][city=spb],
-node|z16-[railway=subway_entrance][city=moscow],
+node|z15-[railway=subway_entrance][city=moscow],
 node|z17-[railway=tram_stop],
 area|z17-[railway=tram_stop]
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;}
 node|z12-[railway=station][transport=subway][city=moscow]::int_name,
 node|z12-[railway=station][transport=subway][city=spb]::int_name,
-node|z16-[railway=subway_entrance][city=moscow]::int_name,
+node|z15-[railway=subway_entrance][city=moscow]::int_name,
 node|z17-[railway=tram_stop]::int_name,
 area|z17-[railway=tram_stop]::int_name
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;text-optional: true;}
diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss
index 4bcd23bb8b..73d7706416 100644
--- a/data/styles/clear/include/Subways.mapcss
+++ b/data/styles/clear/include/Subways.mapcss
@@ -543,18 +543,26 @@ node|z15[railway=station][transport=subway][city=moscow]
 {icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z15[railway=station][transport=subway][city=moscow]::int_name
 {text-offset: 1;font-size: 10;text-optional: true;}
+/*
 node|z16[railway=station][transport=subway][city=moscow]check
 {icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 10;text-color: @district_label;text-halo-radius: 0;}
 node|z16[railway=station][transport=subway][city=moscow]::int_name
 {text-offset: 1;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check
+*/
 
 /* Do not draw main metro icon, because entrances will be visible now */
-node|z17-[railway=station][transport=subway][city=moscow]
+node|z16-[railway=station][transport=subway][city=moscow]
 {icon-image: zero-icon.svg;text: none;}
-node|z17-[railway=station][transport=subway][city=moscow]::int_name
+node|z16-[railway=station][transport=subway][city=moscow]::int_name
 {text: none;}
 
 /* Moscow Subway Station entrance */
+
+node|z15[railway=subway_entrance][city=moscow]
+{icon-image: subway-moscow-s.svg;text-offset: 1;font-size: 11;text-optional: true;}
+node|z15[railway=subway_entrance][city=moscow]::int_name
+{text-offset: 25;font-size: 9;text-optional: true;}
+
 node|z16[railway=subway_entrance][city=moscow]
 {icon-image: subway-moscow-m.svg;text-offset: 1;font-size: 12;text-optional: true;}
 node|z16[railway=subway_entrance][city=moscow]::int_name