Updated styles

4 files changed, 145 insertions, 140 deletions

diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index cca86523fb..16a3277918 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -602,34 +602,34 @@ area|z17[building],
 node|z17[building],
 area|z17[addr:housenumber][addr:street],
 node|z17[addr:housenumber][addr:street]
-{font-size: 13;}
+{font-size: 15;}
 area|z17[building]::int_name,
 node|z17[building]::int_name,
 area|z17[addr:housenumber][addr:street]::int_name,
 node|z17[addr:housenumber][addr:street]::int_name
-{font-size: 12.5;}
+{font-size: 14.5;}
 
 area|z18[building],
 node|z18[building],
 area|z18[addr:housenumber][addr:street],
 node|z18[addr:housenumber][addr:street]
-{font-size: 14;}
+{font-size: 16;}
 area|z18[building]::int_name,
 node|z18[building]::int_name,
 area|z18[addr:housenumber][addr:street]::int_name,
 node|z18[addr:housenumber][addr:street]::int_name
-{font-size: 13;}
+{font-size: 15;}
 
 area|z19[building],
 node|z19[building],
 area|z19[addr:housenumber][addr:street],
 node|z19[addr:housenumber][addr:street]
-{font-size: 14.5;}
+{font-size: 17.5;}
 area|z19[building]::int_name,
 node|z19[building]::int_name,
 area|z19[addr:housenumber][addr:street]::int_name,
 node|z19[addr:housenumber][addr:street]::int_name
-{font-size: 14;}
+{font-size: 17;}
 
 
 
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 442613d95a..f0eb6e5b29 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -185,7 +185,7 @@ node|z17-[boundary=national_park],
 area|z17-[boundary=national_park],
 node|z17-[leisure=nature_reserve],
 area|z17-[leisure=nature_reserve]
-{icon-image: nparkf-l.svg;text-offset: 10;font-size: 12.75;text-halo-opacity: 0.9;}
+{icon-image: nparkf-l.svg;text-offset: 10;font-size: 13.75;text-halo-opacity: 0.9;}
 
 
 
@@ -300,7 +300,7 @@ area|z15[building=train_station]::int_name,
 node|z16[railway=station],
 node|z16[railway=halt],
 area|z16[building=train_station],
-{icon-image: train-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;}
+{icon-image: train-l.svg;text-offset: 8;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,
@@ -308,7 +308,7 @@ area|z16[building=train_station]::int_name,
 node|z17-[railway=station],
 node|z17-[railway=halt],
 area|z17-[building=train_station],
-{icon-image: train-l.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.9;}
+{icon-image: train-l.svg;text-offset: 8;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,
@@ -333,9 +333,9 @@ node|z16-[railway=station][transport=subway]::int_name
 
 
 node|z17-[railway=subway_entrance]
-{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 13.25;text-halo-opacity: 0.9;}
+{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 14.25;text-halo-opacity: 0.9;}
 node|z17-[railway=subway_entrance]::int_name
-{text-offset: 8;font-size: 11;text-halo-opacity: 0.9;} /*check*/
+{text-offset: 8;font-size: 12;text-halo-opacity: 0.9;} /*check*/
 
 /* 3.2.1 Moscow Subway Station */
 
@@ -371,13 +371,13 @@ node|z16[railway=subway_entrance][city=moscow]
 node|z16[railway=subway_entrance][city=moscow]::int_name
 {text-offset: 25;font-size: 10;}
 node|z17[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.75;}
 node|z17[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 11;}
+{text-offset: 25;font-size: 12;}
 node|z18-[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 14.5;}
 node|z18-[railway=subway_entrance][city=moscow]::int_name
-{text-offset: 25;font-size: 11;}
+{text-offset: 25;font-size: 12;}
 
 /* 3.2.2 Saint Petersburg Subway Station */
 
@@ -408,30 +408,30 @@ node|z16[railway=subway_entrance][city=spb]
 node|z16[railway=subway_entrance][city=spb]::int_name
 {text-offset: 25;font-size: 11;text-halo-opacity: 0.8;}
 node|z17[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.75;text-halo-opacity: 0.8;}
 node|z17[railway=subway_entrance][city=spb]::int_name
-{text-offset: 25;font-size: 11;text-halo-opacity: 0.8;}
+{text-offset: 25;font-size: 12;text-halo-opacity: 0.8;}
 node|z18-[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.5;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 14.5;text-halo-opacity: 0.8;}
 node|z18-[railway=subway_entrance][city=spb]::int_name
-{text-offset: 25;font-size: 12;text-halo-opacity: 0.8;}
+{text-offset: 25;font-size: 13;text-halo-opacity: 0.8;}
 
 /* 3.2.3 Minsk Subway Station */
 node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 4;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;}
 node|z15[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-m.svg;text-offset: 5;}
 node|z16[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;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-l.svg;font-size: 13;}
-node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 13;}
+node|z17-[railway=station][transport=subway][city=minsk] {icon-image: zero-icon.svg;font-size: 11;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
+node|z17-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;text-offset: 6;font-size: 13;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-l.svg;font-size: 14;}
+node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-l.svg;font-size: 14;}
 
 /* 3.2.4 Kiev Subway Station */
 node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.svg;text-offset: 8;font-size: 10;text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-m.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: zero-icon.svg;font-size: 10;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
-node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 13;}
+node|z17-[railway=station][transport=subway][city=kiev] {icon-image: zero-icon.svg;font-size: 11;text: name;text-color: @district_label;text-halo-radius: 0;}/*check none*/
+node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 14;}
 
 /* 3.2.5 London Subway Station */
 node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;icon-min-distance: 1;}
@@ -493,13 +493,13 @@ node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-l.s
 
 node|z17[railway=tram_stop],
 area|z17[railway=tram_stop]
-{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0;text-halo-opacity: 0;}
+{icon-image: tram-l.svg;text-offset: 8;font-size: 13;text-opacity: 0;text-halo-opacity: 0;}
 node|z17-[railway=tram_stop]::int_name,
 area|z17-[railway=tram_stop]::int_name
-{text-offset: 8;font-size: 10;text-opacity: 0; text-halo-opacity: 0;} /*check*/
+{text-offset: 8;font-size: 11;text-opacity: 0; text-halo-opacity: 0;} /*check*/
 node|z18-[railway=tram_stop],
 area|z18-[railway=tram_stop]
-{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;}
+{icon-image: tram-l.svg;text-offset: 8;font-size: 13;text-opacity: 0; text-halo-opacity: 0;}
 
 /* 3.4 Bus Station */
 
@@ -544,19 +544,19 @@ area|z17-[aeroway=airport],
 node|z17-[aeroway=airport],
 area|z17-[aeroway=aerodrome],
 node|z17-[aeroway=aerodrome],
-{icon-image: airport-l.svg;text-offset: 7;font-size: 12;}
+{icon-image: airport-l.svg;text-offset: 7;font-size: 13;}
 area|z17-[aeroway=airport]::int_name,
 node|z17-[aeroway=airport]::int_name,
 area|z17-[aeroway=aerodrome]::int_name,
 node|z17-[aeroway=aerodrome]::int_name,
-{font-size: 11;}
+{font-size: 12;}
 
 
 
 
 area|z17-[aeroway=heliport],
 node|z17-[aeroway=heliport],
-{icon-image: helipad-l.svg;text-offset: 10;font-size: 10;text: name;text-color: @poi_label;}
+{icon-image: helipad-l.svg;text-offset: 10;font-size: 11;text: name;text-color: @poi_label;}
 
 /* 3.7 Aerialway */
 
@@ -598,40 +598,40 @@ area|z16[amenity=restaurant]
 {icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;}
 node|z17[amenity=cafe],
 area|z17[amenity=cafe]
-{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 12.75;}
+{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 13.75;}
 node|z17[amenity=restaurant],
 area|z17[amenity=restaurant]
-{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;}
+{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=fast_food],
 area|z17[amenity=fast_food]
-{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 12.75;}
+{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 13.75;}
 
 
 node|z18[amenity=cafe],
 area|z18[amenity=cafe]
-{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 13.5;}
+{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=restaurant],
 area|z18[amenity=restaurant]
-{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 13.5;}
+{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=fast_food],
 area|z18[amenity=fast_food]
-{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 13.5;}
+{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 14.5;}
 
 node|z19[amenity=cafe],
 area|z19[amenity=cafe]
-{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 13.5;}
+{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 14.5;}
 node|z19[amenity=restaurant],
 area|z19[amenity=restaurant]
-{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 13.5;}
+{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19[amenity=fast_food],
 area|z19[amenity=fast_food]
-{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 13.5;}
+{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 14.5;}
 
 
 /* 5.AMENITY (infrastructure) */
 node|z17-[amenity=place_of_worship],
 area|z17-[amenity=place_of_worship],
-{text: name;text-color: @poi_label;text-offset: 10;font-size: 9;}
+{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;}
 
 /*node|z13-[leisure=stadium],
 area|z13-[leisure=stadium],*/
@@ -672,11 +672,11 @@ area|z16[building=hospital]
 node|z17[amenity=hospital],
 node|z17[building=hospital],
 area|z17[building=hospital]
-{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 12.75;}
+{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 13.75;}
 node|z18-[amenity=hospital],
 node|z18-[building=hospital],
 area|z18-[building=hospital],
-{icon-image: hospital-xl.svg;font-size: 13.5;}
+{icon-image: hospital-xl.svg;font-size: 14.5;}
 
 
 
@@ -694,19 +694,19 @@ node|z16[amenity=university][!name]
 {}
 node|z17[amenity=university][name],
 area|z17[amenity=university][name]
-{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;}
+{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 13.75;}
 node|z17[amenity=university][!name],
 area|z17[amenity=university][!name]
 {}
 node|z18[amenity=university][name],
 area|z18[amenity=university][name]
-{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 13.5;}
+{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 14.5;}
 node|z18[amenity=university][!name],
 area|z18[amenity=university][!name]
 {}
 node|z19[amenity=university][name],
 area|z19[amenity=university][name]
-{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 13.5;}
+{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 14.5;}
 node|z19[amenity=university][!name],
 area|z19[amenity=university][!name]
 {}
@@ -722,36 +722,36 @@ area|z19[amenity=university][!name]
 
 node|z16-[amenity=place_of_worship],
 area|z16-[amenity=place_of_worship]
-{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 12.75;}
+{icon-image: place-of-worship-l.svg;icon-min-distance: 10;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian],
 area|z16-[amenity=place_of_worship][religion=christian]
-{icon-image: christian-l.svg;font-size: 12.75;}
+{icon-image: christian-l.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=muslim],
 area|z16-[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-l.svg;font-size: 12.75;}
+{icon-image: muslim-l.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=buddhist],
 area|z16-[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-l.svg;font-size: 12.75;}
+{icon-image: buddhist-l.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=hindu],
 area|z16-[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-l.svg;font-size: 12.75;}
+{icon-image: hindu-l.svg;font-size: 13;}
 
 
 node|z18-[amenity=place_of_worship],
 area|z18-[amenity=place_of_worship]
-{icon-image: place-of-worship-l.svg;font-size: 13.5;}
+{icon-image: place-of-worship-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian],
 area|z18-[amenity=place_of_worship][religion=christian]
-{icon-image: christian-l.svg;font-size: 13.5;}
+{icon-image: christian-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=muslim],
 area|z18-[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-l.svg;font-size: 13.5;}
+{icon-image: muslim-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=buddhist],
 area|z18-[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-l.svg;font-size: 13.5;}
+{icon-image: buddhist-l.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=hindu],
 area|z18-[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-l.svg;font-size: 13.5;}
+{icon-image: hindu-l.svg;font-size: 14.5;}
 
 
 /* 5.5 Others */
@@ -759,15 +759,15 @@ area|z18-[amenity=place_of_worship][religion=hindu]
 
 node|z17[amenity=bank],
 area|z17[amenity=bank]
-{icon-image: bank-l.svg;font-size: 12.75; icon-min-distance: 15}
+{icon-image: bank-l.svg;font-size: 13.75; icon-min-distance: 15}
 node|z18-[amenity=bank],
 area|z18-[amenity=bank]
-{icon-image: bank-xl.svg;font-size: 13.5; icon-min-distance: 10}
+{icon-image: bank-xl.svg;font-size: 14.5; icon-min-distance: 10}
 
 
 node|z12-14[barrier=toll_booth],
 area|z12-14[barrier=toll_booth]
-{icon-image: toll_booth-s.svg;icon-min-distance: 8;}
+{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
 node|z15-16[barrier=toll_booth],
 area|z15-16[barrier=toll_booth]
 {icon-image: toll_booth-l.svg;icon-min-distance: 8;}
@@ -797,7 +797,7 @@ area|z17-[amenity=vending_machine]
 {icon-image: vending-l.svg;icon-min-distance: 20;}
 node|z17-[amenity=vending_machine][vending=parking_tickets],
 area|z17-[amenity=vending_machine][vending=parking_tickets]
-{icon-image: parking-meter-l.svg;font-size: 12.5;}
+{icon-image: parking-meter-l.svg;font-size: 13.5;}
 node|z18-[amenity=vending_machine],
 area|z18-[amenity=vending_machine]
 {icon-image: vending-l.svg;}
@@ -826,10 +826,10 @@ area|z15[shop=mall]
 {icon-image: shop-m.svg;font-size:12.5;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
 node|z16-17[shop=mall],
 area|z16-17[shop=mall]
-{icon-image: shop-l.svg;font-size: 12.75;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
+{icon-image: shop-l.svg;font-size: 13.25;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
 node|z18-[shop=mall],
 area|z18-[shop=mall]
-{icon-image: shop-xl.svg;font-size: 13.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
+{icon-image: shop-xl.svg;font-size: 14.5;icon-min-distance: 8;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
 
 node|z14[shop=supermarket],
 area|z14[shop=supermarket]
@@ -839,12 +839,12 @@ area|z15[shop=supermarket]
 {icon-image: grocery-m.svg;font-size:12.5;icon-min-distance: 3;}
 node|z16-17[shop=supermarket],
 area|z16-17[shop=supermarket]
-{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 16;text-min-distance:6;}
+{icon-image: grocery-l.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;}
 
 
 node|z18-[shop=supermarket],
 area|z18-[shop=supermarket]
-{icon-image: grocery-xl.svg;font-size: 13.5;icon-min-distance: 15;}
+{icon-image: grocery-xl.svg;font-size: 14.5;icon-min-distance: 15;}
 
 
 node|z15[shop=car_repair][service=tyres],
@@ -855,37 +855,37 @@ area|z16[shop=car_repair][service=tyres]
 {icon-image: car-repair-l.svg;;-x-me-text-priority:15500;font-size: 12.75;}
 node|z17[shop=car_repair][service=tyres],
 area|z17[shop=car_repair][service=tyres]
-{icon-image: car-repair-l.svg;font-size: 12.75;}
+{icon-image: car-repair-l.svg;font-size: 13.75;}
 node|z18-[shop=car_repair][service=tyres],
 area|z18-[shop=car_repair][service=tyres]
-{icon-image: car-repair-l.svg;font-size: 13.5;}
+{icon-image: car-repair-l.svg;font-size: 14.5;}
 
 
 node|z17[shop=car],
 area|z17[shop=car]
-{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=motorcycle],
 area|z17[shop=motorcycle]
-{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_parts],
 area|z17[shop=car_parts]
-{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_repair],
 area|z17[shop=car_repair]
-{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 12.75;}
+{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 13.75;}
 
 node|z18-[shop=car],
 area|z18-[shop=car]
-{icon-image: car_shop-xl.svg;font-size: 13.5;}
+{icon-image: car_shop-xl.svg;font-size: 14.5;}
 node|z18-[shop=motorcycle],
 area|z18-[shop=motorcycle]
-{icon-image: motorcycle_shop-l.svg;font-size: 13.5;}
+{icon-image: motorcycle_shop-l.svg;font-size: 14.5;}
 node|z18-[shop=car_parts],
 area|z18-[shop=car_parts]
-{icon-image: car-part-xl.svg;font-size: 13.5;}
+{icon-image: car-part-xl.svg;font-size: 14.5;}
 node|z18-[shop=car_repair],
 area|z18-[shop=car_repair]
-{icon-image: car-repair-xl.svg;font-size: 13.5;}
+{icon-image: car-repair-xl.svg;font-size: 14.5;}
 
 
 /* 7. CAR */
@@ -921,10 +921,10 @@ area|z16[amenity=fuel]
 {icon-image: fuel-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=fuel],
 area|z17[amenity=fuel]
-{icon-image: fuel-l.svg;font-size: 12.75;}
+{icon-image: fuel-l.svg;font-size: 13.75;}
 node|z18-[amenity=fuel],
 area|z18-[amenity=fuel]
-{icon-image: fuel-xl.svg;font-size: 13.5;text:}
+{icon-image: fuel-xl.svg;font-size: 14.5;text:}
 
 node|z14[amenity=charging_station],
 area|z14[amenity=charging_station]
@@ -937,10 +937,10 @@ area|z16[amenity=charging_station]
 {icon-image: charging-station-l.svg;-x-me-text-priority:15500;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=charging_station],
 area|z17[amenity=charging_station]
-{icon-image: charging-station-l.svg; font-size: 12.75;}
+{icon-image: charging-station-l.svg; font-size: 13.75;}
 node|z18-[amenity=charging_station],
 area|z18-[amenity=charging_station]
-{icon-image: charging-station-xl.svg;font-size: 12.75;}
+{icon-image: charging-station-xl.svg;font-size: 14.75;}
 
 node|z13[highway=speed_camera]
 {icon-image: speedcam-l.svg; z-index: 75000;}
@@ -956,18 +956,18 @@ node|z18-[highway=speed_camera]
 
 node|z17[amenity=car_wash],
 area|z17[amenity=car_wash]
-{icon-image: car-wash-l.svg;font-size: 12.75;icon-min-distance: 24;}
+{icon-image: car-wash-l.svg;font-size: 13.75;icon-min-distance: 24;}
 node|z18-[amenity=car_wash],
 area|z18-[amenity=car_wash ]
-{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 14.5;}
 
 node|z18-[amenity=car_rental],
 area|z18-[amenity=car_rental]
-{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 14.5;}
 
 node|z18-[amenity=car_sharing],
 area|z18-[amenity=car_sharing]
-{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 14.5;}
 
 /* 7.1 Parking */
 
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index c1aa28645b..f7d240d348 100755
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -916,28 +916,33 @@ line|z19-[highway=proposed]
 
 /* 8.6 Track & Path 14-22 ZOOM */
 
-/*line|z14[highway=track][tracktype=grade1],
-line|z14[highway=raceway],
-line|z14[leisure=track]
-{width: 1;}
+line|z14-[highway=track][tracktype=grade1],
+line|z14-[psurface=unpaved_good],
+line|z14-[psurface=unpaved_bad]
+{color: @pedestrian;opacity: 1;}
+
+line|z14[highway=track][tracktype=grade1],
+line|z14[psurface=unpaved_good],
+line|z14[psurface=unpaved_bad]
+{width: 1.4;dashes: 2,1.35;}
 line|z15[highway=track][tracktype=grade1],
-line|z15[highway=raceway],
-line|z15[leisure=track]
-{width: 1.5;}
+line|z15[psurface=unpaved_good],
+line|z15[psurface=unpaved_bad]
+{width: 2;dashes: 2.2,1.26;}
 line|z16[highway=track][tracktype=grade1],
-line|z16[highway=raceway],
-line|z16[leisure=track]
-{width: 1.8;}
+line|z16[psurface=unpaved_good],
+line|z16[psurface=unpaved_bad]
+{width: 2.6;dashes: 3.3,1.8;}
 line|z17-18[highway=track][tracktype=grade1],
-line|z17-18[highway=raceway],
-line|z17-18[leisure=track]
-{width:3;}
+line|z17-18[psurface=unpaved_good],
+line|z17-18[psurface=unpaved_bad]
+{width: 3;dashes: 4,1.8;}
 line|z19-[highway=track][tracktype=grade1],
-line|z19-[highway=raceway],
-line|z19-[leisure=track]
-{width:4;}
+line|z19-[psurface=unpaved_good],
+line|z19-[psurface=unpaved_bad]
+{width: 4;dashes: 6.3,2.7;}
 
-line|z14[highway=track],
+/*line|z14[highway=track],
 line|z14[highway=path],
 line|z14[route=hiking]
 {width:0.9;dashes: 2.52,1.35;}
diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss
index 4ed05e61c0..af6950d033 100755
--- a/data/styles/vehicle/include/Roads_label.mapcss
+++ b/data/styles/vehicle/include/Roads_label.mapcss
@@ -295,39 +295,39 @@ line|z10-11[highway=motorway],
 line|z10-11[highway=trunk],
 line|z10-11[highway=motorway_link],
 line|z10-11[highway=trunk_link]
-{font-size: 12;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
+{font-size: 13;text-color: @label_medium;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
 line|z12-13[highway=motorway],
 line|z12-13[highway=trunk],
 line|z12-13[highway=motorway_link],
 line|z12-13[highway=trunk_link]
-{font-size: 13;text-halo-color: @label_halo_light;}
+{font-size: 15;text-halo-color: @label_halo_light;}
 line|z14-15[highway=motorway],
 line|z14-15[highway=trunk],
-{font-size: 14;text-color: @label_dark;text-halo-opacity: 0.9;}
+{font-size: 16;text-color: @label_dark;text-halo-opacity: 0.9;}
 line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 13.5;text-halo-color: @label_halo_medium;}
 line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
-{font-size: 12;text-halo-color: @label_halo_medium;}
+{font-size: 14;text-halo-color: @label_halo_medium;}
 line|z16[highway=trunk],
 line|z16[highway=motorway],
-{font-size: 16.5;text-color: @label_dark;text-halo-opacity: 0.9;}
+{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 0.9;}
 line|z16[highway=motorway_link],
 line|z16[highway=trunk_link]
-{font-size: 13.75;text-halo-opacity: 0.9;}
+{font-size: 15.75;text-halo-opacity: 0.9;}
 line|z17[highway=trunk],
 line|z17[highway=motorway],
-{font-size: 17.5;text-color: @label_dark;text-halo-opacity: 0.99;}
+{font-size: 19.5;text-color: @label_dark;text-halo-opacity: 0.99;}
 line|z17[highway=motorway_link],
 line|z17[highway=trunk_link]
-{font-size: 14;text-halo-opacity: 0.99;}
+{font-size: 16;text-halo-opacity: 0.99;}
 line|z18-[highway=trunk],
 line|z18-[highway=motorway],
-{font-size: 18.5;text-color: @label_dark;text-halo-opacity: 1;}
+{font-size: 20.5;text-color: @label_dark;text-halo-opacity: 1;}
 line|z18-[highway=motorway_link],
 line|z18-[highway=trunk_link]
-{font-size: 14.75;text-halo-opacity: 1;}
+{font-size: 16.75;text-halo-opacity: 1;}
 
 /* 4.PRIMARY 10-22 ZOOM */
 
@@ -337,31 +337,31 @@ line|z10-[highway=primary_link],
 
 line|z10[highway=primary],
 line|z10[highway=primary_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 12.5;text-halo-color: @label_halo_medium;}
 line|z11[highway=primary],
 line|z11[highway=primary_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 13.5;text-halo-color: @label_halo_medium;}
 line|z12-13[highway=primary],
 line|z12-13[highway=primary_link]
-{font-size: 12.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;}
+{font-size: 14.75;text-halo-opacity: 0.9;text-halo-color: @label_halo_medium;}
 line|z14-15[highway=primary],
-{font-size: 13.5;text-color: @label_dark;}
+{font-size: 15.5;text-color: @label_dark;}
 line|z14[highway=primary_link]
-{font-size: 11;text-halo-color: @label_halo_medium;}
+{font-size: 13;text-halo-color: @label_halo_medium;}
 line|z15[highway=primary_link]
-{font-size: 11.5;text-halo-color: @label_halo_medium;}
+{font-size: 13.5;text-halo-color: @label_halo_medium;}
 line|z16[highway=primary],
-{font-size: 15.5;text-color: @label_dark;}
+{font-size: 17.5;text-color: @label_dark;}
 line|z16[highway=primary_link],
-{font-size: 13;}
+{font-size: 15;}
 line|z17[highway=primary],
-{font-size: 16.75;text-color: @label_dark;}
+{font-size: 18.75;text-color: @label_dark;}
 line|z17[highway=primary_link],
-{font-size: 13.5;}
+{font-size: 15.5;}
 line|z18-[highway=primary],
-{font-size: 17;text-color: @label_dark;}
+{font-size: 19;text-color: @label_dark;}
 line|z18-[highway=primary_link],
-{font-size: 14.5;text-halo-opacity: 1;}
+{font-size: 16.5;text-halo-opacity: 1;}
 
 /* 5.SECONDARY 10-22 ZOOM */
 
@@ -370,22 +370,22 @@ line|z16-[highway=secondary_link]
 {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
 
 line|z10-11[highway=secondary]
-{font-size: 11;text-color: @label_light;}
+{font-size: 12;text-color: @label_light;}
 line|z12-13[highway=secondary]
-{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
+{font-size: 14;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
 line|z14[highway=secondary],
-{font-size: 12.75;}
+{font-size: 14.75;}
 line|z15[highway=secondary],
-{font-size: 13.75;}
+{font-size: 15.75;}
 line|z16[highway=secondary],
 line|z16[highway=secondary_link]
-{font-size: 15;text-color: @label_dark;text-halo-color: @label_halo_light;}
+{font-size: 17;text-color: @label_dark;text-halo-color: @label_halo_light;}
 line|z17[highway=secondary],
 line|z17[highway=secondary_link]
-{font-size: 15.75;text-color: @label_dark;text-halo-color: @label_halo_light;}
+{font-size: 17.75;text-color: @label_dark;text-halo-color: @label_halo_light;}
 line|z18-[highway=secondary],
 line|z18-[highway=secondary_link]
-{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 18;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 6.RESIDENTAL & TERTIARY 12-22 ZOOM */
 
@@ -397,24 +397,24 @@ line|z18-[highway=tertiary_link]
 
 line|z12-13[highway=residential],
 line|z12-13[highway=tertiary]
-{font-size: 10;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
+{font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
 line|z14[highway=residential],
 line|z14[highway=tertiary],
-{font-size: 11;}
+{font-size: 13;}
 line|z15[highway=residential],
 line|z15[highway=tertiary],
-{font-size: 12.5;}
+{font-size: 14.5;}
 line|z16[highway=residential],
 line|z16[highway=tertiary],
-{font-size: 13.5;text-halo-color: @label_halo_light;}
+{font-size: 15.5;text-halo-color: @label_halo_light;}
 line|z17[highway=residential],
 line|z17[highway=tertiary],
-{font-size: 14.25;text-halo-color: @label_halo_light;}
+{font-size: 16.25;text-halo-color: @label_halo_light;}
 line|z18-[highway=residential],
 line|z18-[highway=residential_link],
 line|z18-[highway=tertiary],
 line|z18-[highway=tertiary_link]
-{font-size: 15;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 17;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */
 
@@ -429,25 +429,25 @@ line|z14[highway=unclassified],
 line|z14[highway=living_street],
 line|z14[highway=pedestrian],
 line|z14[highway=road],
-{font-size: 10.5;}
+{font-size: 12.5;}
 line|z15[highway=unclassified],
 line|z15[highway=living_street],
 line|z15[highway=pedestrian],
 line|z15[highway=road],
-{font-size: 11.5;}
+{font-size: 13.5;}
 line|z16-17[highway=unclassified],
 line|z16-17[highway=living_street],
-{font-size: 12.5;text-halo-color: @label_halo_light;}
+{font-size: 14.5;text-halo-color: @label_halo_light;}
 line|z16-17[highway=pedestrian],
 line|z16-17[highway=service],
 line|z16-17[highway=road],
-{font-size: 12.5;text-halo-color: @label_halo_light;}
+{font-size: 15.5;text-halo-color: @label_halo_light;}
 line|z18-[highway=unclassified],
 line|z18-[highway=living_street],
 line|z18-[highway=pedestrian],
 line|z18-[highway=service],
 line|z18-[highway=road],
-{font-size: 13.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 15.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 8.OTHERS ROADS 15-22 ZOOM */