diff --git a/data/styles/clear/include/Basemap.mapcss b/data/styles/clear/include/Basemap.mapcss
index 565f99a42e..ced8a458af 100644
--- a/data/styles/clear/include/Basemap.mapcss
+++ b/data/styles/clear/include/Basemap.mapcss
@@ -22,7 +22,7 @@
 8.BUILDINGS
   8.1 Pier, dam, cutline
   8.2 Building
-  8.3 Barrier
+  8.3 Barriers, cliffs
 9.ISOLINES
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
@@ -162,6 +162,12 @@ area[boundary=national_park],
 area[landuse=military]
 {z-index: 140;}
 
+line[natural=cliff],
+line[natural=earth_bank],
+line[man_made=embankment],
+line[barrier=retaining_wall],
+{z-index: 145;}
+
 area[building],
 area[building:part],
 area[landuse=garages],
@@ -175,10 +181,9 @@ area[amenity=place_of_worship]
 {z-index: 210;}
 
 line[barrier=wall],
-line[barrier=city_wall],
-line[barrier=retaining_wall],
 line[barrier=fence],
 line[barrier=hedge],
+line[barrier=city_wall],
 line[historic=citywalls],
 {z-index: 950;}
 
@@ -677,48 +682,100 @@ area|z18-[building=train_station],
 {fill-color: @building_dark;casing-width: 1;casing-color: @building_dark_border;}
 
 
-/* 8.3 Barrier */
+/* 8.3 Barriers, cliffs */
 
-line|z16-[barrier=city_wall],
 line|z16-[barrier=fence],
-line|z16-[barrier=hedge],
-line|z16-[barrier=retaining_wall],
 line|z16-[barrier=wall],
-line|z16-[historic=citywalls],
-{color: @fence; width: 1.0; dashes: 1,1; opacity: 0.5;}
+{color: @fence; width: 1; opacity: 0.7;}
+line|z17[barrier=fence],
+line|z17[barrier=wall],
+{width: 1.3; opacity:0.8;}
+line|z18[barrier=fence],
+line|z18[barrier=wall],
+{width: 2; opacity: 1;}
+line|z19-[barrier=fence],
+line|z19-[barrier=wall],
+{width: 3; opacity: 1;}
 
-line|z17-[barrier=city_wall],
-line|z17-[barrier=fence],
-line|z17-[barrier=hedge],
-line|z17-[barrier=retaining_wall],
-line|z17-[barrier=wall],
-line|z17-[historic=citywalls],
-{width: 1.5; dashes: 2,2; opacity:0.7;}
 
-line|z18-[barrier=city_wall],
-line|z18-[barrier=fence],
-line|z18-[barrier=hedge],
-line|z18-[barrier=retaining_wall],
-line|z18-[barrier=wall],
-line|z18-[historic=citywalls],
-{width: 2.0; dashes: 2,2; opacity: 1;}
+line|z16-[barrier=hedge],
+{color: @hedge; width: 2; opacity: 0.6;}
+line|z17[barrier=hedge],
+{width: 3; opacity: 0.7;}
+line|z18[barrier=hedge],
+{width: 4; opacity: 0.8;}
+line|z19-[barrier=hedge],
+{width: 5; opacity: 1;}
+
 
 /*
-  4 values tuple: dash (===), triangle base (tb), triangle height, base height.
-  ===\tb /===  - base height
+  The triangles pattern uses "dashes: " parameter as a 4 values tuple:
+  dash length (===), triangle base (tb), triangle height, base height / dash width.
+  ===\tb /===  - base height / dash width
       \ /    | - triangle height
 
-  Line 'width' should be equal with triangle height + base height.
+  Set width = triangle height + base height.
 */
+
+line|z14-[barrier=city_wall],
+line|z14-[historic=citywalls],
+{color: @building_dark; width: 2; opacity: 1;}
+line|z15[barrier=city_wall],
+line|z15[historic=citywalls],
+{width: 2.8;}
+line|z16-[barrier=city_wall],
+line|z16-[historic=citywalls],
+{color: @building; width: 4.5; dashes: 3,3,1.5,3;}
+line|z17[barrier=city_wall],
+line|z17[historic=citywalls],
+{width: 5.9; dashes: 4,4,1.9,4;}
+line|z18[barrier=city_wall],
+line|z18[historic=citywalls],
+{width: 8.5; dashes: 6,6,2.5,6;}
+line|z19-[barrier=city_wall],
+line|z19-[historic=citywalls],
+{width: 11; dashes: 8,8,3,8;}
+
+
+line|z14-[natural=cliff],
+line|z14-[natural=earth_bank],
+{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.6;}
+line|z15[natural=cliff],
+line|z15[natural=earth_bank],
+{width: 3; dashes: 1.5,1.5; opacity: 0.6;}
 line|z16[natural=cliff],
 line|z16[natural=earth_bank],
-line|z16[man_made=embankment],
-{color: @path; width: 4; dashes: 2,2,3,1; opacity: 0.5;}
+{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.6;}
+line|z17[natural=cliff],
+line|z17[natural=earth_bank],
+{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.6;}
+line|z18[natural=cliff],
+line|z18[natural=earth_bank],
+{width: 9.5; dashes: 4,6,8,1.5; opacity: 0.7;}
+line|z19-[natural=cliff],
+line|z19-[natural=earth_bank],
+{width: 11.9; dashes: 5,7,10,1.9; opacity: 0.7;}
+
+
+line|z16-[barrier=retaining_wall],
+{color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;}
+line|z17[barrier=retaining_wall],
+{width: 3.2; dashes: 4,2,2,1.2;}
+line|z18[barrier=retaining_wall],
+{width: 4.5; dashes: 6,3,3,1.5;}
+line|z19-[barrier=retaining_wall],
+{width: 6; dashes: 8,4,4,2;}
+
+
+line|z16-[man_made=embankment],
+{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 1;}
+line|z17[man_made=embankment],
+{width: 5; dashes: 6,3,3,2; opacity: 1;}
+line|z18[man_made=embankment],
+{width: 7; dashes: 8,4,4,3; opacity: 1;}
+line|z19-[man_made=embankment],
+{width: 9; dashes: 10,5,5,4; opacity: 1;}
 
-line|z17-[natural=cliff],
-line|z17-[natural=earth_bank],
-line|z17-[man_made=embankment],
-{color: @path; width: 7.0; dashes: 4,4,5,2; opacity: 1;}
 
 /* 9. ISOLINES */
 
diff --git a/data/styles/clear/include/Roads.mapcss b/data/styles/clear/include/Roads.mapcss
index 25aa264361..2a6c81fc53 100644
--- a/data/styles/clear/include/Roads.mapcss
+++ b/data/styles/clear/include/Roads.mapcss
@@ -820,10 +820,10 @@ line|z14-[leisure=track],
 {color: @track;opacity: 1;}
 line|z14-[highway=path],
 line|z14-[route=hiking],
+line|z14-[highway=footway][sac_scale],
 {color: @path;opacity: 1;}
 line|z14-[highway=bridleway]
 {color: @bridleway;opacity: 1;}
-line|z14-[highway=footway][sac_scale],
 line|z15-[highway=footway],
 line|z15-[highway=steps]
 {color: @footway;opacity: 1;}
@@ -949,51 +949,57 @@ line|z19-[leisure=track]
 {width:4;}
 
 line|z14[highway=track],
-{width:0.9;dashes: 2.52,1.35;}
+{width: 1.1; dashes: 6,2.5;}
+line|z15[highway=track],
+{width: 1.4; dashes: 6,2.5;}
+line|z16[highway=track],
+{width: 1.9; dashes: 7,3;}
+line|z17[highway=track],
+{width: 2.5; dashes: 7,3;}
+line|z18[highway=track],
+{width: 3.5; dashes: 9,3.5;}
+line|z19-[highway=track],
+{width: 4.5; dashes: 12,3.5;}
+
 line|z14[highway=path],
 line|z14[route=hiking],
-{width:0.9;dashes: 1.52,1.35;}
-line|z15[highway=track],
-{width:1.1;dashes: 2.7,1.26;}
+line|z14[highway=footway][sac_scale],
+{width: 0.9; dashes: 3.5,2;}
 line|z15[highway=path],
 line|z15[route=hiking],
-{width:1.1;dashes: 1.7,1.26;}
-line|z16[highway=track],
-{width:1.8;dashes: 3.6,1.8;}
+line|z15[highway=footway][sac_scale],
+{width: 1.1; dashes: 3.5,2;}
 line|z16[highway=path],
-line|z16[route=hiking]
-{width:1.8;dashes: 2.5,1.8;}
-line|z17[highway=track],
-{width:2;dashes: 4.5,1.8;}
+line|z16[route=hiking],
+line|z16[highway=footway][sac_scale],
+{width: 1.5; dashes: 4,2.5;}
 line|z17[highway=path],
-line|z17[route=hiking]
-{width:2;dashes: 3.0,1.8;}
-line|z18[highway=track],
-{width:3;dashes: 7.2,2.7;}
+line|z17[route=hiking],
+line|z17[highway=footway][sac_scale],
+{width: 2; dashes: 4,2.5;}
 line|z18[highway=path],
-line|z18[route=hiking]
-{width:3;dashes: 4.0,2.7;}
-line|z19-[highway=track],
-{width: 4;dashes: 9,3.6;}
+line|z18[route=hiking],
+line|z18[highway=footway][sac_scale],
+{width: 3; dashes: 6,3.5;}
 line|z19-[highway=path],
-line|z19-[route=hiking]
-{width: 4;dashes: 6,3.6;}
+line|z19-[route=hiking],
+line|z19-[highway=footway][sac_scale],
+{width: 4; dashes: 8,4.5;}
+
 
 /* 8.7 Footway 14-22 ZOOM */
 
-line|z14[highway=footway][sac_scale]
-{width: 1;dashes: 2.7,1.26;}
-
 line|z15[highway=footway]
-{width: 1.5;dashes: 2.7,1.26;}
+{width: 1.5; dashes: 5,2;}
 line|z16[highway=footway]
-{width: 2;dashes: 3.6,1.8;}
+{width: 2; dashes: 5,2;}
 line|z17[highway=footway]
-{width: 2.4;dashes: 4.5,1.8;}
+{width: 2.4; dashes: 6,2.5;}
 line|z18[highway=footway]
-{width: 3.4;dashes: 7.2,2.7;}
+{width: 3.4; dashes: 8,3;}
 line|z19-[highway=footway],
-{width: 4;dashes: 9,3.6;}
+{width: 4.5; dashes: 10,3.5;}
+
 
 /* 8.8 Footway & Path tunnel 17-22 ZOOM */
 
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index c07a183833..5b7bf46121 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -78,7 +78,9 @@
 @aerodrome5: #C8BCDE;
 
 /* 4.3 Barriers */
-@fence: #999999;
+@fence: #888888;
+@hedge: #36831C;
+@cliff: #8C5826;
 
 /* 4.4 Buildings */
 
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index cca308f7f5..742d5266c4 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -79,11 +79,13 @@
 
 /* 4.3 Barriers */
 @fence: #444444;
+@hedge: #143C14;
+@cliff: #7D4F23;
 
 /* 4.4 Buildings */
 
-@building: #222222;
-@building_dark: #333333;
+@building: #2A2A2A;
+@building_dark: #3B3B3B;
 @building_border: #303030;
 @building_dark_border: #474747;
 
@@ -101,11 +103,11 @@
 @residential: #4B4643;
 @unclassified: #4B4643;
 @pedestrian: #4D4744;
-@footway: #3F3A37;
+@footway: #4B4643;
 @cycleway: #6E3D47;
 @construction: #332F2D;
-@track: #2B2827;
-@path: #A05012;
+@track: #5F532D;
+@path: #944A12;
 @bridleway: #2B2827;
 
 /* 5.2 Bridges */
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 160bb34bcc..9ddc3befc5 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -22,7 +22,7 @@
 8.BUILDINGS
   8.1 Pier, dam, cutline
   8.2 Building
-  8.3 Barrier
+  8.3 Barriers, cliffs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -142,6 +142,12 @@ line[man_made=cutline]
 line[boundary=administrative]
 {z-index: 130;}
 
+line[natural=cliff],
+line[natural=earth_bank],
+line[man_made=embankment],
+line[barrier=retaining_wall],
+{z-index: 145;}
+
 area[building],
 area[building:part],
 area[landuse=garages],
@@ -155,13 +161,12 @@ area[amenity=place_of_worship]
 {z-index: 210;}
 
 line[barrier=wall],
-line[barrier=city_wall],
-line[barrier=retaining_wall],
 line[barrier=fence],
 line[barrier=hedge],
+line[barrier=city_wall],
 line[historic=citywalls],
 area[amenity=parking],
-area[amenity=parking_space]
+area[amenity=parking_space],
 {z-index: 950;}
 
 /* 2.LAND */
@@ -585,45 +590,76 @@ area|z16-[building=train_station],
 {fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}
 
 
-/* 8.3 Barrier */
+/* 8.3 Barriers, cliffs */
 
-line|z16-[barrier=city_wall],
-line|z16-[barrier=fence],
-line|z16-[barrier=hedge],
-line|z16-[barrier=retaining_wall],
-line|z16-[barrier=wall],
-line|z16-[historic=citywalls],
-{color: @fence; width: 1.0; dashes: 1,1; opacity: 0.5;}
-
-line|z17-[barrier=city_wall],
 line|z17-[barrier=fence],
-line|z17-[barrier=hedge],
-line|z17-[barrier=retaining_wall],
 line|z17-[barrier=wall],
-line|z17-[historic=citywalls],
-{width: 1.5; dashes: 2,2; opacity: 0.7;}
+{color: @fence; width: 1; opacity: 0.7;}
+line|z18[barrier=fence],
+line|z18[barrier=wall],
+{width: 1.3; opacity:0.8;}
+line|z19-[barrier=fence],
+line|z19-[barrier=wall],
+{width: 2; opacity: 1;}
+
 
-line|z18-[barrier=city_wall],
-line|z18-[barrier=fence],
 line|z18-[barrier=hedge],
-line|z18-[barrier=retaining_wall],
-line|z18-[barrier=wall],
-line|z18-[historic=citywalls],
-{width: 2.0; dashes: 2,2; opacity: 1;}
+{color: @hedge; width: 2; opacity: 0.6;}
+line|z19-[barrier=hedge],
+{width: 3; opacity: 0.7;}
+
 
 /*
-  4 values tuple: dash (===), triangle base (tb), triangle height, base height.
-  ===\tb /===  - base height
+  The triangles pattern uses "dashes: " parameter as a 4 values tuple:
+  dash length (===), triangle base (tb), triangle height, base height / dash width.
+  ===\tb /===  - base height / dash width
       \ /    | - triangle height
 
-  Line 'width' should be equal with triangle height + base height.
+  Set width = triangle height + base height.
 */
-line|z16[natural=cliff],
-line|z16[natural=earth_bank],
-line|z16[man_made=embankment],
-{color: @path; width: 4; dashes: 2,2,3,1; opacity: 0.5;}
 
-line|z17-[natural=cliff],
-line|z17-[natural=earth_bank],
+line|z15-[barrier=city_wall],
+line|z15-[historic=citywalls],
+{color: @building_dark; width: 2; opacity: 1;}
+line|z16[barrier=city_wall],
+line|z16[historic=citywalls],
+{width: 2.8;}
+line|z17-[barrier=city_wall],
+line|z17-[historic=citywalls],
+{color: @building; width: 4.5; dashes: 3,3,1.5,3;}
+line|z18[barrier=city_wall],
+line|z18[historic=citywalls],
+{width: 5.9; dashes: 4,4,1.9,4;}
+line|z19-[barrier=city_wall],
+line|z19-[historic=citywalls],
+{width: 8.5; dashes: 6,6,2.5,6;}
+
+
+line|z16-[natural=cliff],
+line|z16-[natural=earth_bank],
+{color: @cliff; width: 2; dashes: 1.4,1.4; opacity: 0.6;}
+line|z17[natural=cliff],
+line|z17[natural=earth_bank],
+{width: 3; dashes: 1.5,1.5; opacity: 0.6;}
+line|z18[natural=cliff],
+line|z18[natural=earth_bank],
+{width: 6.2; dashes: 3,3.5,4.5,1.2; opacity: 0.6;}
+line|z19-[natural=cliff],
+line|z19-[natural=earth_bank],
+{width: 7.4; dashes: 3.5,5,6,1.4; opacity: 0.6;}
+
+
+line|z17-[barrier=retaining_wall],
+{color: @fence; width: 2.4; dashes: 2.8,1.4,1.4,1; opacity: 1;}
+line|z18[barrier=retaining_wall],
+{width: 3.2; dashes: 4,2,2,1.2;}
+line|z19-[barrier=retaining_wall],
+{width: 4.5; dashes: 6,3,3,1.5;}
+
+
 line|z17-[man_made=embankment],
-{color: @path; width: 7; dashes: 4,4,5,2; opacity: 1;}
+{color: @building_dark; width: 3.5; dashes: 4,2,2,1.5; opacity: 1;}
+line|z18[man_made=embankment],
+{width: 5; dashes: 6,3,3,2; opacity: 1;}
+line|z19-[man_made=embankment],
+{width: 7; dashes: 8,4,4,3; opacity: 1;}
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index acb1c4b28d..bea5dd7043 100644
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -29,8 +29,8 @@
   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 14-22 ZOOM
+  8.6 Track & Path 16-22 ZOOM
+  8.7 Footway 18-22 ZOOM
   8.8 Footway & Path tunnel 17-22 ZOOM
   8.9 Bridleway 14-22 ZOOM
   8.10 Steps 16-22 ZOOM
@@ -919,7 +919,7 @@ line|z19-[highway=construction],
 line|z19-[highway=proposed]
 {width: 6;dashes: 18,6.2;}
 
-/* 8.6 Track & Path 14-22 ZOOM */
+/* 8.6 Track & Path 16-22 ZOOM */
 
 line|z14-[highway=track][tracktype=grade1],
 line|z14-[psurface=unpaved_good],
@@ -947,45 +947,37 @@ line|z19-[psurface=unpaved_good],
 line|z19-[psurface=unpaved_bad]
 {width: 4;dashes: 6.3,2.7;}
 
-/*line|z14[highway=track],
-line|z14[highway=path],
-line|z14[route=hiking]
-{width:0.9;dashes: 2.52,1.35;}
-line|z15[highway=track],
-line|z15[highway=path],
-line|z15[route=hiking]
-{width:1.1;dashes: 2.7,1.26;}
+
 line|z16[highway=track],
-line|z16[highway=path],
-line|z16[route=hiking]
-{width:1.8;dashes: 3.6,1.8;}
+{color: @track; opacity: 1; width: 1.1; dashes: 6,2.5;}
 line|z17[highway=track],
-line|z17[highway=path],
-line|z17[route=hiking]
-{width:2;dashes: 4.5,1.8;}
+{width: 1.4; dashes: 6,2.5;}
 line|z18[highway=track],
-line|z18[highway=path],
-line|z18[route=hiking]
-{width:3;dashes: 7.2,2.7;}
+{width: 1.9; dashes: 7,3;}
 line|z19-[highway=track],
+{width: 2.5; dashes: 7,3;}
+
+
+line|z17[highway=path],
+line|z17[route=hiking],
+line|z17[highway=footway][sac_scale],
+{color: @path; opacity: 1; width: 0.9; dashes: 3.5,2;}
+line|z18[highway=path],
+line|z18[route=hiking],
+line|z18[highway=footway][sac_scale],
+{width: 1.1; dashes: 3.5,2;}
 line|z19-[highway=path],
-line|z19-[route=hiking]
-{width: 4;dashes: 9,3.6;}*/
+line|z19-[route=hiking],
+line|z19-[highway=footway][sac_scale],
+{width: 1.5; dashes: 4,2.5;}
 
-/* 8.7 Footway 14-22 ZOOM */
 
-/*line|z14[highway=footway]
-{width: 1;dashes: 2.7,1.26;}
-line|z15[highway=footway]
-{width: 1.7;dashes: 2.7,1.26;}
-line|z16[highway=footway]
-{width: 2;dashes: 3.6,1.8;}
-line|z17[highway=footway]
-{width: 2.4;dashes: 4.5,1.8;}
-line|z18[highway=footway]
-{width: 3.4;dashes: 7.2,2.7;}
-line|z19-[highway=footway],
-{width: 4;dashes: 9,3.6;}*/
+/* 8.7 Footway 18-22 ZOOM */
+
+line|z18-[highway=footway]
+{color: @footway; opacity: 1; width: 1.5; dashes: 5,2;}
+line|z19-[highway=footway]
+{width: 2; dashes: 5,2;}
 
 /* 8.8 Footway & Path tunnel 17-22 ZOOM */
 
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index 5a2e58cfc2..35f6234a20 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -132,7 +132,10 @@
 @farmland: #ededc3;
 
 /* BARRIERS */
-@fence: #999999;
+@fence: #888888;
+@hedge: #36831C;
+@cliff: #8C5826;
+
 
 /* LABELS COLORS */
 @label_extra_dark: #000000;
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss
index 33b1d8e1d4..fc444435ab 100644
--- a/data/styles/vehicle/style-night/colors.mapcss
+++ b/data/styles/vehicle/style-night/colors.mapcss
@@ -80,11 +80,13 @@
 
 /* 4.3 Barriers */
 @fence: #444444;
+@hedge: #143C14;
+@cliff: #7D4F23;
 
 /* 4.4 Buildings */
 
 @building: #191919;
-@building_dark: #191919;
+@building_dark: #1D1D1D;
 @building_border: #1C1C1C;
 @building_dark_border: #191919;
 
@@ -105,9 +107,8 @@
 @footway: #2B2827;
 @cycleway: #6E3D47;
 @construction: #332F2D;
-@track: #2B2827;
-@path: #A05012;
-@tracktype: #262525;
+@track: #5F532D;
+@path: #944A12;
 @bridleway: #2B2827;
 
 /* 5.2 Bridges */