diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index 64d5954fb0..61bfff1f8e 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -1,37 +1,88 @@
 /* Keep here changes of the base map style file only. */
 @import("../../clear/include/Basemap.mapcss");
 
-/* ~~~~ CONTENT OF BASEMAP ~~~~~
 
-1.Z-INDEX of BASEMAP
-2.LAND
-3.BOUNDARY
-  3.1 Countries
-  3.2 Region
-  3.3 Military
-4.VEGETATION
-5.BEACH, GLACIER, DESERT, etc.
-6.WATER
-  6.1 Area water(lake,pond etc.)
-  6.2 Line water(river,canal etc.)
-7.LANDUSE
-  7.1 Industrial
-  7.2 Hospital
-  7.3 University & Sport
-  7.4 Cemetery
-  7.5 Pedestrian areas
-  7.6 Airports
-  7.7 Religion
-  7.8 Agricultural
-8.BUILDINGS
-  8.1 Pier, dam, cutline
-  8.2 Building
-  8.3 Barriers, cliffs
-9.ISOLINES
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
+/* 6.WATER */
+
+line|z10-[waterway=river],
+line|z10-[waterway=riverbank],
+line|z11-[waterway=stream],
+line|z11-[waterway=canal],
+line|z11-[natural=strait],
+line|z13-[waterway=fish_pass],
+line|z15-[waterway=ditch],
+line|z15-[waterway=drain],
+{opacity: 1; color: @river;}
+
+/* 6.2 Line water(river,canal etc.) */
+
+line|z10-[waterway=river],
+line|z10-[waterway=riverbank],
+line|z11-[natural=strait],
+line|z11-[waterway=stream],
+line|z11-[waterway=canal],
+line|z13-[waterway=fish_pass],
+{text-color: @water_label; text-halo-opacity: 0.5; text-halo-radius: 1; text-halo-color: @label_halo_light;}
+
+line|z10[waterway=river],
+line|z10[waterway=riverbank],
+{width: 1.4;}
+
+line|z11-12[waterway=river],
+line|z11-12[waterway=riverbank],
+line|z11-12[natural=strait],
+{width: 2;}
+line|z11-12[waterway=stream],
+line|z11-12[waterway=canal],
+{width: 1;}
+
+line|z13[waterway=river],
+line|z13[waterway=riverbank],
+line|z13[natural=strait],
+{width: 2.7;}
+line|z13[waterway=stream],
+line|z13[waterway=canal],
+line|z13[waterway=fish_pass],
+{width: 1.3;}
+line|z11-12[waterway=stream][intermittent],
+{width: 0;}
+line|z13[waterway=stream][intermittent],
+{width: 1; dashes: 2.7,2.7;}
+
+line|z14[waterway=river],
+line|z14[waterway=riverbank],
+line|z14[natural=strait],
+{width: 3.5;}
+line|z14[waterway=stream],
+line|z14[waterway=canal],
+line|z14[waterway=fish_pass],
+{width: 1.8;}
+line|z14[waterway=stream][intermittent],
+{width: 1.4; dashes: 3.5,3.5;}
+
+line|z15-[waterway=river],
+line|z15-[waterway=riverbank],
+line|z15-[natural=strait],
+{width: 4.6;}
+line|z15-[waterway=stream],
+line|z15-[waterway=canal],
+line|z15-[waterway=fish_pass],
+{width: 2.4;}
+line|z15-[waterway=stream][intermittent],
+{width: 2; dashes: 5,5;}
+
+line|z15-[waterway=ditch],
+line|z15-[waterway=drain],
+{width: 1.6; dashes: 0.9,0.9;}
+line|z17-[waterway=ditch],
+line|z17-[waterway=drain],
+{width: 2;}
+
+/* Do not draw tunnel waterways */
+
+line[waterway][tunnel]
+{width: 0;}
 
-/* 8.BUILDINGS */
 
 /* 8.1 Pier, dam, cutline */
 
@@ -59,8 +110,8 @@ line|z18-[man_made=cutline],
   Set width = triangle height + base height.
 */
 
-line|z13-[natural=cliff],
-line|z13-[natural=earth_bank],
+line|z12-13[natural=cliff],
+line|z12-13[natural=earth_bank],
 {color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.7;}
 line|z14[natural=cliff],
 line|z14[natural=earth_bank],
@@ -98,37 +149,44 @@ line|z15-[isoline=zero],
 line|z15-[isoline=step_10],
 {color: @isoline10;}
 
-line|z10-[isoline=step_1000],
-{width: 1.3;opacity: 0.8;}
-line|z10-[isoline=step_500],
-{width: 1.0;opacity: 0.5;}
 
-line|z12[isoline=step_500],
-{width: 1.3;opacity: 0.6;}
+line|z10-11[isoline=step_1000],
+{width: 0.8; opacity: 0.6;}
+line|z10-11[isoline=step_500],
+{width: 0.8; opacity: 0.35;}
 
-line|z13-[isoline=step_500],
-{width: 1.3;opacity: 0.8;}
-line|z12[isoline=step_100],
-{width: 1.0;opacity: 0.5;}
+line|z12-13[isoline=step_1000],
+{width: 1.0; opacity: 0.6;}
+line|z12-13[isoline=step_500],
+{width: 0.8; opacity: 0.5;}
+line|z12-13[isoline=step_100],
+{width: 0.8; opacity: 0.35;}
 
-line|z13-14[isoline=step_100],
-{width: 1.3;opacity: 0.6;}
-
-line|z15[isoline=step_100],
-{width: 1.3;opacity: 0.8;}
+line|z14-[isoline=step_1000],
+{width: 1.2; opacity: 0.8;}
+line|z14-15[isoline=step_500],
+{width: 1.0; opacity: 0.6;}
+line|z14-15[isoline=step_100],
+{width: 0.8; opacity: 0.5;}
 line|z14-15[isoline=step_50],
+{width: 0.8; opacity: 0.35;}
+
 line|z15[isoline=zero],
 line|z15[isoline=step_10],
-{width: 1.0;opacity: 0.5;}
+{width: 0.8; opacity: 0.35;}
 
+line|z16-[isoline=step_500],
+{width: 1.2; opacity: 0.8;}
 line|z16-[isoline=step_100],
-{width: 1.3;opacity: 0.8;}
-line|z16[isoline=step_50],
-line|z16[isoline=zero],
-line|z16[isoline=step_10],
-{width: 1.0;opacity: 0.6;}
+{width: 1.0; opacity: 0.6;}
+line|z16-17[isoline=step_50],
+{width: 0.8; opacity: 0.5;}
+line|z16-17[isoline=zero],
+line|z16-17[isoline=step_10],
+{width: 0.8; opacity: 0.5;}
 
-line|z17-[isoline=step_50],
-line|z17-[isoline=zero],
-line|z17-[isoline=step_10],
-{width: 1.3;opacity: 0.8;}
+line|z18-[isoline=step_50],
+{width: 1.0; opacity: 0.6;}
+line|z18-[isoline=zero],
+line|z18-[isoline=step_10],
+{width: 0.8; opacity: 0.6;}
diff --git a/data/styles/outdoors/include/Basemap_label.mapcss b/data/styles/outdoors/include/Basemap_label.mapcss
index 66a652167c..be1d2a5e58 100644
--- a/data/styles/outdoors/include/Basemap_label.mapcss
+++ b/data/styles/outdoors/include/Basemap_label.mapcss
@@ -1,38 +1,6 @@
 /* Keep here changes of the base map style file only. */
 @import("../../clear/include/Basemap_label.mapcss");
 
-/* ~~~~ CONTENT OF BASEMAP lable ~~~~~
-
-1.Z-INDEX of BASEMAP LABEL
-2.CONTINENTS
-3.COUNTRIES & STATES
-4.PLACES
-  4.1 City
-  4.2 Town
-  4.3 Village
-  4.4 Districts & Small localities
-5.VEGETATION, BEACH & GLACIER
-  5.1 Vegetation
-  5.2 Beach, Glacier, Desert, etc.
-6.WATER
-  6.1 Area water(lake,pond etc.)
-  6.2 Line water(river,canal etc.)
-7.LANDUSE
-  7.1 Industrial
-  7.2 Hostital
-  7.3 University & Sport
-  7.4 Cemetry
-  7.5 Pedestrian areas
-  7.6 Military
-  7.7 Commercial
-8.BUILDINGS
-  8.1 Pier
-  8.2 Building
-  8.3 Airports
-  8.4 Platforms
-9.ISOLINES
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
 
 /* 9. ISOLINES */
 
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index e774ce61c6..19e1fb7019 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -1,106 +1,109 @@
 /* Keep here changes of the base map style file only. */
 @import("../../clear/include/Icons.mapcss");
 
-/* ~~~~ CONTENT OF ICONS~~~~~
-
-1.Z-INDEX of ICONS
-2.NATURAL
-3.TRANSPORT
- 3.1 Train Station
- 3.2 Subway Station
- 3.3 Tram Station
- 3.4 Bus Station
- 3.5 Ferry terminal
- 3.6 Airport
- 3.7 Aerialway
-4.TOURISM
- 4.1 Main POI
- 4.2 Apartament
- 4.3 Food
-5.AMENITY (infrastructure)
- 5.1 Hospital
- 5.2 Education
- 5.3 Sport
- 5.4 Religion
- 5.5 Others
-6.SHOP
- 6.1 Craft
-7.CAR
- 7.1 Parking
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
 
 /* 2. NATURAL */
 
-node|z10-[natural=cave_entrance],
-area|z10-[natural=cave_entrance],
-node|z10-[waterway=waterfall],
-area|z10-[waterway=waterfall],
-node|z10-[natural=peak],
-area|z10-[natural=peak],
-node|z11-[natural=saddle],
-area|z11-[natural=saddle],
-node|z11-[mountain_pass],
-area|z11-[mountain_pass],
-node|z11-[natural=spring],
-area|z11-[natural=spring],
-node|z12-[natural=hot_spring],
-area|z12-[natural=hot_spring],
+node|z11-[natural=cave_entrance],
+area|z11-[natural=cave_entrance],
+node|z11-[waterway=waterfall],
+area|z11-[waterway=waterfall],
+node|z11-[natural=peak][name],
+node|z12-[natural=saddle],
+area|z12-[natural=saddle],
+node|z12-[mountain_pass],
+area|z12-[mountain_pass],
+node|z14-[natural=spring],
+area|z14-[natural=spring],
+node|z14-[amenity=water_point],
+area|z14-[amenity=water_point],
+node|z14-[amenity=drinking_water],
+area|z14-[amenity=drinking_water],
+node|z14-[man_made=water_tap],
+area|z14-[man_made=water_tap],
+node|z14-[man_made=water_well],
+area|z14-[man_made=water_well],
+node|z15-[natural=hot_spring],
+area|z15-[natural=hot_spring],
 node|z12-[natural=geyser],
 area|z12-[natural=geyser],
 node|z14-[natural=beach],
 area|z14-[natural=beach],
-area|z12-[natural=bare_rock],
-{text: name;text-color: @poi_label;text-position: center;text-offset: 1;text-optional: true;}
+area|z13-[natural=bare_rock][name],
+{text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;}
+node|z11-[natural=peak][!name],
+area|z13-[natural=bare_rock][!name],
+{text: none;}
 
-node|z10-11[natural=cave_entrance],
-area|z10-11[natural=cave_entrance],
+node|z11-[boundary=national_park],
+area|z11-[boundary=national_park],
+node|z11-[boundary=protected_area],
+area|z11-[boundary=protected_area],
+node|z11-[leisure=nature_reserve],
+area|z11-[leisure=nature_reserve]
+{text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;font-size: 10;}
+
+node|z10-12[natural=cave_entrance],
+area|z10-12[natural=cave_entrance],
 {icon-image: cave-s.svg; icon-min-distance: 20;}
-node|z12-[natural=cave_entrance],
-area|z12-[natural=cave_entrance],
-{icon-image: cave-s.svg;}
-node|z14-[natural=cave_entrance],
-area|z14-[natural=cave_entrance],
-{icon-image: cave-m.svg;}
-node|z17-[natural=cave_entrance],
-area|z17-[natural=cave_entrance],
-{font-size: 11;}
+node|z13-[natural=cave_entrance],
+area|z13-[natural=cave_entrance],
+{icon-image: cave-m.svg; font-size: 11;}
+node|z16-[natural=cave_entrance],
+area|z16-[natural=cave_entrance],
+{font-size: 12;}
 
-node|z10-11[waterway=waterfall],
-area|z10-11[waterway=waterfall],
+node|z10-12[boundary=national_park],
+area|z10-12[boundary=national_park],
+node|z10-12[boundary=protected_area],
+area|z10-12[boundary=protected_area],
+node|z10-12[leisure=nature_reserve],
+area|z10-12[leisure=nature_reserve]
+{icon-image: nparkf-outline-s.svg;icon-min-distance: 20;}
+node|z13-[boundary=national_park],
+area|z13-[boundary=national_park],
+node|z13-[boundary=protected_area],
+area|z13-[boundary=protected_area],
+node|z13-[leisure=nature_reserve],
+area|z13-[leisure=nature_reserve]
+{icon-image: nparkf-outline-m.svg;font-size: 11;text-halo-opacity: 0.9;}
+node|z17-[boundary=national_park],
+area|z17-[boundary=national_park],
+node|z17-[boundary=protected_area],
+area|z17-[boundary=protected_area],
+node|z17-[leisure=nature_reserve],
+area|z17-[leisure=nature_reserve]
+{font-size: 12;}
+
+node|z10-12[waterway=waterfall],
+area|z10-12[waterway=waterfall],
 {icon-image: waterfall-s.svg; icon-min-distance: 15;}
-node|z12-[waterway=waterfall],
-area|z12-[waterway=waterfall],
-{icon-image: waterfall-s.svg;}
-node|z15-[waterway=waterfall],
-area|z15-[waterway=waterfall],
-{icon-image: waterfall-m.svg;}
+node|z13-[waterway=waterfall],
+area|z13-[waterway=waterfall],
+{icon-image: waterfall-m.svg; font-size: 11;}
+node|z16-[waterway=waterfall],
+area|z16-[waterway=waterfall],
+{font-size: 12;}
 
-node|z10-[natural=volcano],
-area|z10-[natural=volcano],
+node|z10-12[natural=volcano],
+area|z10-12[natural=volcano],
 {icon-image: volcano-s.svg;}
-node|z14-[natural=volcano],
-area|z14-[natural=volcano],
-{icon-image: volcano-m.svg;}
+node|z13-[natural=volcano],
+area|z13-[natural=volcano],
+{icon-image: volcano-m.svg; font-size: 11;}
+node|z16-[natural=volcano],
+area|z16-[natural=volcano],
+{font-size: 12;}
 
 node|z10-12[natural=peak][name],
-area|z10-12[natural=peak][name],
 {icon-image: peakt-s.svg;icon-min-distance: 10;}
-node|z10-14[natural=peak][!name],
-node|z12-14[natural=bare_rock][!name],
-area|z10-14[natural=peak][!name],
-area|z12-14[natural=bare_rock][!name],
-{font-size: 0;}
-node|z12-13[natural=peak][name],
-area|z12-13[natural=peak][name],
-{icon-image: peakt-s.svg; font-size: 9;}
-node|z14[natural=peak][name],
-area|z14[natural=peak][name]
-{icon-image: peakt-m.svg;}
-node|z15-[natural=peak],
-node|z15-[natural=rock],
-area|z15-[natural=peak],
-area|z15-[natural=rock]
+node|z13-[natural=peak][name],
+{icon-image: peakt-m.svg;font-size: 11;}
+node|z16-[natural=peak][name],
+{font-size: 12;}
+node|z13-15[natural=peak][!name],
+{icon-image: peakt-s.svg;}
+node|z16-[natural=peak][!name],
 {icon-image: peakt-m.svg;}
 
 /* ToDo: Make the same as natural=peak when we will have -s,-m icons */
@@ -113,35 +116,37 @@ node|z13-[natural=saddle],
 area|z13-[natural=saddle],
 node|z13-[mountain_pass],
 area|z13-[mountain_pass],
-{text-offset: 1;font-size: 10;text-optional: true;}
-
-node|z11-14[natural=spring],
-area|z11-14[natural=spring],
-node|z12-14[natural=hot_spring],
-area|z12-14[natural=hot_spring],
-{icon-image: drinking-water-s.svg; text-offset:6; icon-min-distance: 24;}
-node|z15-[natural=spring],
-area|z15-[natural=spring],
-node|z15-[natural=hot_spring],
-area|z15-[natural=hot_spring],
-{icon-image: drinking-water-m.svg; text-offset:8; icon-min-distance: 24;}
+{font-size: 11;}
+node|z16-[natural=saddle],
+area|z16-[natural=saddle],
+node|z16-[mountain_pass],
+area|z16-[mountain_pass],
+{font-size: 12;}
 
 node|z10-12[natural=geyser],
 area|z10-12[natural=geyser],
-{icon-image: geyser-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;text-optional: true;}
+{icon-image: geyser-s.svg; icon-min-distance: 24;}
 node|z13-[natural=geyser],
 area|z13-[natural=geyser],
-{icon-image: geyser-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;text-optional: true;}
+{icon-image: geyser-m.svg; font-size: 11;}
+node|z16-[natural=geyser],
+area|z16-[natural=geyser],
+{font-size: 12;}
+
+node|z12-14[amenity=water_point],
+area|z12-14[amenity=water_point],
+node|z12-14[amenity=drinking_water],
+area|z12-14[amenity=drinking_water],
+node|z12-14[man_made=water_tap],
+area|z12-14[man_made=water_tap],
+node|z12-14[man_made=water_well],
+area|z12-14[man_made=water_well],
+node|z12-14[natural=spring],
+area|z12-14[natural=spring],
+node|z12-14[natural=hot_spring],
+area|z12-14[natural=hot_spring],
+{icon-image: drinking-water-s.svg;}
 
-node|z12-[amenity=water_point],
-area|z12-[amenity=water_point],
-node|z12-[amenity=drinking_water],
-area|z12-[amenity=drinking_water],
-node|z12-[man_made=water_tap],
-area|z12-[man_made=water_tap],
-node|z12-[man_made=water_well],
-area|z12-[man_made=water_well],
-{icon-image: drinking-water-s.svg; icon-min-distance: 36; text-optional: true;}
 node|z15-[amenity=water_point],
 area|z15-[amenity=water_point],
 node|z15-[amenity=drinking_water],
@@ -150,81 +155,120 @@ node|z15-[man_made=water_tap],
 area|z15-[man_made=water_tap],
 node|z15-[man_made=water_well],
 area|z15-[man_made=water_well],
-{icon-image: drinking-water-m.svg;}
+node|z15-[natural=spring],
+area|z15-[natural=spring],
+node|z15-[natural=hot_spring],
+area|z15-[natural=hot_spring],
+{icon-image: drinking-water-m.svg; font-size: 11;}
 
 /* 4.TOURISM */
 
 /* 4.2 Apartament */
 
-node|z13-[tourism=alpine_hut],
-area|z13-[tourism=alpine_hut],
+node|z11-[tourism=alpine_hut],
+area|z11-[tourism=alpine_hut],
 node|z13-[tourism=wilderness_hut],
 area|z13-[tourism=wilderness_hut],
+node|z13-[tourism=viewpoint],
 node|z15-[tourism=chalet],
 area|z15-[tourism=chalet],
 node|z14-[tourism=camp_site],
 area|z14-[tourism=camp_site],
 node|z14-[tourism=picnic_site],
 area|z14-[tourism=picnic_site],
-node|z15-[leisure=picnic_table],
-area|z15-[leisure=picnic_table],
+node|z16-[leisure=picnic_table],
+area|z16-[leisure=picnic_table],
 node|z13-[amenity=shelter],
 area|z13-[amenity=shelter],
-node|z15-[tourism=caravan_site],
-area|z15-[tourism=caravan_site]
+node|z14-[tourism=caravan_site],
+area|z14-[tourism=caravan_site],
 {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
 
-node|z13-[tourism=alpine_hut],
-area|z13-[tourism=alpine_hut],
+node|z11-[tourism=alpine_hut],
+area|z11-[tourism=alpine_hut],
+node|z13-[tourism=wilderness_hut],
+area|z13-[tourism=wilderness_hut],
+{icon-image: alpine_hut-s.svg; icon-min-distance: 24;}
+node|z11-[tourism=alpine_hut],
+area|z11-[tourism=alpine_hut],
 node|z13-[tourism=wilderness_hut],
 area|z13-[tourism=wilderness_hut],
 node|z15-[tourism=chalet],
-area|z15-[tourism=chalet]
-{icon-image: alpine_hut-m.svg; icon-min-distance: 24;}
-
-node|z17-[tourism=alpine_hut],
-area|z17-[tourism=alpine_hut],
-node|z17-[tourism=wilderness_hut],
-area|z17-[tourism=wilderness_hut],
-node|z17-[tourism=chalet],
-area|z17-[tourism=chalet]
-{icon-min-distance: 16;}
+area|z15-[tourism=chalet],
+{font-size: 11;}
+node|z14-[tourism=alpine_hut],
+area|z14-[tourism=alpine_hut],
+node|z14-[tourism=wilderness_hut],
+area|z14-[tourism=wilderness_hut],
+node|z15-[tourism=chalet],
+area|z15-[tourism=chalet],
+{icon-image: alpine_hut-m.svg;}
+node|z16-[tourism=alpine_hut],
+area|z16-[tourism=alpine_hut],
+node|z16-[tourism=wilderness_hut],
+area|z16-[tourism=wilderness_hut],
+node|z16-[tourism=chalet],
+area|z16-[tourism=chalet],
+{font-size: 12; icon-min-distance: 0;}
 
 node|z14-[tourism=camp_site],
-area|z14-[tourism=camp_site]
-{icon-image: campsite-m.svg;icon-min-distance: 12;}
+area|z14-[tourism=camp_site],
+{icon-image: campsite-m.svg; icon-min-distance: 12; font-size: 11;}
+node|z16-[tourism=camp_site],
+area|z16-[tourism=camp_site],
+{font-size: 12; icon-min-distance: 0;}
 
 node|z14-[tourism=picnic_site],
 area|z14-[tourism=picnic_site],
-{icon-image: picnic-m.svg;icon-min-distance: 10;}
+{icon-image: picnic-m.svg;icon-min-distance: 10;font-size: 11;}
+node|z16-[tourism=picnic_site],
+area|z16-[tourism=picnic_site],
+{font-size: 12; icon-min-distance: 0;}
+
 node|z15-[leisure=picnic_table],
-area|z15-[leisure=picnic_table]
-{icon-image: picnic_table-m.svg;icon-min-distance: 10;}
+area|z15-[leisure=picnic_table],
+{icon-image: picnic_table-m.svg;}
+node|z16-[leisure=picnic_table],
+area|z16-[leisure=picnic_table],
+{font-size: 11;}
 
+/* need a small icon */
 node|z13-[amenity=shelter],
-area|z13-[amenity=shelter]
-{icon-image: shelter-m.svg;icon-min-distance: 10;}
+area|z13-[amenity=shelter],
+{icon-image: shelter-m.svg;icon-min-distance: 10; font-size: 11;}
+node|z16-[amenity=shelter],
+area|z16-[amenity=shelter],
+{font-size: 12; icon-min-distance: 0;}
 
-node|z15-[tourism=caravan_site],
-area|z15-[tourism=caravan_site]
+node|z14-[tourism=caravan_site],
+area|z14-[tourism=caravan_site],
 {icon-image: caravan_site-m.svg;font-size: 11;icon-min-distance: 30;}
-node|z17-[tourism=caravan_site],
-area|z17-[tourism=caravan_site]
-{icon-min-distance: 20;}
+node|z16-[tourism=caravan_site],
+area|z16-[tourism=caravan_site],
+{font-size: 12; icon-min-distance: 0;}
+
+node|z11-12[tourism=viewpoint],
+{icon-image: viewpoint-s.svg;}
+node|z13-[tourism=viewpoint],
+{icon-image: viewpoint-m.svg; font-size: 11;}
+node|z16-[tourism=viewpoint],
+{font-size: 12;}
 
-/* 5.AMENITY (infrastructure) */
 
 /* 5.5 Others */
 
-node|z11-[man_made=lighthouse],
-area|z11-[man_made=lighthouse]
-{icon-image: lighthouse-s.svg;text-offset: 1;icon-min-distance: 10;}
+node|z11-12[man_made=lighthouse],
+area|z11-12[man_made=lighthouse],
+{icon-image: lighthouse-s.svg; icon-min-distance: 10;}
 node|z13-[man_made=lighthouse],
-area|z13-[man_made=lighthouse]
-{icon-image: lighthouse-m.svg;}
+area|z13-[man_made=lighthouse],
+{icon-image: lighthouse-m.svg; font-size: 11;}
+node|z16-[man_made=lighthouse],
+area|z16-[man_made=lighthouse],
+{font-size: 12;}
 
 node|z14-[barrier=border_control]
-{icon-image:bcontrol-m.svg;}
+{icon-image: bcontrol-m.svg;}
 
 node|z14-[highway=ford],
 node|z14-[power=tower],
diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss
index 4344558c63..0c58cd54b3 100644
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -1,57 +1,49 @@
 /* Keep here changes of the base map style file only. */
 @import("../../clear/include/Roads.mapcss");
 
-/* ~~~~ CONTENT OF ROADS ~~~~~
 
-1.Z-INDEX ROADS
-2.WORLD LAVEL ROAD 4-9 ZOOM
-3.TRUNK & MOTORWAY 7-22 ZOOM
-  3.1 Trunk & Motorway 7-22 ZOOM
-  3.2 Trunk & Motorway tunnel 12-22 ZOOM
-  3.3 Trunk & Motorway bridge 13-22 ZOOM
-4.PRIMARY 8-22 ZOOM
-  4.1 Primary 8-22 ZOOM
-  4.2 Primary tunnel 14-22 ZOOM
-  4.3 Primary bridge 14-22 ZOOM
-5.SECONDARY 10-22 ZOOM
-  5.1 Secondary 10-22 ZOOM
-  5.2 Secondary tunnel 16-22 ZOOM
-  5.3 Secondary bridge 14-22 ZOOM
-6.RESIDENTAL & TERTIARY 11-22 ZOOM
-  6.1 Residential & Tertiary 11-22 ZOOM
-  6.2 Residential & Tertiary tunnel 16-22 ZOOM
-  6.3 Residential & Tertiary bridge 14-22 ZOOM
-7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM
-  7.1 Road, Street, Unclassified 12-22 ZOOM
-  7.2 Road, Street, Unclassified tunnel 16-22 ZOOM
-  7.3 Road, Street, Unclassified bridge 14-22 ZOOM
-  7.4 Service 15-22 ZOOM
-8.OTHERS ROADS 13-22 ZOOM
-  8.1 Pedestrian & ford 13-22 ZOOM
-  8.2 Pedestrian & ford tunnel 16-22 ZOOM
-  8.3 Pedestrian & other brige 13-22 ZOOM
-  8.4 Cycleway 13-22 ZOOM
-  8.5 Construction & Proposed 13-22 ZOOM
-  8.6 Track & Path 14-22 ZOOM
-  8.7 Footway 15-22 ZOOM
-    8.7.1 Steps 16-22 ZOOM
-  8.8 Footway & Path & Steps tunnel 17-22 ZOOM
-  8.9 Bridleway 14-22 ZOOM
-  8.11 Runway 12-22 ZOOM
-9.RAIL 11-22 ZOOM
-  9.1 RAIL 11-22 ZOOM
-  9.2 Rail tunnel 14-22 ZOOM
-  9.3 Rail bridge 14-22 ZOOM
-  9.4 Monorail 14-22 ZOOM
-  9.5 Tram line 13-22 ZOOM
-  9.6 Funicular 12-22 ZOOM
-10.PISTE 12-22 ZOOM
- 10.1 Lift 12-22 ZOOM
- 10.2 Aerialway 12-22 ZOOM
- 10.3 Piste & Route 14-22 ZOOM
-11.FERRY
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
+/* 7.4 Service 15-22 ZOOM */
+
+line|z13-[highway=service],
+{color: @unclassified; opacity: 1;}
+
+line|z13[highway=service],
+{width: 0.8;}
+line|z14[highway=service],
+{width: 1.2;}
+line|z15[highway=service],
+{width: 1.8;}
+line|z16[highway=service],
+{width: 2.5;}
+line|z17[highway=service],
+{width: 3.3;}
+line|z18-[highway=service],
+{width: 4.2;}
+
+/* Reset back to the main style. */
+line|z13-14[highway=service][service=busway],
+line|z13-14[highway=service][service=parking_aisle],
+line|z13-15[highway=service][service=driveway],
+{width: 0;}
+line|z15[highway=service][service=busway],
+line|z15[highway=service][service=parking_aisle],
+{width: 1.2;}
+line|z16[highway=service][service=busway],
+line|z16[highway=service][service=driveway],
+line|z16[highway=service][service=parking_aisle],
+{width: 1.6;}
+line|z17[highway=service][service=busway],
+line|z17[highway=service][service=driveway],
+line|z17[highway=service][service=parking_aisle],
+{width: 2;}
+line|z18[highway=service][service=busway],
+line|z18[highway=service][service=driveway],
+line|z18[highway=service][service=parking_aisle],
+{width: 3;}
+line|z19-[highway=service][service=busway],
+line|z19-[highway=service][service=driveway],
+line|z19-[highway=service][service=parking_aisle],
+{width: 4;}
 
 /* 8.OTHERS ROADS 13-22 ZOOM */
 
@@ -59,7 +51,6 @@ line|z11-[highway=track],
 {color: @track;opacity: 1;}
 
 line|z11-[highway=path],
-line|z11-[route=hiking],
 line|z11-[highway=footway][sac_scale],
 {color: @path;opacity: 1;}
 
@@ -77,67 +68,95 @@ line|z11-12[highway=proposed]
 /* 8.6 Track & Path 14-22 ZOOM */
 
 line|z11[highway=track],
-{width: 1.3; dashes: 6,2.5;}
+{width: 1.1; dashes: 6,2.5;}
 line|z12[highway=track],
-{width: 1.6; dashes: 6,2.5;}
+{width: 1.3; dashes: 6,2.5;}
 line|z13[highway=track],
-{width: 2.1; dashes: 7,3;}
+{width: 1.6; dashes: 7,3;}
 line|z14[highway=track],
-{width: 2.9; dashes: 7,3;}
+{width: 2; dashes: 7,3;}
 line|z15[highway=track],
-{width: 4; dashes: 12,4;}
+{width: 2.5; dashes: 9,3.5;}
 line|z16[highway=track],
-{width: 4.9; dashes: 12,4;}
+{width: 3.2; dashes: 9,3.5;}
 line|z17[highway=track],
-{width: 7; dashes: 12,4;}
+{width: 4; dashes: 12,4;}
 line|z18-[highway=track],
-{width: 10; dashes: 17,5;}
+{width: 5; dashes: 12,4;}
 
 line|z11[highway=path],
-line|z11[route=hiking],
 line|z11[highway=footway][sac_scale],
 {width: 1; dashes: 3.5,2;}
 line|z12[highway=path],
-line|z12[route=hiking],
 line|z12[highway=footway][sac_scale],
-{width: 1.2; dashes: 3.5,2;}
+{width: 1.1; dashes: 3.5,2;}
 line|z13[highway=path],
-line|z13[route=hiking],
 line|z13[highway=footway][sac_scale],
-{width: 1.5; dashes: 4,2.5;}
+{width: 1.3; dashes: 4,2.5;}
 line|z14[highway=path],
-line|z14[route=hiking],
 line|z14[highway=footway][sac_scale],
-{width: 2; dashes: 4,2.5;}
+{width: 1.6; dashes: 4,2.5;}
 line|z15[highway=path],
-line|z15[route=hiking],
 line|z15[highway=footway][sac_scale],
-{width: 2.8; dashes: 8,4;}
+{width: 2; dashes: 6,3.5;}
 line|z16[highway=path],
-line|z16[route=hiking],
 line|z16[highway=footway][sac_scale],
-{width: 4; dashes: 8,4;}
+{width: 2.6; dashes: 6,3.5;}
 line|z17[highway=path],
-line|z17[route=hiking],
 line|z17[highway=footway][sac_scale],
-{width: 5.3; dashes: 8,4;}
+{width: 3.3; dashes: 8,4.5;}
 line|z18-[highway=path],
-line|z18-[route=hiking],
 line|z18-[highway=footway][sac_scale],
-{width: 7.5; dashes: 12,5;}
+{width: 4; dashes: 8,4.5;}
 
 /* 9.RAIL 11-22 ZOOM */
 
 line|z10-[railway=rail],
-line|z13-[railway=subway][!tunnel],
-line|z13-[railway=light_rail][!tunnel],
-{color: @railway; opacity:1;}
-
-line|z13-[railway=rail]::dash,
-line|z13-[railway=subway][!tunnel]::dash,
-line|z13-[railway=light_rail][!tunnel]::dash,
+{color: @railway; opacity: 1;}
+line|z15-[railway=rail],
+{color: @railway_dark;}
+line|z15-[railway=rail]::dash,
 {color: @railway_dash; opacity:1;}
 
+
+line|z10-[railway=rail][highspeed?],
+line|z10-[railway=rail][usage=main],
+line|z10-[railway=rail][usage=branch],
+{color: @railway; opacity: 1;}
+line|z10-[railway=rail][usage=tourism],
+{color: @railway_tourism; opacity: 1;}
+
+line|z15-[railway=rail][highspeed?],
+line|z15-[railway=rail][usage=main],
+line|z15-[railway=rail][usage=branch],
+{color: @railway_dark;}
+line|z15-[railway=rail][highspeed?]::dash,
+line|z15-[railway=rail][usage=main]::dash,
+line|z15-[railway=rail][usage=tourism]::dash,
+line|z15-[railway=rail][usage=branch]::dash,
+{color: @railway_dash; opacity: 1;}
+
+line|z12-[railway=rail][usage=utility],
+line|z14-[railway=rail][service=spur],
+line|z15-[railway=rail][service=service],
+{color: @railway_light; opacity: 1;}
+line|z16-[railway=rail][usage=utility],
+line|z16-[railway=rail][service=spur],
+line|z16-[railway=rail][service=service],
+{color: @railway;}
+line|z16-[railway=rail][usage=utility]::dash,
+line|z16-[railway=rail][service=spur]::dash,
+line|z16-[railway=rail][service=service]::dash,
+{color: @industrial; opacity: 1;}
+
+
+line|z13-[railway=construction],
+line|z13-[railway=preserved],
+line|z13-[railway=disused],
+line|z13-[railway=abandoned],
+{color: @railway;opacity:1;}
+
+
 /* 9.1 RAIL 10-22 ZOOM */
 
 line|z10[railway=rail],
@@ -145,69 +164,139 @@ line|z10[railway=rail],
 line|z11[railway=rail],
 {width: 1.2;}
 line|z12[railway=rail],
-{width: 1.5;}
-line|z13-[railway=rail],
-{color: @railway_dark;}
-line|z13-[railway=rail],
-line|z13[railway=subway][!tunnel],
-line|z13[railway=light_rail][!tunnel],
-{width: 2.6;}
+{width: 1.4;}
+line|z13[railway=rail],
+{width: 1.7;}
 line|z14[railway=rail],
-line|z14[railway=subway][!tunnel],
-line|z14[railway=light_rail][!tunnel],
-{width: 3.2;}
+{width: 2;}
 line|z15[railway=rail],
-line|z15[railway=subway][!tunnel],
-line|z15[railway=light_rail][!tunnel],
-{width: 4.1;}
+{width: 2.6;}
 line|z16[railway=rail],
-line|z16[railway=subway][!tunnel],
-line|z16[railway=light_rail][!tunnel],
-{width: 5.2;}
-line|z17[railway=rail],
-line|z17[railway=subway][!tunnel],
-line|z17[railway=light_rail][!tunnel],
-{width: 6.6;}
-line|z18-[railway=rail],
-line|z18-[railway=subway][!tunnel],
-line|z18-[railway=light_rail][!tunnel],
-{width: 9.5;}
+{width: 3.5;}
+line|z17-[railway=rail],
+{width: 5;}
 
-line|z13[railway=rail]::dash,
-line|z13[railway=subway][!tunnel]::dash,
-line|z13[railway=light_rail][!tunnel]::dash,
-{width: 1.2; dashes: 4,4;}
-line|z14[railway=rail]::dash,
-line|z14[railway=subway][!tunnel]::dash,
-line|z14[railway=light_rail][!tunnel]::dash,
-{width: 1.8; dashes: 5,5;}
 line|z15[railway=rail]::dash,
-line|z15[railway=subway][!tunnel]::dash,
-line|z15[railway=light_rail][!tunnel]::dash,
-{width: 2.6; dashes: 6,6;}
+{width: 1.2; dashes: 4.5,4.5;}
 line|z16[railway=rail]::dash,
-line|z16[railway=subway][!tunnel]::dash,
-line|z16[railway=light_rail][!tunnel]::dash,
-{width: 3.4; dashes: 6,6;}
+{width: 1.8; dashes: 5.2,5.2;}
 line|z17[railway=rail]::dash,
-line|z17[railway=subway][!tunnel]::dash,
-line|z17[railway=light_rail][!tunnel]::dash,
-{width: 4.2; dashes: 8,8;}
+{width: 2.8; dashes: 6.3,6.3;}
 line|z18-[railway=rail]::dash,
-line|z18-[railway=subway][!tunnel]::dash,
-line|z18-[railway=light_rail][!tunnel]::dash,
-{width: 6.6; dashes: 10,10;}
+{width: 2.8; dashes: 8.1,8.1;}
 
-line|z14-[railway=preserved],
-line|z14-[railway=abandoned]
-{width: 1.6; dashes: 6,6;}
+/* Reset styling inherited from railway=rail. */
+line|z10-11[railway=rail][usage=utility],
+line|z10-13[railway=rail][service=spur],
+line|z10-14[railway=rail][service=service],
+{width: 0;}
+line|z14-15[railway=rail][usage=utility]::dash,
+line|z14-15[railway=rail][service=spur]::dash,
+line|z14-15[railway=rail][service=service]::dash,
+{width: 0;}
+
+
+line|z10[railway=rail][usage=main],
+line|z10[railway=rail][usage=tourism],
+line|z10[railway=rail][usage=branch],
+line|z12[railway=rail][usage=utility],
+{width: 1;}
+line|z10[railway=rail][highspeed?],
+line|z11[railway=rail][usage=main],
+line|z11[railway=rail][usage=tourism],
+line|z11[railway=rail][usage=branch],
+line|z13[railway=rail][usage=utility],
+{width: 1.2;}
+line|z11[railway=rail][highspeed?],
+line|z12[railway=rail][usage=main],
+line|z12[railway=rail][usage=tourism],
+line|z12[railway=rail][usage=branch],
+line|z14[railway=rail][usage=utility],
+line|z14[railway=rail][service=spur],
+{width: 1.4;}
+line|z12[railway=rail][highspeed?],
+line|z13[railway=rail][usage=main],
+line|z13[railway=rail][usage=tourism],
+line|z13[railway=rail][usage=branch],
+line|z15[railway=rail][usage=utility],
+line|z15[railway=rail][service=spur],
+line|z15[railway=rail][service=service],
+{width: 1.7;}
+line|z13[railway=rail][highspeed?],
+{width: 2;}
+line|z14[railway=rail][highspeed?],
+{width: 2.3;}
+line|z14[railway=rail][usage=main],
+line|z14[railway=rail][usage=tourism],
+line|z14[railway=rail][usage=branch],
+{width: 2;}
+line|z15[railway=rail][highspeed?],
+line|z15[railway=rail][usage=main],
+line|z15[railway=rail][usage=tourism],
+line|z15[railway=rail][usage=branch],
+{width: 2.6;}
+line|z16[railway=rail][highspeed?],
+line|z16[railway=rail][usage=main],
+line|z16[railway=rail][usage=tourism],
+line|z16[railway=rail][usage=branch],
+line|z16[railway=rail][usage=utility],
+line|z16[railway=rail][service=spur],
+line|z16[railway=rail][service=service],
+{width: 3.5;}
+line|z17[railway=rail][highspeed?],
+line|z17[railway=rail][usage=main],
+line|z17[railway=rail][usage=tourism],
+line|z17[railway=rail][usage=branch],
+line|z17[railway=rail][usage=utility],
+line|z17[railway=rail][service=spur],
+line|z17[railway=rail][service=service],
+{width: 5;}
+
+
+line|z15[railway=rail][highspeed?]::dash,
+{width: 1.2; dashes: 10,10;}
+line|z16[railway=rail][highspeed?]::dash,
+{width: 1.8; dashes: 13,13;}
+line|z17-[railway=rail][highspeed?]::dash,
+{width: 2.8; dashes: 16,16;}
+
+line|z15[railway=rail][usage=main]::dash,
+line|z15[railway=rail][usage=tourism]::dash,
+line|z15[railway=rail][usage=branch]::dash,
+{width: 1.2; dashes: 4.5,4.5;}
+line|z16[railway=rail][usage=main]::dash,
+line|z16[railway=rail][usage=tourism]::dash,
+line|z16[railway=rail][usage=branch]::dash,
+line|z16[railway=rail][usage=utility]::dash,
+line|z16[railway=rail][service=spur]::dash,
+line|z16[railway=rail][service=service]::dash,
+{width: 1.8; dashes: 5.2,5.2;}
+line|z17[railway=rail][usage=main]::dash,
+line|z17[railway=rail][usage=tourism]::dash,
+line|z17[railway=rail][usage=branch]::dash,
+line|z17[railway=rail][usage=utility]::dash,
+line|z17[railway=rail][service=spur]::dash,
+line|z17[railway=rail][service=service]::dash,
+{width: 2.8; dashes: 6.3,6.3;}
+line|z18-[railway=rail][usage=main]::dash,
+line|z18-[railway=rail][usage=tourism]::dash,
+line|z18-[railway=rail][usage=branch]::dash,
+line|z18-[railway=rail][usage=utility]::dash,
+line|z18-[railway=rail][service=spur]::dash,
+line|z18-[railway=rail][service=service]::dash,
+{width: 2.8; dashes: 8.1,8.1;}
+
+
+line|z13-[railway=preserved],
+line|z13-[railway=abandoned]
+{width: 1.6; dashes: 6.3,6.3;}
 line|z16-[railway=preserved],
 line|z16-[railway=abandoned]
 {width: 2.2; dashes: 8,8;}
 
-line|z14-[railway=construction],
-line|z14-[railway=disused]
-{width: 1; dashes: 1.8,5;}
+line|z13-[railway=construction],
+line|z13-[railway=disused]
+{width: 1; dashes: 1.8,5.5;}
 line|z16-[railway=construction],
 line|z16-[railway=disused]
 {width: 1.7; dashes: 2.5,7;}
diff --git a/data/styles/outdoors/include/Roads_label.mapcss b/data/styles/outdoors/include/Roads_label.mapcss
index 5f0f735829..c5a26109ca 100644
--- a/data/styles/outdoors/include/Roads_label.mapcss
+++ b/data/styles/outdoors/include/Roads_label.mapcss
@@ -1,38 +1,13 @@
 /* Keep here changes of the base map style file only. */
 @import("../../clear/include/Roads_label.mapcss");
 
-/* ~~~~ CONTENT OF ROADS ~~~~~
-
-1.Z-INDEX ROADS
-2.SHIELD 10-22 ZOOM
-3.TRUNK & MOTORWAY 10-22 ZOOM
-4.PRIMARY 10-22 ZOOM
-5.SECONDARY 10-22 ZOOM
-6.RESIDENTAL & TERTIARY 12-22 ZOOM
-7.ROAD, STREETS, UNCLASSIFIED & SERVICE 15-22 ZOOM
-8.OTHERS ROADS 15-22 ZOOM
-9.RAIL 15-22 ZOOM ????
-  9.1 Monorail 14-22 ZOOM
-  9.2 Tram line 13-22 ZOOM
-  9.3 Funicular 12-22 ZOOM
-10.PISTE 12-22 ZOOM ????
- 10.1 Lift 12-22 ZOOM
- 10.2 Aerialway 12-22 ZOOM
- 10.3 Piste & Route 14-22 ZOOM
-11.FERRY 10-22 ZOOM
-12.ONEWAY ARROWS 15-22 ZOOM
-13.JUNCTION 15-22 ZOOM
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-*/
 
 /* 8.OTHERS ROADS 15-22 ZOOM */
 
 line|z13-[highway=track],
 line|z13-[highway=path],
-line|z13-[route=hiking],
 {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
 
 line|z13-15[highway=path],
-line|z13-15[route=hiking],
 line|z13-15[highway=track],
 {font-size: 8;}