diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 834f3de3b8..8d04e0309c 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -274,11 +274,13 @@ node|z16-[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; t
 node|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 26000;}
 node|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000;}
 node|z17-[shop=car_repair], area|z17-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;  z-index: 25000;}
+
 node|z18-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 24000; }
-node|z18-[shop=laundry], area|z18-[shop=laundry] { icon-image:laundry-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; }
+node|z17-19[shop=laundry], area|z18-[shop=laundry] { icon-image:laundry-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25001; }
 node|z18-[shop=car_repair], area|z18-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000; }
 node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25000;}
 
+
 /* SPORT */
 /* LEISURE */
 /* node|z18-[leisure] {  } */
diff --git a/data/styles/clear/include/boundaries.mapcss b/data/styles/clear/include/boundaries.mapcss
index 4b13ae7841..a7d04a435f 100644
--- a/data/styles/clear/include/boundaries.mapcss
+++ b/data/styles/clear/include/boundaries.mapcss
@@ -56,7 +56,7 @@ line|z4[boundary=administrative][admin_level=3]
   width: 0.8;
   opacity: 1;
   z-index: 130;
-  dashes: 1,0.4;
+  dashes: 0.9,0.36;
 }
 
 line|z5[boundary=administrative][admin_level=4]
@@ -65,7 +65,7 @@ line|z5[boundary=administrative][admin_level=4]
   width: 0.7;
   opacity: 0.8;
   z-index: 130;
-  dashes: 1.5,1;
+  dashes: 1.35,0.9;
 }
 line|z6[boundary=administrative][admin_level=4]
 {
@@ -73,7 +73,7 @@ line|z6[boundary=administrative][admin_level=4]
   width: 0.8;
   opacity: 1;
   z-index: 130;
-  dashes: 1,0.5;
+  dashes: 0.9,0.45;
 }
 line|z7[boundary=administrative][admin_level=4]
 {
@@ -81,7 +81,7 @@ line|z7[boundary=administrative][admin_level=4]
   width: 0.9;
   opacity: 1;
   z-index: 130;
-  dashes: 2,1;
+  dashes: 1.8,0.9;
 }
 line|z8[boundary=administrative][admin_level=4]
 {
@@ -89,7 +89,7 @@ line|z8[boundary=administrative][admin_level=4]
   width: 0.9;
   opacity: 1;
   z-index: 130;
-  dashes: 1.6,1.6;
+  dashes: 1.44,1.44;
 }
 line|z9[boundary=administrative][admin_level=4]
 {
@@ -97,7 +97,7 @@ line|z9[boundary=administrative][admin_level=4]
   width: 1;
   opacity: 1;
   z-index: 130;
-  dashes: 2,1;
+  dashes: 1.8,0.9;
 }
 
 line|z10-[boundary=administrative][admin_level=4]
@@ -106,7 +106,7 @@ line|z10-[boundary=administrative][admin_level=4]
   width: 1.2;
   opacity: 1;
   z-index: 130;
-  dashes: 2,1;
+  dashes: 1.8,0.9;
 }
 /*
 line|z12-[boundary=administrative][admin_level=4]
diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
index 6bd18ea3e1..e3d3c120e5 100644
--- a/data/styles/clear/include/labels.mapcss
+++ b/data/styles/clear/include/labels.mapcss
@@ -1234,9 +1234,9 @@ node|z18-[addr:housenumber][addr:street]::int_name
 }
 node|z18-[entrance]
 {
-  font-size: 11;
+  font-size: 10;
   text: ref;
-  text-offset-x: 6;
+  text-offset-x: 9;
   z-index: 10;
   text-color: @building_label;
 }
diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
index 3d7d7d6d8f..ac9919a4c5 100644
--- a/data/styles/clear/include/natural.mapcss
+++ b/data/styles/clear/include/natural.mapcss
@@ -95,7 +95,7 @@ line|z13-14[waterway=canal]{
 }
 
 line|z13-14[waterway=stream][intermittent=yes] {
-	dashes: 3,3;
+	dashes: 2.7,2.7;
 	z-index: 49;
 }
 
@@ -122,7 +122,7 @@ line|z15-[waterway=canal]
 }
 
 line|z15-[waterway=stream][intermittent=yes] {
-	dashes: 5.5;
+	dashes: 4.95;
 	width: 1;
 	opacity: 1;
 	color: @river;
@@ -161,7 +161,7 @@ line|z17-[waterway=ditch] {
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	dashes: 1,1;
+	dashes: 0.9,0.9;
 }
 
 /* VEGETATION */
diff --git a/data/styles/clear/include/other.mapcss b/data/styles/clear/include/other.mapcss
index 01c17daa86..0c26d0ef2a 100644
--- a/data/styles/clear/include/other.mapcss
+++ b/data/styles/clear/include/other.mapcss
@@ -11,7 +11,7 @@ line|z16[historic=citywalls],
   width: 0.5;
   opacity: 1;
   z-index: 950;
-  dashes: 0.1,0.1;
+  dashes: 0.09,0.09;
 }
 
 line|z17-[barrier=wall],
@@ -25,7 +25,7 @@ line|z17-[historic=citywalls],
   width: 1;
   opacity: 1;
   z-index: 950;
-  dashes: 0.2,0.2;
+  dashes: 0.18,0.18;
 }
 line|z18-[barrier=wall],
 line|z18-[barrier=city_wall],
@@ -37,7 +37,7 @@ line|z18-[historic=citywalls],
   color: @fence;
   width: 1;
   z-index: 950;
-  dashes: 0.2,0.2;
+  dashes: 0.18,0.18;
 }
 
 /* PISTE */
diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss
index 2db9ef0d97..ffa484af49 100644
--- a/data/styles/clear/include/roads.mapcss
+++ b/data/styles/clear/include/roads.mapcss
@@ -366,7 +366,7 @@ line|z13[highway=pedestrian]
 {
   color: @pedestrian;
   width: 1;
-  dashes: 2,1;
+  dashes: 2,1;/*dashes: 0.9,0.45 1.8,0.9;*/
   opacity: 1;
   z-index: 660;
 }
@@ -377,7 +377,7 @@ line|z13[highway=cycleway]
   width: 1;
   opacity: 1;
   z-index: 1000;
-/*  dashes: 1,1;
+/*  dashes: 0.9,0.9;
   opacity: 0.8;*/
 }
 
@@ -386,7 +386,7 @@ line|z13[highway=construction]
   color: @construction;
   opacity: 1;
   width: 1.2;
-  dashes: 4,2;
+  dashes: 3.6,1.8;
   z-index: 450;
 }
 
@@ -502,7 +502,7 @@ line|z14[highway=pedestrian]
 {
   color: @pedestrian;
   width: 1.6;
-  dashes: 4,2;
+  dashes: 3.6,1.44;/*dashes: 3.6,1.8;*/
   opacity: 1;
   z-index: 660;
 }
@@ -528,7 +528,7 @@ line|z14[route=hiking]
 {
   color: @track;
   opacity: 1;
-  dashes: 2.8,1.5;
+  dashes: 2.52,1.35;
   width: 0.9;
   z-index: 600;
 }
@@ -538,7 +538,7 @@ line|z14[highway=bridleway]
   color: @bridleway;
   opacity: 1;
   width: 0.9;
-  dashes: 3,1.4;
+  dashes: 2.7,1.26;
   z-index: 560;
 }
 
@@ -546,8 +546,8 @@ line|z14[highway=bridleway]
 line|z14[highway=footway]
 {
   color: @footway;
-  width: 0.9;
-  dashes: 3,1.4;
+  width: 1;
+  dashes: 2.7,1.26;
   opacity: 1;
   z-index: 600;
 }
@@ -557,7 +557,7 @@ line|z14[highway=construction]
   color: @construction;
   opacity: 1;
   width: 1.4;
-  dashes: 5,2;
+  dashes: 4.5,1.8;
   z-index: 450;
 }
 
@@ -687,7 +687,7 @@ line|z15[highway=pedestrian]
 {
   color: @pedestrian;
   width: 2;
-  dashes: 4,2;
+  dashes: 5,2;/*dashes: 3.6,1.8;*/
   opacity: 1;
   z-index: 660;
 }
@@ -718,7 +718,7 @@ line|z15[route=hiking]
 {
   color: @track;
   opacity: 1;
-  dashes: 3,1.4;
+  dashes: 2.7,1.26;
   width: 1.3;
   z-index: 600;
 }
@@ -727,7 +727,7 @@ line|z15[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  dashes: 3,1.4;
+  dashes: 2.7,1.26;
   width: 1.4;
   z-index: 590;
 }
@@ -736,8 +736,8 @@ line|z15[highway=bridleway]
 line|z15[highway=footway]
 {
   color: @footway;
-  width: 1.5;
-  dashes: 3,1.4;
+  width: 1.7;
+  dashes: 2.7,1.26;
   opacity: 1;
   z-index: 600;
 }
@@ -755,7 +755,7 @@ line|z15[highway=construction]
   color: @construction;
   opacity: 1;
   width: 2;
-  dashes: 8,3;
+  dashes: 7.2,2.7;
   z-index: 450;
 }
 
@@ -902,7 +902,7 @@ line|z16[highway=pedestrian]
 {
   color: @pedestrian;
   width: 2.4;
-  dashes: 4,2;
+  dashes: 5.4,2.7;/*dashes: 3.6,1.8;*/
   opacity: 1;
   z-index: 660;
 }
@@ -921,8 +921,8 @@ line|z16[highway=pedestrian][tunnel?] {
 line|z16[highway=footway]
 {
   color: @footway;
-  width: 1.8;
-  dashes: 4,2;
+  width: 2;
+  dashes: 3.6,1.8;
   opacity: 1;
   z-index: 600;
 }
@@ -945,7 +945,7 @@ line|z16[route=hiking]
 {
   color: @track;
   opacity: 1;
-  dashes: 4,2;
+  dashes: 3.6,1.8;
   width: 1.8;
   z-index: 600;
 }
@@ -954,7 +954,7 @@ line|z16[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  dashes: 4,2;
+  dashes: 3.6,1.8;
   width: 1.8;
   z-index: 590;
 }
@@ -963,8 +963,8 @@ line|z16[highway=bridleway]
 line|z16[highway=steps]
 {
   color: @steps;
-  width: 4;
-  dashes: 2,2;
+  width: 5;
+  dashes: 1.5,1.5;
   z-index: 1000;
 }
 
@@ -973,7 +973,7 @@ line|z16[highway=construction]
   color: @construction;
   opacity: 1;
   width: 2.6;
-  dashes: 10,4;
+  dashes: 9,3.6;
   z-index: 450;
 }
 
@@ -1123,7 +1123,7 @@ line|z17[highway=pedestrian]
 {
   color: @pedestrian;
   width: 3;
-  dashes: 8,4;
+  dashes: 9,3.6;/*dashes: 7.2,3.6;*/
   z-index: 660;
 }
 
@@ -1138,11 +1138,10 @@ line|z17[highway=pedestrian][tunnel?] {
 }
 
 line|z17[highway=footway],
-line|z17[highway=path]
 {
   color: @footway;
-  width: 2;
-  dashes: 5,2;
+  width: 2.4;
+  dashes: 4.5,1.8;
   opacity: 1;
   z-index: 600;
 }
@@ -1184,7 +1183,7 @@ line|z17[route=hiking]
 {
   color: @track;
   opacity: 1;
-  dashes: 5,2;
+  dashes: 4.5,1.8;
   width: 2;
   z-index: 600;
 }
@@ -1193,7 +1192,7 @@ line|z17[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  dashes: 5,2;
+  dashes: 4.5,1.8;
   width: 2;
   z-index: 590;
 }
@@ -1201,8 +1200,8 @@ line|z17[highway=bridleway]
 line|z17[highway=steps]
 {
   color: @steps;
-  width: 6;
-  dashes: 3,3;
+  width: 7;
+  dashes: 2.3,2.3;
   z-index: 1000;
 }
 
@@ -1211,7 +1210,7 @@ line|z17[highway=construction]
   color: @construction;
   opacity: 1;
   width: 3;
-  dashes: 12,5;
+  dashes: 10.8,4.5;
   z-index: 450;
 }
 
@@ -1359,7 +1358,7 @@ line|z18[highway=pedestrian]
 {
   color: @pedestrian;
    width: 4;
-   dashes: 12,6;
+   dashes: 10.8,5.4;
    z-index: 660;
 }
 
@@ -1374,11 +1373,10 @@ line|z18[highway=pedestrian][tunnel?] {
 }
 
 line|z18[highway=footway],
-line|z18[highway=path]
 {
   color: @footway;
-  width: 3;
-  dashes: 8,3;
+  width: 3.4;
+  dashes: 7.2,2.7;
   opacity: 1;
   z-index: 600;
 }
@@ -1420,7 +1418,7 @@ line|z18[route=hiking]
 {
   color: @track;
   opacity: 1;
-  dashes: 8,3;
+  dashes: 7.2,2.7;
   width: 3;
   z-index: 600;
 
@@ -1430,7 +1428,7 @@ line|z18[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  dashes: 8,3;
+  dashes: 7.2,2.7;
   width: 3;
   z-index: 590;
 }
@@ -1438,8 +1436,8 @@ line|z18[highway=bridleway]
 line|z18[highway=steps]
 {
   color: @steps;
-  width: 8;
-  dashes: 4,4;
+  width: 9;
+  dashes: 3.2,3.2;
   z-index: 1000;
 }
 
@@ -1448,7 +1446,7 @@ line|z18[highway=construction]
   color: @construction;
   opacity: 1;
   width: 4;
-  dashes: 15,6;
+  dashes: 13.5,5.4;
   z-index: 450;
 }
 
@@ -1596,7 +1594,7 @@ line|z19-[highway=pedestrian]
 {
   color: @pedestrian;
    width: 5;
-   dashes: 18,9;
+   dashes: 16.2,8.1;
    z-index: 660;
 }
 
@@ -1615,7 +1613,7 @@ line|z19-[highway=path]
 {
   color: @footway;
   width: 4;
-  dashes: 10,4;
+  dashes: 9,3.6;
   opacity: 1;
   z-index: 600;
 }
@@ -1657,7 +1655,7 @@ line|z19-[route=hiking]
 {
   color: @track;
   opacity: 1;
-  dashes: 10,4;
+  dashes: 9,3.6;
   width: 4;
   z-index: 600;
 }
@@ -1666,7 +1664,7 @@ line|z19-[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  dashes: 10,4;
+  dashes: 9,3.6;
   width: 4;
   z-index: 590;
 }
@@ -1674,8 +1672,8 @@ line|z19-[highway=bridleway]
 line|z19-[highway=steps]
 {
   color: @steps;
-  width: 10;
-  dashes: 5,5;
+  width: 11;
+  dashes: 4,4;
   z-index: 1000;
 }
 
@@ -1684,7 +1682,7 @@ line|z19-[highway=construction]
   color: @construction;
   opacity: 1;
   width: 6;
-  dashes: 20,7;
+  dashes: 18,6.3;
   z-index: 450;
 }
 
diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index e2a52bdc49..8ec8a048fb 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -42,7 +42,7 @@ line|z16[railway=light_rail]::dash
   opacity: 1;
   width: 1.3;
   z-index: 690;
-  dashes: 5,5;
+  dashes: 4.5,4.5;
 }
 line|z16[railway=rail],
 line|z16[railway=light_rail]
@@ -69,7 +69,7 @@ line|z17[railway=light_rail]::dash
   opacity: 1;
   width: 2;
   z-index: 690;
-  dashes: 7,7;
+  dashes: 6.3,6.3;
 }
 
 line|z18-[railway=rail],
@@ -88,7 +88,7 @@ line|z18-[railway=light_rail]::dash,
   opacity: 1;
   width: 2;
   z-index: 690;
-  dashes: 9,9;
+  dashes: 8.1,8.1;
 }
 
 line|z14-[railway=rail][tunnel?],
@@ -135,7 +135,7 @@ line|z18-[railway=construction],
 line|z18-[railway=disused] {
   color: @railway;
   width: 1;
-  dashes: 2,6;
+  dashes: 1.8,5.4;
   z-index: 450;
 }
 
@@ -188,7 +188,7 @@ line|z16-[railway=abandoned]
   opacity: 1;
   width: 1.6;
   z-index: 450;
-  dashes: 7,7;
+  dashes: 6.3,6.3;
 
 }
 
@@ -248,7 +248,7 @@ line|z10-[route=ferry_motorcar]
 	color: @ferry;
 	width: 1;
   opacity: 1;
-	dashes: 6,3;
+	dashes: 5.4,2.7;
 	z-index: 115;
 }
 
@@ -524,6 +524,16 @@ node|z14[railway=station][transport=subway][city=moscow]::int_name { z-index: 29
 node|z15[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 9; z-index: 29000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; }
 node|z15[railway=station][transport=subway][city=moscow]::int_name { font-size: 10; text: int_name; text-offset: 24; z-index: 29000; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
 
+node|z16[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 12; text-color: @district_label; text-halo-radius: 0; z-index: 29000}
+node|z16[railway=station][transport=subway][city=moscow]::int_name { icon-image: none.svg; text: int_name; font-size: 11; text-color: @district_label; text-halo-radius: 0;z-index: 29000 }
+
+node|z17-[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 12; text-color: @district_label; text-halo-radius: 0; z-index: 29000}
+node|z17-[railway=station][transport=subway][city=moscow]::int_name { text: int_name; font-size: 11; text-color: @district_label; text-halo-radius: 0; z-index: 29000}
+
+
+
+
+
 /* MOSCOW SUBWAY ENTRANCES */
 node|z16[railway=subway_entrance][city=moscow] { icon-image: subway-moscow-m.svg; text-offset: 10; z-index: 28000; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; }
 node|z16[railway=subway_entrance][city=moscow]::int_name { font-size: 11; text: int_name; text-offset: 25; z-index: 28000; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; }
@@ -549,12 +559,12 @@ node|z14[railway=station][transport=subway][city=spb]::int_name { icon-image: su
 node|z15[railway=station][transport=subway][city=spb] { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 29000; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z15[railway=station][transport=subway][city=spb]::int_name { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 29000; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
-/*node|z16[railway=station][transport=subway][city=spb] { icon-image: subway-spb-m.svg; font-size: 12; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z16[railway=station][transport=subway][city=spb]::int_name { font-size: 11; text: int_name; text-color: @district_label; text-halo-radius: 0; }
+node|z16[railway=station][transport=subway][city=spb] { icon-image: subway-spb-m.svg; font-size: 12; text: name; text-color: @district_label; text-halo-radius: 0;z-index: 29000 }
+node|z16[railway=station][transport=subway][city=spb]::int_name { font-size: 11; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 29000 }
 
 
-node|z17-[railway=station][transport=subway][city=spb] {  icon-image: subway-spb-m.svg; font-size: 12; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z17-[railway=station][transport=subway][city=spb]::int_name { font-size: 11; text: int_name; text-color: @district_label; text-halo-radius: 0; }*/
+node|z17-[railway=station][transport=subway][city=spb] {  icon-image: subway-spb-m.svg; font-size: 12; text: name; text-color: @district_label; text-halo-radius: 0; z-index: 29000}
+node|z17-[railway=station][transport=subway][city=spb]::int_name { font-size: 11; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 29000 }
 
 node|z16-[railway=subway_entrance][city=spb] { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 28000; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z16-[railway=subway_entrance][city=spb]::int_name { z-index: 28000; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
@@ -1036,7 +1046,7 @@ line|z14[aerialway=mixed_lift]::dash
   width: 2.5;
   opacity: 0.6;
   z-index: 1049;
-  dashes: 1, 20;
+  dashes: 0.9,18;
 }
 
 line|z15-[aerialway=cable_car]::dash,
@@ -1046,7 +1056,7 @@ line|z15-[aerialway=mixed_lift]::dash {
   color: @aerialway;
   width: 2.5;
   z-index: 1049;
-  dashes: 1, 20;
+  dashes: 0.9,18;
 }
 
 node|z14[aerialway=station],