Updated styles and resources.

77 files changed, 2331 insertions, 2437 deletions

diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index ca328811b3..a7448d4c66 100755
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -371,7 +371,7 @@ node|z13-[place=neighbourhood],
 node|z14-[place=farm],
 node|z14-[place=isolated_dwelling],
 {text: name;text-color: @district_label;}
-node|z12-14[place=suburb]::int_name,
+node|z13-14[place=suburb]::int_name,
 node|z13-[place=locality]::int_name,
 node|z13-[place=neighbourhood]::int_name,
 node|z14-[place=farm]::int_name,
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 75767da220..0a1a3f6e85 100755
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -299,6 +299,10 @@ area[building=train_station],
 node[railway=subway_entrance],
 node[railway=tram_stop],
 area[railway=tram_stop],
+node[historic=monument],
+area[historic=monument],
+node[historic=memorial],
+area[historic=memorial]
 {z-index: 2800;}
 
 node[tourism=motel],
@@ -342,10 +346,6 @@ area[tourism=attraction]
 {z-index: 2842;}
 node[tourism=gallery]
 {z-index: 2844;}
-node[historic=monument],
-area[historic=monument],
-node[historic=memorial],
-area[historic=memorial]
 node[tourism=museum],
 area[tourism=museum],
 {z-index: 2846;}
@@ -368,6 +368,8 @@ node[railway=station][transport=subway],
 node[amenity=hospital],
 node[building=hospital],
 area[building=hospital],
+node[building=university],
+area[building=university],
 area[amenity=hospital],
 node[amenity=pharmacy],
 area[amenity=pharmacy]
@@ -2259,9 +2261,7 @@ node|z17[shop=copyshop],
 area|z17[shop=copyshop]
 {icon-image: copyshop-l.svg;icon-min-distance: 24;}
 node|z17[shop=photo],
-area|z17[shop=photo],
-node|z17[craft=photographer],
-area|z17[craft=photographer]
+area|z17[shop=photo]
 {icon-image: photo-shop-l.svg;icon-min-distance: 24;}
 node|z17[shop=pet],
 area|z17[shop=pet]
@@ -2397,9 +2397,7 @@ node|z18-[shop=copyshop],
 area|z18-[shop=copyshop]
 {icon-image: copyshop-l.svg;}
 node|z18-[shop=photo],
-area|z18-[shop=photo],
-node|z18-[craft=photographer],
-area|z18-[craft=photographer]
+area|z18-[shop=photo]
 {icon-image: photo-shop-l.svg;}
 node|z18-[shop=pet],
 area|z18-[shop=pet]
diff --git a/data/styles/clear/style-clear/symbols/bank-xl.svg b/data/styles/clear/style-clear/symbols/bank-xl.svg
new file mode 100644
index 0000000000..c17b0b78a2
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bank-xl.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>bank-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-497.000000, -100.000000)">
+		<g id="bank-l" transform="translate(497.000000, 100.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<path id="Oval-1-Copy-38" fill="#717065" d="M16.2,31.2c8.3,0,15-6.7,15-15s-6.7-15-15-15s-15,6.7-15,15S7.9,31.2,16.2,31.2z"/>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M7.2,10.2V12h2.4v9.6H7.2V24h18v-2.4h-2.4V12h2.4v-1.8l-9-4.2L7.2,10.2z M19.2,18
+				c0,1.2-0.8,2.2-2,2.5v1.1h-2v-1.1c-1.2-0.4-2-1.4-2-2.5h2c0,0.5,0.4,0.9,1,0.9c0.6,0,1-0.4,1-0.9c0-0.5-0.4-0.9-1-0.9
+				c-1.7,0-3-1.2-3-2.7c0-1.2,0.8-2.2,2-2.5v-1.1h2v1.1c1.2,0.4,2,1.4,2,2.5h-2c0-0.5-0.4-0.9-1-0.9c-0.6,0-1,0.4-1,0.9
+				c0,0.5,0.5,0.9,1,0.9C17.9,15.3,19.2,16.5,19.2,18z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/buddhist-xl.svg b/data/styles/clear/style-clear/symbols/buddhist-xl.svg
new file mode 100644
index 0000000000..327d312285
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/buddhist-xl.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>buddhist-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-317.000000, -1026.000000)">
+		<g id="buddhist-l" transform="translate(317.000000, 1026.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#7F5933" cx="16.2" cy="16.2" r="15"/>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M16.8,7.2c4.5,0.3,8.1,3.9,8.4,8.4h1.2v1.2h-1.2c-0.3,4.5-3.9,8.1-8.4,8.4v1.2h-1.2
+				v-1.2c-4.5-0.3-8.1-3.9-8.4-8.4H6v-1.2h1.2c0.3-4.5,3.9-8.1,8.4-8.4V6h1.2V7.2z M15.6,8.4c-1.7,0.1-3.3,0.8-4.5,1.9l3.9,3.9
+				c0.2-0.1,0.4-0.2,0.6-0.3V8.4z M16.8,8.4c1.7,0.1,3.3,0.8,4.5,1.9l-3.9,3.9c-0.2-0.1-0.4-0.2-0.6-0.3V8.4z M16.8,24
+				c1.7-0.1,3.3-0.8,4.5-1.9l-3.9-3.9c-0.2,0.1-0.4,0.2-0.6,0.3V24z M15.6,24c-1.7-0.1-3.3-0.8-4.5-1.9l3.9-3.9
+				c0.2,0.1,0.4,0.2,0.6,0.3V24z M18.5,15.6H24c-0.1-1.7-0.8-3.3-1.9-4.5L18.3,15C18.4,15.2,18.5,15.4,18.5,15.6z M18.5,16.8H24
+				c-0.1,1.7-0.8,3.3-1.9,4.5l-3.9-3.9C18.4,17.2,18.5,17,18.5,16.8z M14.1,17.4l-3.9,3.9c-1-1.2-1.7-2.8-1.9-4.5h5.5
+				C13.9,17,14,17.2,14.1,17.4z M13.9,15.6H8.4c0.1-1.7,0.8-3.3,1.9-4.5l3.9,3.9C14,15.2,13.9,15.4,13.9,15.6z M15.6,16.2
+				c0-0.3,0.3-0.6,0.6-0.6c0.3,0,0.6,0.3,0.6,0.6c0,0.3-0.3,0.6-0.6,0.6C15.9,16.8,15.6,16.5,15.6,16.2z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/cafe-xl.svg b/data/styles/clear/style-clear/symbols/cafe-xl.svg
new file mode 100644
index 0000000000..26f1aa8105
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/cafe-xl.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>cafe-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -545.000000)">
+		<g id="cafe-l" transform="translate(137.500000, 545.000000)">
+			<circle id="Oval-1" fill="#FFFFFF" fill-opacity="0.6" cx="15.7" cy="16.2" r="16.2"/>
+			<g id="Oval-1_1_">
+				<g>
+					<circle id="path-1" fill="#AB842F" cx="15.7" cy="16.2" r="15"/>
+				</g>
+				<g>
+					<circle id="path-1_1_" fill="#BB9342" cx="15.7" cy="16.2" r="15"/>
+				</g>
+			</g>
+			<path id="Shape" fill="#FFFFFF" d="M21.1,9.6l0-1.2H7.9v8.4c0,2,1.6,3.6,3.6,3.6h6c2,0,3.6-1.5,3.6-2.4h1.2
+				c1.3,0,2.4-1.1,2.4-2.4V12c0-1.3-1.1-2.4-2.4-2.4H21.1z M21.1,16.2v-4.8h1.8v4.8H21.1z M9.1,24h10.8l2.4-2.4H6.7L9.1,24z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/car-part-xl.svg b/data/styles/clear/style-clear/symbols/car-part-xl.svg
new file mode 100644
index 0000000000..636af5b8d1
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/car-part-xl.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>car-part-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -285.000000)">
+		<g id="car-part-l" transform="translate(677.000000, 285.000000)">
+			<g id="POI">
+				<g>
+					<g id="car-repair-l">
+						<g id="Layer_2">
+							<path id="Shape" fill="#FFFFFF" fill-opacity="0.6" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2S7.3,0,16.2,0s16.2,7.3,16.2,16.2
+								S25.1,32.4,16.2,32.4L16.2,32.4L16.2,32.4z"/>
+							<path id="Shape_1_" fill="#717065" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2
+								L31.2,16.2L31.2,16.2z"/>
+							<g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+								<g id="Group">
+									<g id="Shape_2_">
+										<g id="Combined-Shape">
+											<g>
+												<path id="path-1" fill="#FFFFFF" d="M1.4,3.2C1.9,2.1,3,1.4,4.2,1.4S6.5,2.1,7,3.2h6.5c0.5-1.1,1.5-1.8,2.8-1.8
+													c1.2,0,2.3,0.7,2.8,1.8h-3.4v2.4H19c-0.5,1.1-1.5,1.8-2.8,1.8c-1.2,0-2.3-0.7-2.8-1.8H7C6.5,6.7,5.4,7.4,4.2,7.4
+													S1.9,6.7,1.4,5.6h3.4V3.2H1.4z M18,14l-1.8-4.8C16,8.6,15.6,8,14.4,8H6C4.8,8,4.4,8.6,4.2,9.2L2.4,14l-1.2,1.2v6h2.4
+													v1.2c0,0.6,0.6,1.2,1.2,1.2H6c0.6,0,1.2-0.6,1.2-1.2v-1.2h6v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2
+													h2.4v-6L18,14z M6,18.8H3.6v-2.4H6V18.8z M5.4,14l1.2-3.6h7.2L15,14H5.4z M16.8,18.8h-2.4v-2.4h2.4V18.8z"/>
+											</g>
+											<g>
+												<path id="path-1_1_" fill="#FFFFFF" d="M1.4,3.2C1.9,2.1,3,1.4,4.2,1.4S6.5,2.1,7,3.2h6.5c0.5-1.1,1.5-1.8,2.8-1.8
+													c1.2,0,2.3,0.7,2.8,1.8h-3.4v2.4H19c-0.5,1.1-1.5,1.8-2.8,1.8c-1.2,0-2.3-0.7-2.8-1.8H7C6.5,6.7,5.4,7.4,4.2,7.4
+													S1.9,6.7,1.4,5.6h3.4V3.2H1.4z M18,14l-1.8-4.8C16,8.6,15.6,8,14.4,8H6C4.8,8,4.4,8.6,4.2,9.2L2.4,14l-1.2,1.2v6h2.4
+													v1.2c0,0.6,0.6,1.2,1.2,1.2H6c0.6,0,1.2-0.6,1.2-1.2v-1.2h6v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2
+													h2.4v-6L18,14z M6,18.8H3.6v-2.4H6V18.8z M5.4,14l1.2-3.6h7.2L15,14H5.4z M16.8,18.8h-2.4v-2.4h2.4V18.8z"/>
+											</g>
+										</g>
+									</g>
+								</g>
+							</g>
+						</g>
+						<g id="Layer_1" transform="translate(6.000000, 10.000000)">
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/car-repair-xl.svg b/data/styles/clear/style-clear/symbols/car-repair-xl.svg
new file mode 100644
index 0000000000..6f899f6083
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/car-repair-xl.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>car-repair-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -137.000000)">
+		<g id="car-repair-l" transform="translate(677.000000, 137.000000)">
+			<g id="Layer_2">
+				<path id="Shape" fill="#FFFFFF" fill-opacity="0.6" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2S7.3,0,16.2,0s16.2,7.3,16.2,16.2
+					S25.1,32.4,16.2,32.4L16.2,32.4z"/>
+				<path id="Shape_1_" fill="#717065" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2L31.2,16.2z
+					"/>
+			</g>
+			<g id="Layer_1" transform="translate(6.000000, 5.000000)">
+				<g id="Shape_2_">
+					<g>
+						<path id="path-1" fill="#FFFFFF" d="M1.2,20.2h7.2v2.4H12v-2.4h7.2v-2.4h-18V20.2L1.2,20.2z M18,7l-1.8-4.8
+							C16,1.6,15.6,1,14.4,1H6C4.8,1,4.4,1.6,4.2,2.2L2.4,7L1.2,8.2v6h2.4v1.2c0,0.6,0.6,1.2,1.2,1.2H6c0.6,0,1.2-0.6,1.2-1.2v-1.2
+							h6v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2h2.4v-6L18,7L18,7z M6,11.8H3.6V9.4H6V11.8L6,11.8z M5.4,7
+							l1.2-3.6h7.2L15,7H5.4L5.4,7z M16.8,11.8h-2.4V9.4h2.4V11.8L16.8,11.8z"/>
+					</g>
+					<g>
+						<path id="path-1_1_" fill="#FFFFFF" d="M1.2,20.2h7.2v2.4H12v-2.4h7.2v-2.4h-18V20.2L1.2,20.2z M18,7l-1.8-4.8
+							C16,1.6,15.6,1,14.4,1H6C4.8,1,4.4,1.6,4.2,2.2L2.4,7L1.2,8.2v6h2.4v1.2c0,0.6,0.6,1.2,1.2,1.2H6c0.6,0,1.2-0.6,1.2-1.2v-1.2
+							h6v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2h2.4v-6L18,7L18,7z M6,11.8H3.6V9.4H6V11.8L6,11.8z M5.4,7
+							l1.2-3.6h7.2L15,7H5.4L5.4,7z M16.8,11.8h-2.4V9.4h2.4V11.8L16.8,11.8z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/car-wash-xl.svg b/data/styles/clear/style-clear/symbols/car-wash-xl.svg
new file mode 100644
index 0000000000..f63137e745
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/car-wash-xl.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.3 32.4" enable-background="new 0 0 32.3 32.4" xml:space="preserve">
+<title>car-wash-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -322.000000)">
+		<g id="car-wash-l" transform="translate(677.000000, 322.000000)">
+			<g id="car-part-l">
+				<g id="POI">
+					<g id="car-repair-l">
+						<g id="Layer_2">
+							<path id="Shape" fill="#FFFFFF" fill-opacity="0.6" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2S7.3,0,16.2,0s16.2,7.3,16.2,16.2
+								S25.1,32.4,16.2,32.4L16.2,32.4L16.2,32.4z"/>
+							<path id="Shape_1_" fill="#717065" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2
+								L31.2,16.2L31.2,16.2z"/>
+							<g id="Combined-Shape">
+								<g>
+									<path id="path-1" fill="#FFFFFF" d="M24,18l-1.8-4.8C22,12.6,21.6,12,20.4,12H12c-1.2,0-1.6,0.6-1.8,1.2L8.4,18l-1.2,1.2v6
+										h2.4v1.2c0,0.6,0.6,1.2,1.2,1.2H12c0.6,0,1.2-0.6,1.2-1.2v-1.2h6v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2
+										v-1.2h2.4v-6L24,18z M12,22.8H9.6v-2.4H12V22.8z M11.4,18l1.2-3.6h7.2L21,18H11.4z M22.8,22.8h-2.4v-2.4h2.4V22.8z"/>
+								</g>
+								<g>
+									<path id="path-1_1_" fill="#FFFFFF" d="M24,18l-1.8-4.8C22,12.6,21.6,12,20.4,12H12c-1.2,0-1.6,0.6-1.8,1.2L8.4,18
+										l-1.2,1.2v6h2.4v1.2c0,0.6,0.6,1.2,1.2,1.2H12c0.6,0,1.2-0.6,1.2-1.2v-1.2h6v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2
+										c0.6,0,1.2-0.6,1.2-1.2v-1.2h2.4v-6L24,18z M12,22.8H9.6v-2.4H12V22.8z M11.4,18l1.2-3.6h7.2L21,18H11.4z M22.8,22.8h-2.4
+										v-2.4h2.4V22.8z"/>
+								</g>
+							</g>
+							<path id="Shape_2_" fill="#FFFFFF" d="M8.4,7.7c0,1.1,0.8,1.9,1.8,1.9S12,8.7,12,7.7s-1.8-2.9-1.8-2.9S8.4,6.6,8.4,7.7z"/>
+							<path id="Shape_3_" fill="#FFFFFF" d="M16.2,4.8c0,0-1.8,1.8-1.8,2.9s0.8,1.9,1.8,1.9S18,8.7,18,7.7S16.2,4.8,16.2,4.8
+								L16.2,4.8z"/>
+							<path id="Shape_4_" fill="#FFFFFF" d="M22.2,4.8c0,0-1.8,1.8-1.8,2.9s0.8,1.9,1.8,1.9c1,0,1.8-0.9,1.8-1.9S22.2,4.8,22.2,4.8
+								L22.2,4.8z"/>
+							<g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+								<g id="Group">
+									<g id="Shape_5_">
+									</g>
+								</g>
+							</g>
+						</g>
+						<g id="Layer_1" transform="translate(6.000000, 10.000000)">
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/car_sharing-xl.svg b/data/styles/clear/style-clear/symbols/car_sharing-xl.svg
new file mode 100644
index 0000000000..ad9564e488
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/car_sharing-xl.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>car_sharing-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -211.000000)">
+		<g id="car-sharing-l" transform="translate(677.000000, 211.000000)">
+			<g id="car-part-l">
+				<g id="POI">
+					<g id="car-repair-l">
+						<g id="Layer_2">
+							<path id="Shape" fill="#FFFFFF" fill-opacity="0.6" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2S7.3,0,16.2,0s16.2,7.3,16.2,16.2
+								S25.1,32.4,16.2,32.4L16.2,32.4L16.2,32.4z"/>
+							<path id="Shape_1_" fill="#717065" d="M16.2,31.2c-8.3,0-15-6.7-15-15s6.7-15,15-15s15,6.7,15,15S24.5,31.2,16.2,31.2z"/>
+							<g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+								<g id="Group">
+									<g id="Shape_2_">
+										<g id="Combined-Shape">
+											<g>
+												<path id="path-1" fill="#FFFFFF" d="M8.2,2.6h7.4l1.2,1.2l-2.4,1.8l-1.2-1.2L12,5.6l-1.2-1.2L9.6,5.6L8.2,4.8
+													c-0.4,1.2-1.5,2-2.8,2c-1.7,0-3-1.3-3-3s1.3-3,3-3C6.6,0.8,7.7,1.5,8.2,2.6z M3.6,3.8c0-0.7,0.5-1.2,1.2-1.2
+													C5.5,2.6,6,3.1,6,3.8C6,4.5,5.5,5,4.8,5C4.1,5,3.6,4.5,3.6,3.8z M18,14l-1.8-4.8C16,8.6,15.6,8,14.4,8H6
+													C4.8,8,4.4,8.6,4.2,9.2L2.4,14l-1.2,1.2v6h2.4v1.2c0,0.6,0.6,1.2,1.2,1.2H6c0.6,0,1.2-0.6,1.2-1.2v-1.2h6v1.2
+													c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2h2.4v-6L18,14z M6,18.8H3.6v-2.4H6V18.8z M5.4,14l1.2-3.6h7.2
+													L15,14H5.4z M16.8,18.8h-2.4v-2.4h2.4V18.8z"/>
+											</g>
+											<g>
+												<path id="path-1_1_" fill="#FFFFFF" d="M8.2,2.6h7.4l1.2,1.2l-2.4,1.8l-1.2-1.2L12,5.6l-1.2-1.2L9.6,5.6L8.2,4.8
+													c-0.4,1.2-1.5,2-2.8,2c-1.7,0-3-1.3-3-3s1.3-3,3-3C6.6,0.8,7.7,1.5,8.2,2.6z M3.6,3.8c0-0.7,0.5-1.2,1.2-1.2
+													C5.5,2.6,6,3.1,6,3.8C6,4.5,5.5,5,4.8,5C4.1,5,3.6,4.5,3.6,3.8z M18,14l-1.8-4.8C16,8.6,15.6,8,14.4,8H6
+													C4.8,8,4.4,8.6,4.2,9.2L2.4,14l-1.2,1.2v6h2.4v1.2c0,0.6,0.6,1.2,1.2,1.2H6c0.6,0,1.2-0.6,1.2-1.2v-1.2h6v1.2
+													c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2h2.4v-6L18,14z M6,18.8H3.6v-2.4H6V18.8z M5.4,14l1.2-3.6h7.2
+													L15,14H5.4z M16.8,18.8h-2.4v-2.4h2.4V18.8z"/>
+											</g>
+										</g>
+									</g>
+								</g>
+							</g>
+						</g>
+						<g id="Layer_1" transform="translate(6.000000, 10.000000)">
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/car_shop-xl.svg b/data/styles/clear/style-clear/symbols/car_shop-xl.svg
new file mode 100644
index 0000000000..13aa7a70bf
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/car_shop-xl.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>car_shop-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="car_shop-l">
+		<path id="Shape" fill="#FFFFFF" fill-opacity="0.6" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2C0,7.3,7.3,0,16.2,0s16.2,7.3,16.2,16.2
+			C32.4,25.1,25.1,32.4,16.2,32.4L16.2,32.4z"/>
+		<g id="Shape_1_">
+			<g>
+				<path id="path-1" fill="#2D7970" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2L31.2,16.2z"
+					/>
+			</g>
+			<g>
+				<path id="path-1_1_" fill="#825089" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2L31.2,16.2
+					z"/>
+			</g>
+		</g>
+		<g id="Shape_2_">
+			<g>
+				<path id="path-2" fill="#FFFFFF" d="M25.2,13.2l-1.8-4.8c-0.2-0.6-0.6-1.2-1.8-1.2H10.8C9.6,7.2,9.3,7.8,9,8.4l-1.8,4.8L6,14.4
+					v7.2h2.4v1.2C8.4,23.4,9,24,9.6,24h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2h8.4v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2c0.6,0,1.2-0.6,1.2-1.2
+					v-1.2h2.4v-7.2L25.2,13.2L25.2,13.2z M11.4,9.6H21l1.2,3.6H10.2L11.4,9.6L11.4,9.6z M11,18.6c0,0.5-0.4,0.8-0.8,0.8H9
+					c-0.5,0-0.8-0.4-0.8-0.8v-1.2c0-0.5,0.4-0.8,0.8-0.8h1.2c0.5,0,0.8,0.4,0.8,0.8V18.6L11,18.6z M24.2,18.6c0,0.5-0.4,0.8-0.8,0.8
+					h-1.2c-0.5,0-0.8-0.4-0.8-0.8v-1.2c0-0.5,0.4-0.8,0.8-0.8h1.2c0.5,0,0.8,0.4,0.8,0.8V18.6L24.2,18.6z"/>
+			</g>
+			<g>
+				<path id="path-2_1_" fill="#FFFFFF" d="M25.2,13.2l-1.8-4.8c-0.2-0.6-0.6-1.2-1.8-1.2H10.8C9.6,7.2,9.3,7.8,9,8.4l-1.8,4.8
+					L6,14.4v7.2h2.4v1.2C8.4,23.4,9,24,9.6,24h1.2c0.6,0,1.2-0.6,1.2-1.2v-1.2h8.4v1.2c0,0.6,0.6,1.2,1.2,1.2h1.2
+					c0.6,0,1.2-0.6,1.2-1.2v-1.2h2.4v-7.2L25.2,13.2L25.2,13.2z M11.4,9.6H21l1.2,3.6H10.2L11.4,9.6L11.4,9.6z M11,18.6
+					c0,0.5-0.4,0.8-0.8,0.8H9c-0.5,0-0.8-0.4-0.8-0.8v-1.2c0-0.5,0.4-0.8,0.8-0.8h1.2c0.5,0,0.8,0.4,0.8,0.8V18.6L11,18.6z
+					 M24.2,18.6c0,0.5-0.4,0.8-0.8,0.8h-1.2c-0.5,0-0.8-0.4-0.8-0.8v-1.2c0-0.5,0.4-0.8,0.8-0.8h1.2c0.5,0,0.8,0.4,0.8,0.8V18.6
+					L24.2,18.6z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/charging-station-xl.svg b/data/styles/clear/style-clear/symbols/charging-station-xl.svg
new file mode 100644
index 0000000000..bbc5b07356
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/charging-station-xl.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>charging-station-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -100.000000)">
+		<g id="charging-station-l_1_" transform="translate(677.000000, 69.000000)">
+			<g id="POI">
+				<g>
+					<g id="charging-station-l">
+						<circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="16.2" cy="47.2" r="16.2"/>
+						<circle id="Oval-1-Copy-38" fill="#717065" cx="16.2" cy="47.2" r="15"/>
+						<path id="Combined-Shape" fill="#FFFFFF" d="M10.8,38.2c-0.7,0-1.2,0.5-1.2,1.2V55H8.4v1.2h0.2h11.8V55h-1.2V39.4
+							c0-0.7-0.5-1.2-1.2-1.2H10.8z M13.5,52.6l0.8-4.3h-3.5l4.5-6.5l-0.9,4.3H18L13.5,52.6z M25.3,47.3c-0.1-0.3-0.2-0.6-0.2-0.8
+							v-1.1h0.1l0.8-0.9c0,0,0.3-2.9-4.1-4.5l-0.6,0.9c0,0,2.2,1.9,2.1,3.8l0.5,0.7v1.1c0,0.4,0.1,0.8,0.2,1.1l1,4.7
+							c0.1,0.5,0,0.9-0.3,1.3c-0.3,0.4-0.8,0.6-1.3,0.6c-0.9,0-1.6-0.7-1.6-1.5l0.4-3.7v-0.1c0-1.1-0.9-2.1-2.1-2.1h-1.2v1.1h1.2
+							c0.5,0,0.9,0.4,0.9,0.9l-0.4,3.8v0.1c0,1.5,1.2,2.6,2.7,2.6c0.8,0,1.6-0.4,2.2-1c0.5-0.7,0.7-1.5,0.5-2.3L25.3,47.3L25.3,47.3
+							z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/christian-xl.svg b/data/styles/clear/style-clear/symbols/christian-xl.svg
new file mode 100644
index 0000000000..702cccf2eb
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/christian-xl.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>christian-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-317.000000, -952.000000)">
+		<g id="christian-l" transform="translate(317.000000, 952.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#7F5933" cx="16.2" cy="16.2" r="15"/>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M18,10.8V6h-3.6v4.8h-6v3.6h6v12H18v-12h6v-3.6H18z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/college-xl.svg b/data/styles/clear/style-clear/symbols/college-xl.svg
new file mode 100644
index 0000000000..dbd8032642
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/college-xl.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 33.9 33.9" enable-background="new 0 0 33.9 33.9" xml:space="preserve">
+<title>college-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="college-l">
+		<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.9" cy="16.9" r="16.2"/>
+		<circle id="Oval-1-Copy-38" fill="#717065" cx="16.9" cy="16.9" r="15"/>
+		<g id="path7442-copy">
+			<g>
+				<path id="path-1" fill="#FFFFFF" d="M16.9,9.1l-11.4,6l11.4,6l6.6-3.3v4.5c0,2.4,2.4,2.4,2.4,2.4v-1.2c0,0-1.2-0.1-1.2-1.2V17
+					l3.6-2L16.9,9.1z M11.5,19.9v2.4c0,0.6,0.4,1.4,1.2,1.8l4.2,1.8l3.6-1.8c0.8-0.4,1.9-1.2,1.8-1.8v-2.4l-5.4,2.6L11.5,19.9z"/>
+			</g>
+			<g>
+				<path id="path-1_1_" fill="#FFFFFF" d="M16.9,9.1l-11.4,6l11.4,6l6.6-3.3v4.5c0,2.4,2.4,2.4,2.4,2.4v-1.2c0,0-1.2-0.1-1.2-1.2
+					V17l3.6-2L16.9,9.1z M11.5,19.9v2.4c0,0.6,0.4,1.4,1.2,1.8l4.2,1.8l3.6-1.8c0.8-0.4,1.9-1.2,1.8-1.8v-2.4l-5.4,2.6L11.5,19.9z"
+					/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/fastfood-xl.svg b/data/styles/clear/style-clear/symbols/fastfood-xl.svg
new file mode 100644
index 0000000000..cd94f4b0be
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/fastfood-xl.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>fastfood-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -507.000000)">
+		<g id="fastfood-l" transform="translate(137.500000, 507.000000)">
+			<circle id="Oval-1" fill="#FFFFFF" fill-opacity="0.6" cx="15.7" cy="16.2" r="16.2"/>
+			<g id="Oval-1_1_">
+				<g>
+					<circle id="path-1" fill="#AB842F" cx="15.7" cy="16.2" r="15"/>
+				</g>
+				<g>
+					<circle id="path-1_1_" fill="#BB9342" cx="15.7" cy="16.2" r="15"/>
+				</g>
+			</g>
+			<g id="g16674" transform="translate(4.000000, 7.000000)">
+				<path id="rect13326-2-5-2-3" fill="#FFFFFF" d="M9.9,1.4c-3.6,0-8.4,1.8-8.4,4.8v2.4h20.4V6.2c0-3-4.8-4.8-8.4-4.8H9.9z
+					 M9.3,2.6c0.3,0,0.6,0.3,0.6,0.6S9.6,3.8,9.3,3.8C9,3.8,8.7,3.5,8.7,3.2S9,2.6,9.3,2.6L9.3,2.6z M14.1,2.6
+					c0.3,0,0.6,0.3,0.6,0.6s-0.3,0.6-0.6,0.6c-0.3,0-0.6-0.3-0.6-0.6S13.8,2.6,14.1,2.6L14.1,2.6z M6.9,5c0.3,0,0.6,0.3,0.6,0.6
+					S7.2,6.2,6.9,6.2S6.3,5.9,6.3,5.6S6.6,5,6.9,5L6.9,5z M11.7,5c0.3,0,0.6,0.3,0.6,0.6S12,6.2,11.7,6.2s-0.6-0.3-0.6-0.6
+					S11.4,5,11.7,5L11.7,5z M16.5,5c0.3,0,0.6,0.3,0.6,0.6s-0.3,0.6-0.6,0.6s-0.6-0.3-0.6-0.6S16.2,5,16.5,5L16.5,5z M1.5,9.8
+					c-0.6,0-1.2,0.6-1.2,1.2c0,0.6,0.6,1.2,1.2,1.2h20.4c0.6,0,1.2-0.6,1.2-1.2c0-0.6-0.6-1.2-1.2-1.2H1.5z M1.5,13.4v1.2
+					c0,1.2,1.2,2.4,2.4,2.4h15.6c1.2,0,2.4-1.2,2.4-2.4v-1.2H1.5z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/fuel-xl.svg b/data/styles/clear/style-clear/symbols/fuel-xl.svg
new file mode 100644
index 0000000000..2428025266
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/fuel-xl.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>fuel-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -63.000000)">
+		<g id="fuel-l" transform="translate(677.000000, 63.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#717065" cx="16.2" cy="16.2" r="15"/>
+			
+				<g id="noun_379269_cc" transform="translate(13.500000, 13.500000) scale(-1, 1) translate(-13.500000, -13.500000) translate(6.000000, 6.000000)">
+				<g id="Group">
+				</g>
+			</g>
+		</g>
+		<g id="charging-station-l_1_" transform="translate(677.000000, 69.000000)">
+			<g id="POI">
+				<g>
+					<g id="charging-station-l">
+						<path id="Combined-Shape" fill="#FFFFFF" d="M10.8,1.2c-0.7,0-1.2,0.5-1.2,1.2V18H8.4v1.2h0.2h11.8V18h-1.2V2.4
+							c0-0.7-0.5-1.2-1.2-1.2H10.8L10.8,1.2z M10.8,4.8c0-0.7,0.5-1.2,1.2-1.2h4.8c0.7,0,1.2,0.5,1.2,1.2v2.4c0,0.7-0.5,1.2-1.2,1.2
+							H12c-0.7,0-1.2-0.5-1.2-1.2V4.8L10.8,4.8z M25.3,10.3c-0.1-0.3-0.2-0.6-0.2-0.8V8.3h0.1L26,7.4c0,0,0.3-2.9-4.1-4.5l-0.6,0.9
+							c0,0,2.2,1.9,2.1,3.8L24,8.3v1.1c0,0.4,0.1,0.8,0.2,1.1l1,4.7c0.1,0.5,0,0.9-0.3,1.3c-0.3,0.4-0.8,0.6-1.3,0.6
+							c-0.9,0-1.6-0.7-1.6-1.5l0.4-3.7v-0.1c0-1.1-0.9-2.1-2.1-2.1h-1.2v1.1h1.2c0.5,0,0.9,0.4,0.9,0.9l-0.4,3.8v0.1
+							c0,1.5,1.2,2.6,2.7,2.6c0.8,0,1.6-0.4,2.2-1c0.5-0.7,0.7-1.5,0.5-2.3L25.3,10.3L25.3,10.3z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/garden-xl.svg b/data/styles/clear/style-clear/symbols/garden-xl.svg
new file mode 100644
index 0000000000..cf0b3e1d0c
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/garden-xl.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>garden-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -137.000000)">
+		<g id="garden-l" transform="translate(137.000000, 137.000000)">
+			<ellipse id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+			<ellipse id="Oval-1-Copy-38" fill="#507F34" cx="16.2" cy="16.2" rx="15" ry="15"/>
+			<path id="path6080-4" fill="#FFFFFF" d="M10.8,8.4v2.4c0,2.4,2.4,3.7,4.8,3.6V24c-1.2-2.4-4.8-6-8.4-4.8c0,0,3,7.2,9,7.2
+				s9-7.2,9-7.2C21.6,18,18,21.6,16.8,24v-9.6c2.4,0.1,4.8-1.2,4.8-3.6V8.4c0-0.5-0.1-1.2-0.4-1.2c-0.2,0-0.5,0.3-0.8,0.6l-1.8,1.8
+				l-1.8-2c-0.2-0.2-0.3-0.4-0.6-0.4c-0.3,0-0.4,0.2-0.6,0.4l-1.8,2L12,7.8c-0.3-0.3-0.6-0.6-0.8-0.6C10.9,7.2,10.8,7.9,10.8,8.4z"
+				/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/grocery-xl.svg b/data/styles/clear/style-clear/symbols/grocery-xl.svg
new file mode 100644
index 0000000000..d2da920e83
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/grocery-xl.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>grocery-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="grocery-l">
+		<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+		<g id="Oval-1-Copy-38">
+			<g>
+				<circle id="path-1" fill="#2D7970" cx="16.2" cy="16.2" r="15"/>
+			</g>
+			<g>
+				<circle id="path-1_1_" fill="#825089" cx="16.2" cy="16.2" r="15"/>
+			</g>
+		</g>
+		<path id="rect7842-copy" fill="#FFFFFF" d="M25.2,7.2c-0.7,0-1.3,0.2-1.8,0.6c-0.4,0.4-0.6,1.1-0.6,1.8H6l2.4,10.8h14.4v1.2H9.6
+			c-1.2,0-1.2,1.2,0,1.2h1.8H21h1.8c0.6,0,1.2-0.6,1.2-1.2v-1.2v-9.6V9.6c0,0,0.1-0.8,0.3-0.9c0.2-0.2,0.4-0.3,0.9-0.3h0.5
+			c0.6,0,0.7-0.3,0.7-0.6c0-0.3-0.1-0.6-0.7-0.6H25.2L25.2,7.2z M21,22.8c-1,0-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8s1.8-0.8,1.8-1.8
+			S22,22.8,21,22.8L21,22.8z M11.4,22.8c-1,0-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8s1.8-0.8,1.8-1.8S12.4,22.8,11.4,22.8L11.4,22.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/hindu-xl.svg b/data/styles/clear/style-clear/symbols/hindu-xl.svg
new file mode 100644
index 0000000000..69830ed448
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/hindu-xl.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>hindu-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-317.000000, -1063.000000)">
+		<g id="hindu-l" transform="translate(317.000000, 1063.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#7F5933" cx="16.2" cy="16.2" r="15"/>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M8.9,11.3l1.2,2.3c0,0,2.4-1.8,3.8-1.4c0,0,0.8,0.2,1,0.7c0,0,0.6,1.2-1.1,1.7
+				c0,0-1.3,0.4-2.6-0.1l1,3c0,0,1.3-0.7,2.5,0c0,0,1.6,1,0.3,3c0,0-0.8,1-2.6,1c0,0-4.2,0.4-5-6.1c0,0-0.7,2.7,0.9,5.6
+				c0,0,1.5,3,4.8,3c0,0,3.5,0.2,3.9-3.4c0,0,0.3-1.7-0.8-3.6c0,0,1.7,0.6,2.8-0.5c0,0,0.6-0.4,1.4-1.9c0,0,0.6-1.1,1.4-1.2
+				c0,0,1-0.3,1.6,0.6c0,0,0.6,1.2,0.5,2.5c0,0,0,2.5-2.5,3.2c0,0-2.9,0.9-3.1-2.1c0,0-0.3,0.3-0.2,1.9c0,0,0.2,2.5,2.5,3
+				c0,0,1.7,0.4,3.1-1.2c0,0,1.3-1.2,1.3-3.7c0,0,0.2-2-0.8-3.8c0,0-0.9-1.7-2.5-2c0,0-1.4-0.3-2.6,0.7c0,0-0.7,0.4-1.8,2.6
+				c0,0-0.5,1.2-1.5,1.2c0,0-0.4,0-0.6-0.2c0,0-0.6-0.3-0.9-0.3c0,0,1.3-0.5,1.9-2.1c0,0,0.6-1.5-0.2-2.8c0,0-0.6-1.5-3.4-1.3
+				C12.4,9.8,10.5,9.9,8.9,11.3z M14.9,7c0,0,0.4,2.4,3.4,2.8c0,0,1.9,0.1,3.6-1.8l1.5,1.9c0,0-1.5,1.7-4.2,1.8c0,0-1.9,0.3-3.6-1.8
+				C15.6,9.8,14.6,8.6,14.9,7z M16.6,7.8L18.3,6L20,7.7l-1.7,1.7L16.6,7.8z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/hospital-xl.svg b/data/styles/clear/style-clear/symbols/hospital-xl.svg
new file mode 100644
index 0000000000..b7bc67d0c5
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/hospital-xl.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>hospital-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -248.000000)">
+		<g id="hospital-l" transform="translate(137.000000, 248.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#C15746" cx="16.2" cy="16.2" r="15"/>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M19.2,13.2V8.4c0-0.7-0.5-1.2-1.2-1.2h-3.6c-0.7,0-1.2,0.5-1.2,1.2v4.8H8.4
+				c-0.7,0-1.2,0.5-1.2,1.2V18c0,0.7,0.5,1.2,1.2,1.2h4.8V24c0,0.7,0.5,1.2,1.2,1.2H18c0.7,0,1.2-0.5,1.2-1.2v-4.8H24
+				c0.7,0,1.2-0.5,1.2-1.2v-3.6c0-0.7-0.5-1.2-1.2-1.2H19.2z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/muslim-xl.svg b/data/styles/clear/style-clear/symbols/muslim-xl.svg
new file mode 100644
index 0000000000..7b713d5e46
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/muslim-xl.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>muslim-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-317.000000, -989.000000)">
+		<g id="muslim-l" transform="translate(317.000000, 989.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#7F5933" cx="16.2" cy="16.2" r="15"/>
+			<polygon id="Star-4" fill="#FFFFFF" points="22.2,17.7 20.2,18.7 20.7,16.7 19.2,15.2 21.2,15.2 22.2,13.2 23.2,15.2 25.2,15.2 
+				23.7,16.7 24.2,18.7 			"/>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M21.4,9.8c-1.6-1.6-3.9-2.6-6.4-2.6c-5,0-9,4-9,9c0,5,4,9,9,9c2.5,0,4.7-1,6.4-2.6
+				c-1,0.5-2.1,0.8-3.4,0.8c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2C19.2,9,20.4,9.3,21.4,9.8z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/nparkF-xl.svg b/data/styles/clear/style-clear/symbols/nparkF-xl.svg
new file mode 100644
index 0000000000..785b57e5a1
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/nparkF-xl.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>nparkF-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -63.000000)">
+		<g id="nparkF-l" transform="translate(137.000000, 63.000000)">
+			<ellipse id="Oval-1-Copy-44" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+			<ellipse id="Oval-1-Copy-45" fill="#507F34" cx="16.2" cy="16.2" rx="15" ry="15"/>
+			<polygon id="rect4152-3-3-5-copy-2" fill="#FFFFFF" points="16.2,6 9.6,11.8 13.3,11.8 9.6,16.7 13.3,16.7 9.6,21.6 15.6,21.6 
+				15.6,26.3 16.8,26.3 16.8,21.6 22.8,21.6 19.1,16.7 22.8,16.7 19.1,11.8 22.8,11.8 			"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/park-xl.svg b/data/styles/clear/style-clear/symbols/park-xl.svg
new file mode 100644
index 0000000000..2d01070c75
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/park-xl.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>park-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -174.000000)">
+		<g id="park-l" transform="translate(137.000000, 174.000000)">
+			<ellipse id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+			<ellipse id="Oval-1-Copy-38" fill="#507F34" cx="16.2" cy="16.2" rx="15" ry="15"/>
+			<path id="path4390-3" fill="#FFFFFF" d="M24,16.2c0-1.3-0.8-2.4-2-2.8c0.5-0.5,0.8-1.2,0.8-2c0-1.7-1.3-3-3-3
+				c-0.2,0-0.5,0-0.7,0.1C18.9,7.1,17.7,6,16.2,6c-1.5,0-2.7,1.1-2.9,2.5c-0.2-0.1-0.4-0.1-0.7-0.1c-1.7,0-3,1.3-3,3
+				c0,0.8,0.3,1.5,0.8,2c-1.1,0.4-2,1.5-2,2.8c0,1.7,1.2,3,3,3H12l2.4,4.2v4.2H18v-4.2l2.4-4.2l0.9,0C22.8,19.2,24,17.8,24,16.2
+				L24,16.2z M14.4,19.2H18l-1.2,2.4h-1.2L14.4,19.2z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/parking-xl.svg b/data/styles/clear/style-clear/symbols/parking-xl.svg
new file mode 100644
index 0000000000..afa862f24b
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/parking-xl.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25.2 25.2" enable-background="new 0 0 25.2 25.2" xml:space="preserve">
+<title>parking-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="parking-l">
+		<path id="Rectangle-346-Copy-3" fill="#FFFFFF" fill-opacity="0.6" d="M2.4,0h20.4c1.3,0,2.4,1.1,2.4,2.4v20.4
+			c0,1.3-1.1,2.4-2.4,2.4H2.4c-1.3,0-2.4-1.1-2.4-2.4V2.4C0,1.1,1.1,0,2.4,0z"/>
+		<path id="Rectangle-346" fill="#2E89B0" d="M3.6,1.2h18c1.3,0,2.4,1.1,2.4,2.4v18c0,1.3-1.1,2.4-2.4,2.4h-18
+			c-1.3,0-2.4-1.1-2.4-2.4v-18C1.2,2.3,2.3,1.2,3.6,1.2z"/>
+		<path id="path15189-copy" fill="#FFFFFF" d="M11.3,12.4h1c0.9,0,1.6-0.2,2-0.5c0.4-0.4,0.7-0.9,0.7-1.5c0-0.7-0.2-1.2-0.6-1.5
+			c-0.4-0.3-1-0.5-1.7-0.5h-1.3V12.4 M17.9,10.3c0,1.5-0.5,2.6-1.4,3.4c-0.9,0.8-2.2,1.2-3.9,1.2h-1.2v4.9H8.4V6h4.4
+			c1.7,0,2.9,0.4,3.8,1.1C17.4,7.8,17.9,8.9,17.9,10.3"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg b/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg
new file mode 100644
index 0000000000..72adb5ba10
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>place-of-worship-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-317.000000, -915.000000)">
+		<g id="place-of-worship-l" transform="translate(317.000000, 915.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#7F5933" cx="16.2" cy="16.2" r="15"/>
+			<g id="path8846-copy">
+				<g>
+					<path id="path-1" fill="#FFFFFF" d="M16.2,6c0,0-3,1.2-3,2.4v2.4c0,1.2-2.4,1.2-2.4,2.4V24h10.8V13.2c0-1.2-2.4-1.2-2.4-2.6
+						V8.4C19.2,7.2,16.2,6,16.2,6L16.2,6z M6,15.6V24h2.4v-8.4c0-1.2-1.2-1.2-1.2-1.2S6,14.4,6,15.6L6,15.6z M24,15.6V24h2.4v-8.4
+						c0-1.2-1.2-1.2-1.2-1.2S24,14.4,24,15.6L24,15.6z"/>
+				</g>
+				<g>
+					<path id="path-1_1_" fill="#FFFFFF" d="M16.2,6c0,0-3,1.2-3,2.4v2.4c0,1.2-2.4,1.2-2.4,2.4V24h10.8V13.2c0-1.2-2.4-1.2-2.4-2.6
+						V8.4C19.2,7.2,16.2,6,16.2,6L16.2,6z M6,15.6V24h2.4v-8.4c0-1.2-1.2-1.2-1.2-1.2S6,14.4,6,15.6L6,15.6z M24,15.6V24h2.4v-8.4
+						c0-1.2-1.2-1.2-1.2-1.2S24,14.4,24,15.6L24,15.6z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/railway-crossing_l.svg b/data/styles/clear/style-clear/symbols/railway-crossing_l.svg
new file mode 100644
index 0000000000..a6d56d5bac
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/railway-crossing_l.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 19.6 12.2" enable-background="new 0 0 19.6 12.2" xml:space="preserve">
+<title>railway-crossing</title>
+<desc>Created with Sketch.</desc>
+<path id="Shape" fill="#D60B0B" d="M18.7,10.3L18.7,10.3l0.6,1.5l-1.6,0.2l-2,0.2l-0.4,0L15.1,12L2.2,4.6L1.9,4.4L1.7,4.1L0.9,2.2
+	L0.3,0.8l1.6-0.2l2-0.2l0.4,0l0.3,0.2l13.2,7.6l0,0L18,8.5L18.7,10.3z M0.9,10.3L0.9,10.3l0.8-1.8l0.2-0.4l13.2-7.6l0.3-0.2l0.4,0
+	l2,0.2l1.6,0.2l-0.6,1.5L18,4.1l-0.2,0.4l-0.3,0.2L4.6,12l-0.3,0.2l-0.4,0l-2-0.2l-1.6-0.2L0.9,10.3z"/>
+<path id="Rectangle-27-Copy" fill="#EDEDED" d="M12.2,6.3l4.6,2.7l0.8,1.8l-2,0.2L9.8,7.6L4,11l-2-0.2l0.8-1.8l4.6-2.7L2.8,3.6
+	L2.1,1.8l2-0.2l5.8,3.4l5.8-3.4l2,0.2l-0.8,1.8L12.2,6.3z"/>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg b/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg
new file mode 100644
index 0000000000..877682f73f
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/railway-crossing_xl.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 34.3 21.3" style="enable-background:new 0 0 34.3 21.3;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#D60B0B;}
+	.st1{fill:#EDEDED;}
+</style>
+<title>railway-crossing</title>
+<desc>Created with Sketch.</desc>
+<path id="Shape" class="st0" d="M33.2,18L33.2,18l1,2.7L31.3,21l-3.6,0.3H27L26.7,21L3.4,7.8L2.8,7.4L2.6,6.9L1.1,3.4L0,0.9l2.8-0.3
+	l3.6-0.3h0.8l0.6,0.3l23.7,13.6l0,0l0.3,0.6L33.2,18z M1,18L1,18l1.5-3.3L2.9,14L26.6,0.3L27.2,0h0.8l3.6,0.3l2.8,0.3l-1,2.7
+	l-1.5,3.4l-0.3,0.8l-0.6,0.3L7.8,21l-0.6,0.3H6.5L2.8,21L0,20.7L1,18z"/>
+<path id="Rectangle-27-Copy" class="st1" d="M21.5,10.8l8.2,4.8l1.5,3.3l-3.6,0.3L17.1,13L6.6,19.2L3,18.9l1.5-3.3l8.2-4.8L4.5,6
+	L3.3,2.7l3.6-0.3l10.5,6.1l10.5-6.1l3.6,0.3L30,6L21.5,10.8z"/>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/restaurant-xl.svg b/data/styles/clear/style-clear/symbols/restaurant-xl.svg
new file mode 100644
index 0000000000..2f5d94b627
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/restaurant-xl.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>restaurant-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-137.000000, -396.000000)">
+		<g id="restaurant-l" transform="translate(137.000000, 396.000000)">
+			<ellipse id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+			<g id="Oval-1-Copy-38">
+				<g>
+					<ellipse id="path-1" fill="#AB842F" cx="16.2" cy="16.2" rx="15" ry="15"/>
+				</g>
+				<g>
+					<ellipse id="path-1_1_" fill="#BB9342" cx="16.2" cy="16.2" rx="15" ry="15"/>
+				</g>
+			</g>
+			<path id="Shape" fill="#FFFFFF" d="M13.8,13.2V8.1c0-0.5-0.4-0.9-0.9-0.9l0,0c-0.5,0-0.9,0.4-0.9,0.9v5.1h-1.8V8.1
+				c0-0.5-0.4-0.9-0.9-0.9l0,0c-0.5,0-0.9,0.4-0.9,0.9v5.1c0,2.2,1.8,3.6,3.6,3.6L11.7,24c0,0.7,0.5,1.2,1.2,1.2l0,0
+				c0.7,0,1.2-0.5,1.2-1.2l-0.3-7.2c1.8,0,3.6-1.4,3.6-3.6V8.1c0-0.5-0.4-0.9-0.9-0.9l0,0c-0.5,0-0.9,0.4-0.9,0.9v5.1H13.8z
+				 M19.2,18h2.4v6c0,0.7,0.5,1.2,1.2,1.2l0,0c0.7,0,1.2-0.5,1.2-1.2V7.2c-2.8,0-4.8,2-4.8,3.6V18z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/shop-xl.svg b/data/styles/clear/style-clear/symbols/shop-xl.svg
new file mode 100644
index 0000000000..a0317de58e
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/shop-xl.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>shop-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="shop-l">
+		<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.6" cx="16.2" cy="16.2" r="16.2"/>
+		<g id="Oval-1-Copy-38">
+			<g>
+				<circle id="path-1" fill="#2D7970" cx="16.2" cy="16.2" r="15"/>
+			</g>
+			<g>
+				<circle id="path-1_1_" fill="#825089" cx="16.2" cy="16.2" r="15"/>
+			</g>
+		</g>
+		<path id="rect13131-6-copy" fill="#FFFFFF" d="M14.4,4.8c-1.2,0-2.3,1.2-2.4,2.4l-0.4,3.6h-2c-0.6,0-1.2,0.6-1.2,1.2L7.2,24
+			c0,0.6,0.6,1.2,1.2,1.2H24c0.6,0,1.2-0.6,1.2-1.2L24,12c0-0.6-0.6-1.2-1.2-1.2h-2l-0.4-3.6C20.3,6,19.2,4.8,18,4.8H14.4z M14.4,6
+			H18c0.6,0,1.1,0.6,1.2,1.2l0.4,3.6h-6.8l0.4-3.6C13.3,6.6,13.8,6,14.4,6L14.4,6z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam-l.svg b/data/styles/clear/style-clear/symbols/speedcam-l.svg
index 0cd6e606e9..f44d9d44c4 100644
--- a/data/styles/clear/style-clear/symbols/speedcam-l.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam-l.svg
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>speedcam-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="speedcam-l">
-            <rect id="Rectangle-346-Copy-3" fill="#4A4A4A" x="0" y="0" width="21" height="21" rx="2"></rect>
-            <rect id="Rectangle-346" fill="#FFFFFF" x="1" y="1" width="19" height="19" rx="2"></rect>
-            <path d="M16.4180495,9.125 L16.4180495,8.4375 C16.4180495,8.058 16.0984067,7.75 15.7037638,7.75 L14.9894781,7.75 L14.9894781,12.5625 L14,12.5625 L14,6.71875 C14,5.7693125 13.2007143,5 12.2142857,5 L5.78571429,5 C4.79928571,5 4,5.7693125 4,6.71875 L4,14.28125 C4,15.2306875 4.79928571,16 5.78571429,16 L12.2142857,16 C13.2007143,16 14,15.2306875 14,14.28125 L14,13.9375 L15.7037638,13.9375 C16.0984067,13.9375 16.4180495,13.6298438 16.4180495,13.25 L16.4180495,12.5625 L17.7037638,12.5625 C17.9012638,12.5625 18.0609067,12.4088437 18,12.21875 L18,9.46875 C18.0609067,9.27865625 17.9012638,9.125 17.7037638,9.125 L16.4180495,9.125 Z M7.5,14.5 C6.395,14.5 5.5,13.6047413 5.5,12.5001667 C5.5,11.395592 6.395,10.5 7.5,10.5 C8.60466667,10.5 9.5,11.395592 9.5,12.5001667 C9.5,13.6047413 8.60466667,14.5 7.5,14.5 L7.5,14.5 Z M11.8932321,7.875 C11.4788571,7.875 11.1428571,7.539375 11.1428571,7.125375 C11.1428571,6.711 11.4788571,6.375 11.8932321,6.375 C12.3072321,6.375 12.6428571,6.711 12.6428571,7.125375 C12.6428571,7.539375 12.3072321,7.875 11.8932321,7.875 L11.8932321,7.875 Z" id="Imported-Layers-Copy-3" fill="#4A4A4A"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20.2 20.2" enable-background="new 0 0 20.2 20.2" xml:space="preserve">
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<g>
+	<path id="Rectangle-346-Copy-3" fill="#4A4A4A" d="M1.9,0h16.3c1,0,1.9,0.9,1.9,1.9v16.3c0,1-0.9,1.9-1.9,1.9H1.9
+		c-1,0-1.9-0.9-1.9-1.9V1.9C0,0.9,0.9,0,1.9,0z"/>
+	<path id="Rectangle-346" fill="#FFFFFF" d="M2.9,1h14.4c1,0,1.9,0.9,1.9,1.9v14.4c0,1-0.9,1.9-1.9,1.9H2.9c-1,0-1.9-0.9-1.9-1.9
+		V2.9C1,1.8,1.8,1,2.9,1z"/>
+	<polygon id="Shape_2_" fill="#020202" points="3.8,6.9 12.5,6.9 12.5,5.8 15.4,5.8 15.4,6.9 16.4,6.9 16.4,14.6 3.8,14.6 	"/>
+	<circle id="Oval_4_" fill="#FFFFFF" cx="10.6" cy="10.7" r="2.9"/>
+	<circle id="Oval_1_" cx="10.6" cy="10.7" r="1.9"/>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam-m.svg b/data/styles/clear/style-clear/symbols/speedcam-m.svg
index cd652205a6..eb397e127c 100644
--- a/data/styles/clear/style-clear/symbols/speedcam-m.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam-m.svg
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>speedcam-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="speedcam-m">
-            <rect id="Rectangle-346-Copy-4" fill="#4A4A4A" x="0" y="0" width="17" height="17" rx="2"></rect>
-            <rect id="Rectangle-346-Copy" fill="#FFFFFF" x="1" y="1" width="15" height="15" rx="2"></rect>
-            <path d="M12.6457063,7.32124435 L12.6457063,6.73186652 C12.6457063,6.40652996 12.3716838,6.14248869 12.0333657,6.14248869 L11.4210251,6.14248869 L11.4210251,10.2681335 L10.5727684,10.2681335 L10.5727684,5.25842195 C10.5727684,4.44449117 9.88755927,3.78497738 9.0419169,3.78497738 L4.5308515,3.78497738 C3.68520913,3.78497738 3,4.44449117 3,5.25842195 L3,11.741578 C3,12.5555088 3.68520913,13.2150226 4.5308515,13.2150226 L9.0419169,13.2150226 C9.88755927,13.2150226 10.5727684,12.5555088 10.5727684,11.741578 L10.5727684,11.4468891 L12.0333657,11.4468891 C12.3716838,11.4468891 12.6457063,11.1831426 12.6457063,10.8575113 L12.6457063,10.2681335 L13.7479194,10.2681335 C13.9172315,10.2681335 14.0540896,10.1364075 14.0018758,9.97344457 L14.0018758,7.61593326 C14.0540896,7.45297029 13.9172315,7.32124435 13.7479194,7.32124435 L12.6457063,7.32124435 Z M4,10.500125 C4,9.67169403 4.67125,9 5.5,9 C6.3285,9 7,9.67169403 7,10.500125 C7,11.328556 6.3285,12 5.5,12 C4.67125,12 4,11.328556 4,10.500125 Z M8.76668511,6.2496483 C8.41145102,6.2496483 8.123406,5.96192476 8.123406,5.60701214 C8.123406,5.25177805 8.41145102,4.96373304 8.76668511,4.96373304 C9.12159772,4.96373304 9.40932126,5.25177805 9.40932126,5.60701214 C9.40932126,5.96192476 9.12159772,6.2496483 8.76668511,6.2496483 L8.76668511,6.2496483 Z" id="Imported-Layers-Copy-4" fill="#4A4A4A"></path>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 17 17" enable-background="new 0 0 17 17" xml:space="preserve">
+<title>speedcam-m</title>
+<desc>Created with Sketch.</desc>
+<path id="Rectangle-346-Copy-4" fill="#4A4A4A" d="M2,0h13c1.1,0,2,0.9,2,2v13c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2V2
+	C0,0.9,0.9,0,2,0z"/>
+<path id="Rectangle-346-Copy" fill="#FFFFFF" d="M3,1h11c1.1,0,2,0.9,2,2v11c0,1.1-0.9,2-2,2H3c-1.1,0-2-0.9-2-2V3C1,1.9,1.9,1,3,1z
+	"/>
+<polygon id="Shape_2_" fill="#020202" points="3.3,5.3 10.5,5.3 10.5,4.5 12.9,4.5 12.9,5.3 13.7,5.3 13.7,11.7 3.3,11.7 "/>
+<circle id="Oval_4_" fill="#FFFFFF" cx="8.9" cy="8.5" r="2.4"/>
+<circle id="Oval_1_" cx="8.9" cy="8.5" r="1.6"/>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam-xl.svg b/data/styles/clear/style-clear/symbols/speedcam-xl.svg
new file mode 100644
index 0000000000..edac2684cf
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/speedcam-xl.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25.2 25.2" enable-background="new 0 0 25.2 25.2" xml:space="preserve">
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<g>
+	<path id="Rectangle-346-Copy-3" fill="#4A4A4A" d="M2.4,0h20.4c1.3,0,2.4,1.1,2.4,2.4v20.4c0,1.3-1.1,2.4-2.4,2.4H2.4
+		c-1.3,0-2.4-1.1-2.4-2.4V2.4C0,1.1,1.1,0,2.4,0z"/>
+	<path id="Rectangle-346" fill="#FFFFFF" d="M3.6,1.2h18c1.3,0,2.4,1.1,2.4,2.4v18c0,1.3-1.1,2.4-2.4,2.4h-18
+		c-1.3,0-2.4-1.1-2.4-2.4v-18C1.2,2.3,2.3,1.2,3.6,1.2z"/>
+	<polygon id="Shape_2_" fill="#020202" points="4.7,8.6 15.6,8.6 15.6,7.3 19.3,7.3 19.3,8.6 20.5,8.6 20.5,18.2 4.7,18.2 	"/>
+	<circle id="Oval_4_" fill="#FFFFFF" cx="13.2" cy="13.4" r="3.6"/>
+	<circle id="Oval_1_" cx="13.2" cy="13.4" r="2.4"/>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam1-l.svg b/data/styles/clear/style-clear/symbols/speedcam1-l.svg
index a36e0375bb..50a9ab5fb6 100644
--- a/data/styles/clear/style-clear/symbols/speedcam1-l.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam1-l.svg
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 25.9 24.6" style="enable-background:new 0 0 25.9 24.6;" xml:space="preserve">
+	 viewBox="0 0 26 24.5" style="enable-background:new 0 0 26 24.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;fill:#4A4A4A;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#4A4A4A;}
+	.st3{fill:#4A4A4A;}
+	.st4{fill:#FFED03;}
+</style>
 <title>speedcam-l</title>
 <desc>Created with Sketch.</desc>
-<path id="Rectangle-346-Copy-3" style="fill:#4A4A4A;" d="M2.5,0h21c1.4,0,2.5,1.1,2.5,2.3v19.9c0,1.3-1.1,2.3-2.5,2.3h-21
-	c-1.4,0-2.5-1.1-2.5-2.3V2.3C0,1.1,1.1,0,2.5,0z"/>
-<path id="Rectangle-346" style="fill:#FFBE00;" d="M3.7,1.2h18.5c1.4,0,2.5,1.1,2.5,2.3v17.6c0,1.3-1.1,2.3-2.5,2.3H3.7
-	c-1.4,0-2.5-1.1-2.5-2.3V3.5C1.2,2.2,2.3,1.2,3.7,1.2z"/>
-<path style="display:none;fill:#4A4A4A;" d="M-91.3,7.7c-1.5,0-2.6,1.2-2.6,2.6c0,1.4,1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6
-	C-88.6,8.9-89.8,7.7-91.3,7.7z M-84.2,5.6h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4H-95c-0.2,0-0.4,0.2-0.4,0.4l-0.2,2.3h-0.5V5.1
-	c0-0.2-0.2-0.3-0.3-0.3h-1.5c-0.2,0-0.3,0.1-0.3,0.3v0.5h0c-0.4,0-0.8,0.3-0.8,0.8v8.2c0,0.4,0.3,0.8,0.8,0.8h14.1
-	c0.4,0,0.8-0.3,0.8-0.8V6.4C-83.4,5.9-83.8,5.6-84.2,5.6z M-97.2,8.8c-0.5,0-1-0.4-1-0.9c0-0.5,0.4-0.9,1-0.9c0.5,0,1,0.4,1,0.9
-	C-96.2,8.4-96.6,8.8-97.2,8.8z M-93.3,3.9h4c0.2,0,0.4,0.2,0.4,0.4c0,0.2-0.2,0.4-0.4,0.4h-4c-0.2,0-0.4-0.2-0.4-0.4
-	C-93.7,4.1-93.5,3.9-93.3,3.9z M-91.3,14.1c-2.1,0-3.8-1.7-3.8-3.8c0-2.1,1.7-3.8,3.8-3.8c2.1,0,3.8,1.7,3.8,3.8
-	C-87.4,12.4-89.1,14.1-91.3,14.1z"/>
-<g transform="translate(0,-952.36218)" style="display:none;">
-	<path style="display:inline;fill:#4A4A4A;" d="M10.7,958.1l-1,1.9H5.9c-0.7,0-1.3,0.6-1.3,1.3v8.3c0,0.7,0.6,1.3,1.3,1.3H20
-		c0.7,0,1.3-0.6,1.3-1.3v-8.3c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H10.7z M12.9,962.1c1.9,0,3.4,1.5,3.4,3.4c0,1.9-1.5,3.4-3.4,3.4
-		c-1.9,0-3.4-1.5-3.4-3.4C9.5,963.6,11,962.1,12.9,962.1z"/>
+<path class="st0" d="M-91.3,7.7c-1.5,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6C-88.6,8.9-89.8,7.7-91.3,7.7z
+	 M-84.2,5.6h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4H-95c-0.2,0-0.4,0.2-0.4,0.4l-0.2,2.3h-0.5V5.1c0-0.2-0.2-0.3-0.3-0.3h-1.5
+	c-0.2,0-0.3,0.1-0.3,0.3v0.5l0,0c-0.4,0-0.8,0.3-0.8,0.8v8.2c0,0.4,0.3,0.8,0.8,0.8h14.1c0.4,0,0.8-0.3,0.8-0.8V6.4
+	C-83.4,5.9-83.8,5.6-84.2,5.6z M-97.2,8.8c-0.5,0-1-0.4-1-0.9s0.4-0.9,1-0.9c0.5,0,1,0.4,1,0.9S-96.6,8.8-97.2,8.8z M-93.3,3.9h4
+	c0.2,0,0.4,0.2,0.4,0.4c0,0.2-0.2,0.4-0.4,0.4h-4c-0.2,0-0.4-0.2-0.4-0.4C-93.7,4.1-93.5,3.9-93.3,3.9z M-91.3,14.1
+	c-2.1,0-3.8-1.7-3.8-3.8s1.7-3.8,3.8-3.8c2.1,0,3.8,1.7,3.8,3.8C-87.4,12.4-89.1,14.1-91.3,14.1z"/>
+<g transform="translate(0,-952.36218)" class="st1">
+	<path class="st2" d="M10.7,958.1l-1,1.9H5.9c-0.7,0-1.3,0.6-1.3,1.3v8.3c0,0.7,0.6,1.3,1.3,1.3H20c0.7,0,1.3-0.6,1.3-1.3v-8.3
+		c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H10.7z M12.9,962.1c1.9,0,3.4,1.5,3.4,3.4s-1.5,3.4-3.4,3.4s-3.4-1.5-3.4-3.4
+		S11,962.1,12.9,962.1z"/>
+</g>
+<g>
+	<path id="Rectangle-346-Copy-3" class="st3" d="M2.5,0h21C24.9,0,26,1.1,26,2.3v19.9c0,1.3-1.1,2.3-2.5,2.3h-21
+		c-1.4,0-2.5-1.1-2.5-2.3V2.3C0,1.1,1.1,0,2.5,0z"/>
+	<path id="Rectangle-346" class="st4" d="M3.7,1.2h18.5c1.4,0,2.5,1.1,2.5,2.3v17.6c0,1.3-1.1,2.3-2.5,2.3H3.7
+		c-1.4,0-2.5-1.1-2.5-2.3V3.5C1.2,2.2,2.3,1.2,3.7,1.2z"/>
+	<path class="st3" d="M12.9,10.4c-2.8,0-5.1,2.2-5.1,4.9s2.3,4.9,5.1,4.9S18,18,18,15.3C18.1,12.6,15.8,10.4,12.9,10.4z M12.9,18
+		c-1.6,0-2.9-1.2-2.9-2.7s1.3-2.7,2.9-2.7s2.9,1.2,2.9,2.7C15.8,16.8,14.5,18,12.9,18z"/>
+	<path class="st3" d="M20.4,7.2h-7.8c0-0.9-0.7-1.6-1.6-1.6H8.3c-0.9,0-1.6,0.7-1.6,1.6H5.5c-0.9,0-1.6,0.7-1.6,1.5v7.1
+		c0,0.8,0.7,1.5,1.6,1.5h2.2c-0.3-0.6-0.4-1.3-0.4-2.1c0-3,2.6-5.4,5.7-5.4s5.7,2.4,5.7,5.4c0,0.7-0.2,1.4-0.4,2.1h2.2
+		c0.9,0,1.6-0.7,1.6-1.5V8.7C22,7.9,21.3,7.2,20.4,7.2z"/>
 </g>
-<path style="fill:#4A4A4A;" d="M12.9,10.4c-2.8,0-5.1,2.2-5.1,4.9c0,2.7,2.3,4.9,5.1,4.9c2.8,0,5.1-2.2,5.1-4.9
-	C18.1,12.6,15.8,10.4,12.9,10.4z M12.9,18c-1.6,0-2.9-1.2-2.9-2.7c0-1.5,1.3-2.7,2.9-2.7s2.9,1.2,2.9,2.7C15.8,16.8,14.5,18,12.9,18
-	z"/>
-<path style="fill:#4A4A4A;" d="M20.4,7.2h-7.8c0-0.9-0.7-1.6-1.6-1.6H8.3c-0.9,0-1.6,0.7-1.6,1.6H5.5c-0.9,0-1.6,0.7-1.6,1.5v7.1
-	c0,0.8,0.7,1.5,1.6,1.5h2.2c-0.3-0.6-0.4-1.3-0.4-2.1c0-3,2.6-5.4,5.7-5.4s5.7,2.4,5.7,5.4c0,0.7-0.2,1.4-0.4,2.1h2.2
-	c0.9,0,1.6-0.7,1.6-1.5V8.7C22,7.9,21.3,7.2,20.4,7.2z"/>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam1-m.svg b/data/styles/clear/style-clear/symbols/speedcam1-m.svg
new file mode 100644
index 0000000000..345529cbb2
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/speedcam1-m.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20.8 19.6" style="enable-background:new 0 0 20.8 19.6;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#4A4A4A;}
+	.st1{fill:#FFED03;}
+	.st2{display:none;fill:#4A4A4A;}
+	.st3{display:none;}
+	.st4{display:inline;fill:#4A4A4A;}
+</style>
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<path id="Rectangle-346-Copy-3" class="st0" d="M2,0h16.8c1.1,0,2,0.9,2,1.8v15.9c0,1-0.9,1.8-2,1.8H2c-1.1,0-2-0.9-2-1.8V1.8
+	C0,0.9,0.9,0,2,0z"/>
+<path id="Rectangle-346" class="st1" d="M3,1h14.8c1.1,0,2,0.9,2,1.8v14.1c0,1-0.9,1.8-2,1.8H3c-1.1,0-2-0.9-2-1.8V2.8
+	C1,1.8,1.8,1,3,1z"/>
+<path class="st2" d="M-93.9,5.2c-1.5,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6C-91.2,6.4-92.4,5.2-93.9,5.2z
+	 M-86.8,3.2h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4h-7.5c-0.2,0-0.4,0.2-0.4,0.4l-0.2,2.3h-0.5V2.7c0-0.2-0.2-0.3-0.3-0.3h-1.5
+	c-0.2,0-0.3,0.1-0.3,0.3v0.5l0,0c-0.4,0-0.8,0.3-0.8,0.8v8.2c0,0.4,0.3,0.8,0.8,0.8h14.1c0.4,0,0.8-0.3,0.8-0.8V4
+	C-86,3.5-86.4,3.2-86.8,3.2z M-99.8,6.4c-0.5,0-1-0.4-1-0.9s0.4-0.9,1-0.9c0.5,0,1,0.4,1,0.9S-99.2,6.4-99.8,6.4z M-95.9,1.5h4
+	c0.2,0,0.4,0.2,0.4,0.4s-0.2,0.4-0.4,0.4h-4c-0.2,0-0.4-0.2-0.4-0.4S-96.1,1.5-95.9,1.5z M-93.9,11.7c-2.1,0-3.8-1.7-3.8-3.8
+	s1.7-3.8,3.8-3.8c2.1,0,3.8,1.7,3.8,3.8C-90,9.9-91.7,11.7-93.9,11.7z"/>
+<g transform="translate(0,-952.36218)" class="st3">
+	<path class="st4" d="M8.1,955.6l-1,1.9H3.3c-0.7,0-1.3,0.6-1.3,1.3v8.3c0,0.7,0.6,1.3,1.3,1.3h14.1c0.7,0,1.3-0.6,1.3-1.3v-8.3
+		c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H8.1z M10.3,959.6c1.9,0,3.4,1.5,3.4,3.4s-1.5,3.4-3.4,3.4S6.9,965,6.9,963
+		S8.4,959.6,10.3,959.6z"/>
+</g>
+<path class="st0" d="M10.3,8.3c-2.2,0-4.1,1.8-4.1,3.9s1.8,3.9,4.1,3.9s4.1-1.8,4.1-3.9C14.5,10.1,12.6,8.3,10.3,8.3z M10.3,14.4
+	c-1.3,0-2.3-1-2.3-2.2S9,10,10.3,10s2.3,1,2.3,2.2S11.6,14.4,10.3,14.4z"/>
+<path class="st0" d="M16.3,5.8h-6.2c0-0.7-0.6-1.3-1.3-1.3H6.6C5.9,4.5,5.4,5,5.4,5.8h-1C3.7,5.8,3.1,6.3,3.1,7v5.7
+	c0,0.6,0.6,1.2,1.3,1.2h1.8c-0.2-0.5-0.3-1-0.3-1.7c0-2.4,2.1-4.3,4.6-4.3S15,9.8,15,12.2c0,0.6-0.2,1.1-0.3,1.7h1.8
+	c0.7,0,1.3-0.6,1.3-1.2V7C17.6,6.3,17,5.8,16.3,5.8z"/>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam1-xl.svg b/data/styles/clear/style-clear/symbols/speedcam1-xl.svg
new file mode 100644
index 0000000000..aa030b761d
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/speedcam1-xl.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 37.4 35.4" style="enable-background:new 0 0 37.4 35.4;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;fill:#4A4A4A;}
+	.st1{display:none;}
+	.st2{display:inline;fill:#4A4A4A;}
+	.st3{fill:#4A4A4A;}
+	.st4{fill:#FFED03;}
+</style>
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<path class="st0" d="M-85.6,13.1c-1.5,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6C-82.9,14.2-84.1,13.1-85.6,13.1z
+	 M-78.5,10.9h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4h-7.5c-0.2,0-0.4,0.2-0.4,0.4l-0.2,2.3h-0.5v-0.5c0-0.2-0.2-0.3-0.3-0.3h-1.5
+	c-0.2,0-0.3,0.1-0.3,0.3v0.5l0,0c-0.4,0-0.8,0.3-0.8,0.8V20c0,0.4,0.3,0.8,0.8,0.8h14.1c0.4,0,0.8-0.3,0.8-0.8v-8.1
+	C-77.7,11.3-78.1,10.9-78.5,10.9z M-91.5,14.1c-0.5,0-1-0.4-1-0.9s0.4-0.9,1-0.9c0.5,0,1,0.4,1,0.9S-90.9,14.1-91.5,14.1z
+	 M-87.6,9.2h4c0.2,0,0.4,0.2,0.4,0.4c0,0.2-0.2,0.4-0.4,0.4h-4c-0.2,0-0.4-0.2-0.4-0.4C-88,9.4-87.8,9.2-87.6,9.2z M-85.6,19.5
+	c-2.1,0-3.8-1.7-3.8-3.8s1.7-3.8,3.8-3.8c2.1,0,3.8,1.7,3.8,3.8C-81.7,17.8-83.4,19.5-85.6,19.5z"/>
+<g transform="translate(0,-952.36218)" class="st1">
+	<path class="st2" d="M16.4,963.5l-1,1.9h-3.8c-0.7,0-1.3,0.6-1.3,1.3v8.3c0,0.7,0.6,1.3,1.3,1.3h14.1c0.7,0,1.3-0.6,1.3-1.3v-8.3
+		c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H16.4z M18.6,967.5c1.9,0,3.4,1.5,3.4,3.4s-1.5,3.4-3.4,3.4s-3.4-1.5-3.4-3.4
+		S16.7,967.5,18.6,967.5z"/>
+</g>
+<g>
+	<path id="Rectangle-346-Copy-3" class="st3" d="M3.6,0h30.2c2,0,3.6,1.6,3.6,3.4V32c0,1.9-1.6,3.4-3.6,3.4H3.6
+		c-2,0-3.6-1.6-3.6-3.4V3.4C0,1.6,1.6,0,3.6,0z"/>
+	<path id="Rectangle-346" class="st4" d="M5.3,1.7h26.6c2,0,3.6,1.6,3.6,3.4v25.3c0,1.9-1.6,3.4-3.6,3.4H5.3c-2,0-3.6-1.6-3.6-3.4V5
+		C1.7,3.1,3.4,1.7,5.3,1.7z"/>
+	<path class="st3" d="M18.6,15c-4.1,0-7.3,3.1-7.3,7.1s3.4,7.1,7.3,7.1s7.3-3.1,7.3-7.1C26,18.1,22.8,15,18.6,15z M18.6,25.9
+		c-2.3,0-4.2-1.7-4.2-3.8s1.9-3.8,4.2-3.8s4.2,1.7,4.2,3.8S20.9,25.9,18.6,25.9z"/>
+	<path class="st3" d="M29.4,10.3H18.1c0-1.3-1-2.3-2.3-2.3H12c-1.3,0-2.4,1.1-2.4,2.3H7.9c-1.3,0-2.3,1-2.3,2.2v10.3
+		c0,1.2,1,2.2,2.3,2.2H11c-0.5-0.8-0.6-1.9-0.6-3c0-4.3,3.7-7.8,8.2-7.8s8.2,3.5,8.2,7.8c0,1-0.2,2-0.6,3h3.1c1.3,0,2.3-1,2.3-2.2
+		V12.6C31.7,11.4,30.7,10.3,29.4,10.3z"/>
+</g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/toll_booth-xl.svg b/data/styles/clear/style-clear/symbols/toll_booth-xl.svg
new file mode 100644
index 0000000000..efb967efb9
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/toll_booth-xl.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>toll_booth-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Clear">
+	<g id="Artboard-1" transform="translate(-677.000000, -248.000000)">
+		<g id="toll_booth-l" transform="translate(677.000000, 248.000000)">
+			<path id="Shape" fill="#FFFFFF" fill-opacity="0.6" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2S7.3,0,16.2,0s16.2,7.3,16.2,16.2
+				S25.1,32.4,16.2,32.4L16.2,32.4z"/>
+			<path id="Shape_1_" fill="#717065" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2L31.2,16.2z"
+				/>
+			<g id="Shape_2_">
+				<g>
+					<path id="path-1" fill="#FFFFFF" d="M25.8,7.4c-0.2-0.6-0.8-1-1.5-0.8l-11.1,3V9.4c-1.1-0.6-2.3-1-3.6-1S7.1,8.8,6,9.4v2.1
+						l-1.4,0.4l0.6,2.3L6,14v8.8h7.2V12.1l11.7-3.1C25.6,8.7,26,8.1,25.8,7.4L25.8,7.4z M8.4,14.6C7.6,14.6,7,14,7,13.2
+						c0-0.8,0.6-1.4,1.4-1.4s1.4,0.6,1.4,1.4C9.8,14,9.2,14.6,8.4,14.6L8.4,14.6z"/>
+				</g>
+				<g>
+					<path id="path-1_1_" fill="#FFFFFF" d="M25.8,7.4c-0.2-0.6-0.8-1-1.5-0.8l-11.1,3V9.4c-1.1-0.6-2.3-1-3.6-1S7.1,8.8,6,9.4v2.1
+						l-1.4,0.4l0.6,2.3L6,14v8.8h7.2V12.1l11.7-3.1C25.6,8.7,26,8.1,25.8,7.4L25.8,7.4z M8.4,14.6C7.6,14.6,7,14,7,13.2
+						c0-0.8,0.6-1.4,1.4-1.4s1.4,0.6,1.4,1.4C9.8,14,9.2,14.6,8.4,14.6L8.4,14.6z"/>
+				</g>
+			</g>
+			<path id="Combined-Shape" fill="#FFFFFF" d="M22.6,14.5v-1.3h-1.2v1.2c-1,0.1-1.7,0.3-2.3,0.8c-0.6,0.5-0.9,1.2-0.9,2
+				c0,0.9,0.3,1.5,1,2c0.4,0.3,1.1,0.5,2,0.7l0.2,0v2.5c-0.5-0.1-0.9-0.2-1.1-0.5c-0.2-0.2-0.3-0.5-0.4-0.9H18
+				c0,0.9,0.4,1.7,1.1,2.2c0.6,0.4,1.4,0.7,2.3,0.8v1.2h1.2V24c0.9-0.1,1.7-0.3,2.2-0.8c0.7-0.5,1-1.2,1-2.1c0-0.8-0.3-1.4-0.9-1.9
+				c-0.4-0.3-0.9-0.5-1.6-0.7l-0.8-0.2v-2.3c0.1,0,0.2,0.1,0.3,0.1c0.5,0.2,0.7,0.6,0.7,1.2h1.9c0-1-0.4-1.7-1.1-2.2
+				C23.8,14.8,23.2,14.5,22.6,14.5z M22.6,20.2v2.2c0.2,0,0.3-0.1,0.5-0.1c0.6-0.2,0.8-0.5,0.8-1.1c0-0.3-0.1-0.5-0.4-0.7
+				C23.3,20.4,23,20.3,22.6,20.2z M21.4,18.1V16c-0.4,0-0.7,0.1-0.9,0.3c-0.3,0.2-0.5,0.5-0.5,0.8c0,0.3,0.2,0.6,0.5,0.7
+				C20.6,17.9,20.9,18,21.4,18.1z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss
index d729a0d3c6..1bbe91fcdd 100644
--- a/data/styles/clear/style-night/style.mapcss
+++ b/data/styles/clear/style-night/style.mapcss
@@ -26,10 +26,10 @@ colors
   Selection-opacity: 0.64;
   Route-color: #0087FF;
   RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #9B2300;
-  RouteTrafficG1-color: #F03C0A;
-  RouteTrafficG2-color: #F03C0A;
-  RouteTrafficG3-color: #F5D728;
+  RouteTrafficG0-color: #5E0F0D;
+  RouteTrafficG1-color: #7F1311;
+  RouteTrafficG2-color: #7F1311;
+  RouteTrafficG3-color: #9E8216;
   RouteTrafficG3-opacity: @traffic_arrow_dark;
   RoutePedestrian-color: #FFB94B;
   RoutePedestrian-opacity: 0.7;
@@ -45,25 +45,25 @@ colors
   TrackCarSpeed-color: #FFCA28;
   TrackPlaneSpeed-color: #FFF5A0;
   TrackUnknownDistance-color: #969696;
-  TrafficG0-color: #410F00;
-  TrafficG1-color: #781919;
-  TrafficG2-color: #781919;
-  TrafficG3-color: #8C5A00;
+  TrafficG0-color: #4C120F;
+  TrafficG1-color: #731816;
+  TrafficG2-color: #731816;
+  TrafficG3-color: #8C7012;
   TrafficG3-opacity: @traffic_arrow_dark;
-  TrafficG4-color: #555519;
-  TrafficG5-color: #285032;
+  TrafficG4-color: #376222;
+  TrafficG5-color: #376222;
   TrafficTempBlock-color: #232323;
   TrafficUnknown-color: #000000;
-  TrafficArrowLight-color: #AAAAAA;
-  TrafficArrowDark-color: #1E1E1E;
-  TrafficOutline-color: #000000;
-  RoadShieldBlackText-color: #000000;
-  RoadShieldWhiteText-color: #FFFFFF;
-  RoadShieldUKYellowText-color: #FFCC66;
-  RoadShieldBlueBackground-color: #2E6FC9;
-  RoadShieldGreenBackground-color: #22723B;
-  RoadShieldRedBackground-color: #CD2828;
-  RoadShieldOrangeBackground-color: #FFBE00;
+  TrafficArrowLight-color: #C4C4C4;
+  TrafficArrowDark-color: #191919;
+  TrafficOutline-color: #383838;
+  RoadShieldBlackText-color: #212121;
+  RoadShieldWhiteText-color: #B7B6B6;
+  RoadShieldUKYellowText-color: #B49E0E;
+  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldGreenBackground-color: #136C30;
+  RoadShieldRedBackground-color: #9F1A17;
+  RoadShieldOrangeBackground-color: #136C30;
   PoiHotelTextOutline-color: #000000;
   PoiHotelTextOutline-opacity: 0.6;
   PoiDeletedMask-color: #FFFFFF;
diff --git a/data/styles/clear/style-night/symbols/bank-xl.svg b/data/styles/clear/style-night/symbols/bank-xl.svg
new file mode 100644
index 0000000000..931f30e7f3
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/bank-xl.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>bank-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-497.000000, -100.000000)">
+		<g id="bank-l" transform="translate(497.000000, 100.000000)">
+			<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+			<path id="Oval-1-Copy-38" class="st1" d="M19.4,37.4c10,0,18-8,18-18s-8-18-18-18s-18,8-18,18S9.5,37.4,19.4,37.4z"/>
+			<path id="Combined-Shape" class="st2" d="M8.6,12.2v2.2h2.9v11.5H8.6v2.9h21.6v-2.9h-2.9V14.4h2.9v-2.2l-10.8-5L8.6,12.2z
+				 M23,21.6c0,1.4-1,2.6-2.4,3v1.3h-2.4v-1.3c-1.4-0.5-2.4-1.7-2.4-3h2.4c0,0.6,0.5,1.1,1.2,1.1c0.7,0,1.2-0.5,1.2-1.1
+				s-0.5-1.1-1.2-1.1c-2,0-3.6-1.4-3.6-3.2c0-1.4,1-2.6,2.4-3V13h2.4v1.3c1.4,0.5,2.4,1.7,2.4,3h-2.4c0-0.6-0.5-1.1-1.2-1.1
+				c-0.7,0-1.2,0.5-1.2,1.1s0.6,1.1,1.2,1.1C21.5,18.4,23,19.8,23,21.6z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/buddhist-xl.svg b/data/styles/clear/style-night/symbols/buddhist-xl.svg
new file mode 100644
index 0000000000..df32be7398
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/buddhist-xl.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#26160D;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>buddhist-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-317.000000, -1026.000000)">
+		<g id="buddhist-l" transform="translate(317.000000, 1026.000000)">
+			<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+			<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="19.4" r="18"/>
+			<path id="Combined-Shape" class="st2" d="M20.2,8.6c5.4,0.4,9.7,4.7,10.1,10.1h1.4v1.4h-1.4c-0.4,5.4-4.7,9.7-10.1,10.1v1.4h-1.4
+				v-1.4C13.3,29.9,9,25.6,8.6,20.2H7.2v-1.4h1.4C9,13.3,13.3,9,18.7,8.6V7.2h1.4V8.6z M18.7,10.1c-2,0.1-4,1-5.4,2.3L18,17
+				c0.2-0.1,0.5-0.2,0.7-0.4V10.1z M20.2,10.1c2,0.1,4,1,5.4,2.3L20.9,17c-0.2-0.1-0.5-0.2-0.7-0.4V10.1z M20.2,28.8
+				c2-0.1,4-1,5.4-2.3l-4.7-4.7c-0.2,0.1-0.5,0.2-0.7,0.4V28.8z M18.7,28.8c-2-0.1-4-1-5.4-2.3l4.7-4.7c0.2,0.1,0.5,0.2,0.7,0.4
+				V28.8z M22.2,18.7h6.6c-0.1-2-1-4-2.3-5.4L22,18C22.1,18.2,22.2,18.5,22.2,18.7z M22.2,20.2h6.6c-0.1,2-1,4-2.3,5.4l-4.7-4.7
+				C22.1,20.6,22.2,20.4,22.2,20.2z M16.9,20.9l-4.7,4.7c-1.2-1.4-2-3.4-2.3-5.4h6.6C16.7,20.4,16.8,20.6,16.9,20.9z M16.7,18.7
+				h-6.6c0.1-2,1-4,2.3-5.4L17,18C16.8,18.2,16.7,18.5,16.7,18.7z M18.7,19.4c0-0.4,0.4-0.7,0.7-0.7c0.4,0,0.7,0.4,0.7,0.7
+				c0,0.4-0.4,0.7-0.7,0.7C19.1,20.2,18.7,19.8,18.7,19.4z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/cafe-xl.svg b/data/styles/clear/style-night/symbols/cafe-xl.svg
new file mode 100644
index 0000000000..0b5f1d6aff
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/cafe-xl.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#332714;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>cafe-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-137.000000, -545.000000)">
+		<g id="cafe-l" transform="translate(137.500000, 545.000000)">
+			<circle id="Oval-1" class="st0" cx="18.9" cy="19.4" r="19.4"/>
+			<circle id="Oval-1_1_" class="st1" cx="18.9" cy="19.4" r="18"/>
+			<path id="Shape" class="st2" d="M25.4,11.5v-1.4H9.6v10.1c0,2.4,1.9,4.3,4.3,4.3h7.2c2.4,0,4.3-1.8,4.3-2.9h1.4
+				c1.6,0,2.9-1.3,2.9-2.9v-4.3c0-1.6-1.3-2.9-2.9-2.9H25.4z M25.4,19.4v-5.8h2.2v5.8H25.4z M11,28.8h13l2.9-2.9H8.1L11,28.8z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/car-part-xl.svg b/data/styles/clear/style-night/symbols/car-part-xl.svg
new file mode 100644
index 0000000000..bbf857993e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car-part-xl.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>car-part-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -285.000000)">
+		<g id="car-part-l" transform="translate(677.000000, 285.000000)">
+			<g id="POI">
+				<g>
+					<g id="car-repair-l">
+						<g id="Layer_2">
+							<path id="Shape" class="st0" d="M19.4,38.9C8.8,38.9,0,30.1,0,19.4S8.8,0,19.4,0s19.4,8.8,19.4,19.4S30.1,38.9,19.4,38.9
+								L19.4,38.9L19.4,38.9z"/>
+							<path id="Shape_1_" class="st1" d="M37.4,19.4c0,10-8,18-18,18s-18-8-18-18s8-18,18-18S37.4,9.5,37.4,19.4L37.4,19.4
+								L37.4,19.4z"/>
+							<g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+								<g id="Group">
+									<g id="Shape_2_">
+										<path id="Combined-Shape" class="st2" d="M2.9,4.6c0.6-1.3,1.9-2.2,3.4-2.2S9,3.3,9.6,4.6h7.8c0.6-1.3,1.8-2.2,3.4-2.2
+											c1.4,0,2.8,0.8,3.4,2.2H20v2.9h4c-0.6,1.3-1.8,2.2-3.4,2.2c-1.4,0-2.8-0.8-3.4-2.2H9.6C9,8.8,7.7,9.7,6.2,9.7
+											S3.5,8.8,2.9,7.5H7V4.6H2.9z M22.8,17.6l-2.2-5.8c-0.2-0.7-0.7-1.4-2.2-1.4H8.4c-1.4,0-1.9,0.7-2.2,1.4l-2.2,5.8L2.6,19
+											v7.2h2.9v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4c0.7,0,1.4-0.7,1.4-1.4v-1.4H17v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4
+											c0.7,0,1.4-0.7,1.4-1.4v-1.4h2.9V19L22.8,17.6z M8.4,23.4H5.5v-2.9h2.9V23.4z M7.7,17.6l1.4-4.3h8.6l1.4,4.3H7.7z
+											 M21.4,23.4h-2.9v-2.9h2.9V23.4z"/>
+									</g>
+								</g>
+							</g>
+						</g>
+						<g id="Layer_1" transform="translate(6.000000, 10.000000)">
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/car-repair-xl.svg b/data/styles/clear/style-night/symbols/car-repair-xl.svg
new file mode 100644
index 0000000000..93fdf4479d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car-repair-xl.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>car-repair-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -137.000000)">
+		<g id="car-repair-l" transform="translate(677.000000, 137.000000)">
+			<g id="Layer_2">
+				<path id="Shape" class="st0" d="M19.4,38.9C8.8,38.9,0,30.1,0,19.4S8.8,0,19.4,0s19.4,8.8,19.4,19.4S30.1,38.9,19.4,38.9
+					L19.4,38.9z"/>
+				<path id="Shape_1_" class="st1" d="M37.4,19.4c0,10-8,18-18,18s-18-8-18-18s8-18,18-18S37.4,9.5,37.4,19.4L37.4,19.4z"/>
+			</g>
+			<g id="Layer_1" transform="translate(6.000000, 5.000000)">
+				<path id="Shape_2_" class="st2" d="M2.6,25.2h8.6v2.9h4.3v-2.9h8.6v-2.9H2.6L2.6,25.2L2.6,25.2z M22.8,9.4l-2.2-5.8
+					c-0.2-0.7-0.7-1.4-2.2-1.4H8.4C7,2.2,6.5,2.9,6.2,3.6L4.1,9.4l-1.4,1.4V18h2.9v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4
+					c0.7,0,1.4-0.7,1.4-1.4V18H17v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4c0.7,0,1.4-0.7,1.4-1.4V18h2.9v-7.2L22.8,9.4L22.8,9.4z M8.4,15.2
+					H5.5v-2.9h2.9V15.2L8.4,15.2z M7.7,9.4l1.4-4.3h8.6l1.4,4.3H7.7L7.7,9.4z M21.4,15.2h-2.9v-2.9h2.9V15.2L21.4,15.2z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/car-wash-xl.svg b/data/styles/clear/style-night/symbols/car-wash-xl.svg
new file mode 100644
index 0000000000..707add6fdd
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car-wash-xl.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>car-wash-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -322.000000)">
+		<g id="car-wash-l" transform="translate(677.000000, 322.000000)">
+			<g id="car-part-l">
+				<g id="POI">
+					<g id="car-repair-l">
+						<g id="Layer_2">
+							<path id="Shape" class="st0" d="M19.4,38.9C8.8,38.9,0,30.2,0,19.4S8.8,0,19.4,0s19.4,8.8,19.4,19.4S30.1,38.9,19.4,38.9
+								L19.4,38.9L19.4,38.9z"/>
+							<path id="Shape_1_" class="st1" d="M37.4,19.4c0,10-8,18-18,18s-18-8-18-18s8-18,18-18S37.4,9.6,37.4,19.4L37.4,19.4
+								L37.4,19.4z"/>
+							<path id="Combined-Shape" class="st2" d="M28.8,21.6l-2.2-5.8c-0.2-0.7-0.7-1.4-2.2-1.4H14.4c-1.4,0-1.9,0.7-2.2,1.4
+								l-2.2,5.8L8.6,23v7.2h2.9v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4c0.7,0,1.4-0.7,1.4-1.4v-1.4H23v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4
+								c0.7,0,1.4-0.7,1.4-1.4v-1.4h2.9V23L28.8,21.6z M14.4,27.4h-2.9v-2.9h2.9V27.4z M13.7,21.6l1.4-4.3h8.6l1.4,4.3H13.7z
+								 M27.4,27.4h-2.9v-2.9h2.9V27.4z"/>
+							<path id="Shape_2_" class="st2" d="M10.1,9.2c0,1.3,1,2.3,2.2,2.3s2.2-1,2.2-2.3s-2.2-3.5-2.2-3.5S10.1,8,10.1,9.2z"/>
+							<path id="Shape_3_" class="st2" d="M19.4,5.8c0,0-2.2,2.2-2.2,3.5s1,2.3,2.2,2.3c1.2,0,2.2-1,2.2-2.3S19.4,5.8,19.4,5.8
+								L19.4,5.8z"/>
+							<path id="Shape_4_" class="st2" d="M26.6,5.8c0,0-2.2,2.2-2.2,3.5s1,2.3,2.2,2.3c1.2,0,2.2-1.1,2.2-2.3S26.6,5.8,26.6,5.8
+								L26.6,5.8z"/>
+							<g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+								<g id="Group">
+									<g id="Shape_5_">
+									</g>
+								</g>
+							</g>
+						</g>
+						<g id="Layer_1" transform="translate(6.000000, 10.000000)">
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/car_sharing-xl.svg b/data/styles/clear/style-night/symbols/car_sharing-xl.svg
new file mode 100644
index 0000000000..289f9a8316
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car_sharing-xl.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>car_sharing-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -211.000000)">
+		<g id="car-sharing-l" transform="translate(677.000000, 211.000000)">
+			<g id="car-part-l">
+				<g id="POI">
+					<g id="car-repair-l">
+						<g id="Layer_2">
+							<path id="Shape" class="st0" d="M19.4,38.9C8.8,38.9,0,30.1,0,19.4S8.8,0,19.4,0s19.4,8.8,19.4,19.4S30.1,38.9,19.4,38.9
+								L19.4,38.9L19.4,38.9z"/>
+							<path id="Shape_1_" class="st1" d="M19.4,37.4c-10,0-18-8-18-18s8-18,18-18s18,8,18,18S29.4,37.4,19.4,37.4z"/>
+							<g id="noun_79131_cc" transform="translate(6.000000, 4.000000)">
+								<g id="Group">
+									<g id="Shape_2_">
+										<path id="Combined-Shape" class="st2" d="M11,3.9h8.9l1.4,1.4l-2.9,2.2L17,6.1l-1.4,1.4l-1.4-1.4l-1.4,1.4l-1.7-1
+											C10.6,8,9.2,9,7.7,9c-2,0-3.6-1.6-3.6-3.6s1.6-3.6,3.6-3.6C9.1,1.8,10.4,2.6,11,3.9z M5.5,5.4c0-0.8,0.6-1.4,1.4-1.4
+											s1.4,0.6,1.4,1.4S7.8,6.8,7,6.8S5.5,6.2,5.5,5.4z M22.8,17.6l-2.2-5.8c-0.2-0.7-0.7-1.4-2.2-1.4H8.4
+											c-1.4,0-1.9,0.7-2.2,1.4l-2.2,5.8L2.6,19v7.2h2.9v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4c0.7,0,1.4-0.7,1.4-1.4v-1.4H17v1.4
+											c0,0.7,0.7,1.4,1.4,1.4h1.4c0.7,0,1.4-0.7,1.4-1.4v-1.4h2.9V19L22.8,17.6z M8.4,23.4H5.5v-2.9h2.9V23.4z M7.7,17.6
+											l1.4-4.3h8.6l1.4,4.3H7.7z M21.4,23.4h-2.9v-2.9h2.9V23.4z"/>
+									</g>
+								</g>
+							</g>
+						</g>
+						<g id="Layer_1" transform="translate(6.000000, 10.000000)">
+						</g>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/car_shop-xl.svg b/data/styles/clear/style-night/symbols/car_shop-xl.svg
new file mode 100644
index 0000000000..02261060c0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/car_shop-xl.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#2D7970;}
+	.st2{fill:#825089;}
+	.st3{fill-opacity:0.65;}
+	.st4{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>car_shop-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="car_shop-l">
+		<path id="Shape" class="st0" d="M19.4,38.9C8.8,38.9,0,30.1,0,19.4S8.8,0,19.4,0s19.4,8.8,19.4,19.4S30.1,38.9,19.4,38.9
+			L19.4,38.9z"/>
+		<g id="Shape_1_">
+			<g>
+				<path id="path-1" class="st1" d="M37.4,19.4c0,10-8,18-18,18s-18-8-18-18s8-18,18-18S37.4,9.5,37.4,19.4L37.4,19.4z"/>
+			</g>
+			<g>
+				<path id="path-1_1_" class="st2" d="M37.4,19.4c0,10-8,18-18,18s-18-8-18-18s8-18,18-18S37.4,9.5,37.4,19.4L37.4,19.4z"/>
+			</g>
+			<g>
+				<path id="path-1_2_" class="st3" d="M37.4,19.4c0,10-8,18-18,18s-18-8-18-18s8-18,18-18S37.4,9.5,37.4,19.4L37.4,19.4z"/>
+			</g>
+		</g>
+		<path id="Shape_2_" class="st4" d="M30.2,15.8l-2.2-5.8c-0.2-0.7-0.7-1.4-2.2-1.4H13c-1.4,0-1.8,0.7-2.2,1.4l-2.2,5.8l-1.4,1.4
+			v8.6h2.9v1.4c0,0.7,0.7,1.4,1.4,1.4H13c0.7,0,1.4-0.7,1.4-1.4v-1.4h10.1v1.4c0,0.7,0.7,1.4,1.4,1.4h1.4c0.7,0,1.4-0.7,1.4-1.4
+			v-1.4h2.9v-8.6L30.2,15.8L30.2,15.8z M13.7,11.5h11.5l1.4,4.3H12.2L13.7,11.5L13.7,11.5z M13.2,22.3c0,0.6-0.5,1-1,1h-1.4
+			c-0.6,0-1-0.5-1-1v-1.4c0-0.6,0.5-1,1-1h1.4c0.6,0,1,0.5,1,1V22.3L13.2,22.3z M29,22.3c0,0.6-0.5,1-1,1h-1.4c-0.6,0-1-0.5-1-1
+			v-1.4c0-0.6,0.5-1,1-1h1.4c0.6,0,1,0.5,1,1V22.3L29,22.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/charging-station-xl.svg b/data/styles/clear/style-night/symbols/charging-station-xl.svg
new file mode 100644
index 0000000000..6b241d4364
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/charging-station-xl.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>charging-station-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -100.000000)">
+		<g id="charging-station-l_1_" transform="translate(677.000000, 69.000000)">
+			<g id="POI">
+				<g>
+					<g id="charging-station-l">
+						<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="50.4" r="19.4"/>
+						<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="50.4" r="18"/>
+						<path id="Combined-Shape" class="st2" d="M13,39.6c-0.8,0-1.4,0.6-1.4,1.4v18.7h-1.4v1.4h0.2h14.2v-1.4H23V41.1
+							c0-0.8-0.6-1.4-1.4-1.4H13z M16.2,56.9l1-5.2H13l5.4-7.8l-1.1,5.2h4.3L16.2,56.9z M30.4,50.6c-0.1-0.4-0.2-0.7-0.2-1v-1.3h0.1
+							l1-1.1c0,0,0.4-3.5-4.9-5.4l-0.7,1.1c0,0,2.6,2.3,2.5,4.6l0.6,0.8v1.3c0,0.5,0.1,1,0.2,1.3l1.2,5.6c0.1,0.6,0,1.1-0.4,1.6
+							c-0.4,0.5-1,0.7-1.6,0.7c-1.1,0-1.9-0.8-1.9-1.8l0.5-4.4v-0.1c0-1.3-1.1-2.5-2.5-2.5h-1.4v1.3h1.4c0.6,0,1.1,0.5,1.1,1.1
+							l-0.5,4.6V57c0,1.8,1.4,3.1,3.2,3.1c1,0,1.9-0.5,2.6-1.2c0.6-0.8,0.8-1.8,0.6-2.8L30.4,50.6L30.4,50.6z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/christian-xl.svg b/data/styles/clear/style-night/symbols/christian-xl.svg
new file mode 100644
index 0000000000..712fb42377
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/christian-xl.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#26160D;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>christian-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-317.000000, -952.000000)">
+		<g id="christian-l" transform="translate(317.000000, 952.000000)">
+			<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+			<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="19.4" r="18"/>
+			<path id="Combined-Shape" class="st2" d="M21.6,13V7.2h-4.3V13h-7.2v4.3h7.2v14.4h4.3V17.3h7.2V13C28.8,13,21.6,13,21.6,13z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/college-xl-01.svg b/data/styles/clear/style-night/symbols/college-xl-01.svg
new file mode 100644
index 0000000000..201066422e
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/college-xl-01.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.9 32.9" enable-background="new 0 0 32.9 32.9" xml:space="preserve">
+<g id="POI-NIght">
+	<g id="college-l">
+		<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.4" cy="16.4" r="16.2"/>
+		<circle id="Oval-1-Copy-38" fill="#252522" cx="16.4" cy="16.4" r="15"/>
+		<path id="path7442-copy" fill="#FFFFFF" fill-opacity="0.7" d="M16.4,8.6L5,14.6l11.4,6l6.6-3.3v4.5c0,2.4,2.4,2.4,2.4,2.4V23
+			c0,0-1.2-0.1-1.2-1.2v-5.2l3.6-2L16.4,8.6z M11,19.4v2.4c0,0.6,0.4,1.4,1.2,1.8l4.2,1.8l3.6-1.8c0.8-0.4,1.9-1.2,1.8-1.8v-2.4
+			l-5.4,2.6L11,19.4z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/college-xl.svg b/data/styles/clear/style-night/symbols/college-xl.svg
new file mode 100644
index 0000000000..40ec0b90c4
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/college-xl.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>college-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="college-l">
+		<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+		<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="19.4" r="18"/>
+		<path id="path7442-copy" class="st2" d="M19.4,10.1L5.8,17.3l13.7,7.2l7.9-4v5.4c0,2.9,2.9,2.9,2.9,2.9v-1.4c0,0-1.4-0.1-1.4-1.4
+			v-6.2l4.3-2.4L19.4,10.1z M13,23v2.9c0,0.7,0.5,1.7,1.4,2.2l5,2.2l4.3-2.2c1-0.5,2.3-1.4,2.2-2.2V23l-6.5,3.1L13,23z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/fastfood-xl.svg b/data/styles/clear/style-night/symbols/fastfood-xl.svg
new file mode 100644
index 0000000000..1f14d79e40
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/fastfood-xl.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#332714;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>fastfood-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-137.000000, -507.000000)">
+		<g id="fastfood-l" transform="translate(137.500000, 507.000000)">
+			<circle id="Oval-1" class="st0" cx="18.9" cy="19.4" r="19.4"/>
+			<circle id="Oval-1_1_" class="st1" cx="18.9" cy="19.4" r="18"/>
+			<g id="g16674" transform="translate(4.000000, 7.000000)">
+				<path id="rect13326-2-5-2-3" class="st2" d="M12.8,3.1C8.5,3.1,2.7,5.2,2.7,8.8v2.9h24.5V8.8c0-3.6-5.8-5.8-10.1-5.8
+					C17.1,3.1,12.8,3.1,12.8,3.1z M12.1,4.5c0.4,0,0.7,0.4,0.7,0.7S12.4,6,12.1,6s-0.7-0.4-0.7-0.7C11.3,4.9,11.7,4.5,12.1,4.5
+					L12.1,4.5z M17.8,4.5c0.4,0,0.7,0.4,0.7,0.7S18.2,6,17.8,6s-0.7-0.4-0.7-0.7S17.5,4.5,17.8,4.5L17.8,4.5z M9.2,7.4
+					c0.4,0,0.7,0.4,0.7,0.7S9.5,8.8,9.2,8.8S8.5,8.5,8.5,8.1C8.5,7.8,8.8,7.4,9.2,7.4L9.2,7.4z M14.9,7.4c0.4,0,0.7,0.4,0.7,0.7
+					s-0.4,0.7-0.7,0.7c-0.4,0-0.7-0.4-0.7-0.7S14.6,7.4,14.9,7.4L14.9,7.4z M20.7,7.4c0.4,0,0.7,0.4,0.7,0.7s-0.4,0.7-0.7,0.7
+					c-0.4,0-0.7-0.4-0.7-0.7S20.3,7.4,20.7,7.4L20.7,7.4z M2.7,13.2c-0.7,0-1.4,0.7-1.4,1.4C1.3,15.3,2,16,2.7,16h24.5
+					c0.7,0,1.4-0.7,1.4-1.4c0-0.7-0.7-1.4-1.4-1.4H2.7z M2.7,17.5v1.4c0,1.4,1.4,2.9,2.9,2.9h18.7c1.4,0,2.9-1.4,2.9-2.9v-1.4
+					C27.2,17.5,2.7,17.5,2.7,17.5z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/fuel-xl.svg b/data/styles/clear/style-night/symbols/fuel-xl.svg
new file mode 100644
index 0000000000..aa420646ee
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/fuel-xl.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#252522;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>fuel-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -63.000000)">
+		<g id="fuel-l" transform="translate(677.000000, 63.000000)">
+			<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+			<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="19.4" r="18"/>
+			
+				<g id="noun_379269_cc" transform="translate(13.500000, 13.500000) scale(-1, 1) translate(-13.500000, -13.500000) translate(6.000000, 6.000000)">
+				<g id="Group">
+				</g>
+			</g>
+		</g>
+		<g id="charging-station-l_1_" transform="translate(677.000000, 69.000000)">
+			<g id="POI">
+				<g>
+					<g id="charging-station-l">
+						<path id="Combined-Shape" class="st2" d="M13,2.6c-0.8,0-1.4,0.6-1.4,1.4v18.7h-1.4v1.4h0.2h14.2v-1.4H23V4.1
+							c0-0.8-0.6-1.4-1.4-1.4H13L13,2.6z M13,7c0-0.8,0.6-1.4,1.4-1.4h5.8c0.8,0,1.4,0.6,1.4,1.4v2.9c0,0.8-0.6,1.4-1.4,1.4h-5.8
+							c-0.8,0-1.4-0.6-1.4-1.4V7L13,7z M30.4,13.6c-0.1-0.4-0.2-0.7-0.2-1v-1.4h0.1l1-1.1c0,0,0.4-3.5-4.9-5.4l-0.7,1.1
+							c0,0,2.6,2.3,2.5,4.6l0.7,0.8v1.3c0,0.5,0.1,1,0.2,1.3l1.2,5.6c0.1,0.6,0,1.1-0.4,1.6c-0.4,0.5-1,0.7-1.6,0.7
+							c-1.1,0-1.9-0.8-1.9-1.8l0.5-4.4v-0.1c0-1.3-1.1-2.5-2.5-2.5h-1.4v1.3h1.4c0.6,0,1.1,0.5,1.1,1.1L25,19.8v0.1
+							c0,1.8,1.4,3.1,3.2,3.1c1,0,1.9-0.5,2.6-1.2c0.6-0.8,0.8-1.8,0.6-2.8L30.4,13.6L30.4,13.6z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/garden-xl.svg b/data/styles/clear/style-night/symbols/garden-xl.svg
new file mode 100644
index 0000000000..963e0f07b1
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/garden-xl.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>garden-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="garden-l">
+		<ellipse id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+		<ellipse id="Oval-1-Copy-38" fill="#112906" cx="16.2" cy="16.2" rx="15" ry="15"/>
+		<path id="path6080-4" fill="#FFFFFF" fill-opacity="0.7" d="M10.8,8.4v2.4c0,2.4,2.4,3.7,4.8,3.6V24c-1.2-2.4-4.8-6-8.4-4.8
+			c0,0,3,7.2,9,7.2s9-7.2,9-7.2C21.6,18,18,21.6,16.8,24v-9.6c2.4,0.1,4.8-1.2,4.8-3.6V8.4c0-0.5-0.1-1.2-0.4-1.2
+			c-0.2,0-0.5,0.3-0.8,0.6l-1.8,1.8l-1.8-2c-0.2-0.2-0.3-0.4-0.6-0.4c-0.3,0-0.4,0.2-0.6,0.4l-1.8,2L12,7.8
+			c-0.3-0.3-0.6-0.6-0.8-0.6C10.9,7.2,10.8,7.9,10.8,8.4z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/grocery-xl.svg b/data/styles/clear/style-night/symbols/grocery-xl.svg
new file mode 100644
index 0000000000..c5ce5a70e8
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/grocery-xl.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#2D7970;}
+	.st2{fill:#825089;}
+	.st3{fill-opacity:0.65;}
+	.st4{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>grocery-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="grocery-l">
+		<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+		<g id="Oval-1-Copy-38">
+			<g>
+				<circle id="path-1" class="st1" cx="19.4" cy="19.4" r="18"/>
+			</g>
+			<g>
+				<circle id="path-1_1_" class="st2" cx="19.4" cy="19.4" r="18"/>
+			</g>
+			<g>
+				<circle id="path-1_2_" class="st3" cx="19.4" cy="19.4" r="18"/>
+			</g>
+		</g>
+		<path id="rect7842-copy" class="st4" d="M30.2,8.6c-0.8,0-1.6,0.2-2.2,0.7c-0.5,0.5-0.7,1.3-0.7,2.2H7.2l2.9,13h17.3v1.4H11.5
+			c-1.4,0-1.4,1.4,0,1.4h2.2h11.5h2.2c0.7,0,1.4-0.7,1.4-1.4v-1.4V13v-1.4c0,0,0.1-1,0.4-1.1c0.2-0.2,0.5-0.4,1.1-0.4h0.6
+			c0.7,0,0.8-0.4,0.8-0.7s-0.1-0.7-0.8-0.7L30.2,8.6L30.2,8.6z M25.2,27.4c-1.2,0-2.2,1-2.2,2.2c0,1.2,1,2.2,2.2,2.2
+			c1.2,0,2.2-1,2.2-2.2C27.4,28.3,26.4,27.4,25.2,27.4L25.2,27.4z M13.7,27.4c-1.2,0-2.2,1-2.2,2.2c0,1.2,1,2.2,2.2,2.2
+			s2.2-1,2.2-2.2C15.8,28.3,14.9,27.4,13.7,27.4L13.7,27.4z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/hindu-xl.svg b/data/styles/clear/style-night/symbols/hindu-xl.svg
new file mode 100644
index 0000000000..1e90ee7da6
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/hindu-xl.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#26160D;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>hindu-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-317.000000, -1063.000000)">
+		<g id="hindu-l" transform="translate(317.000000, 1063.000000)">
+			<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+			<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="19.4" r="18"/>
+			<path id="Combined-Shape" class="st2" d="M10.7,13.6l1.4,2.8c0,0,2.9-2.2,4.6-1.7c0,0,1,0.2,1.2,0.8c0,0,0.7,1.4-1.3,2
+				c0,0-1.6,0.5-3.1-0.1l1.2,3.6c0,0,1.6-0.8,3,0c0,0,1.9,1.2,0.4,3.6c0,0-1,1.2-3.1,1.2c0,0-5,0.5-6-7.3c0,0-0.8,3.2,1.1,6.7
+				c0,0,1.8,3.6,5.8,3.6c0,0,4.2,0.2,4.7-4.1c0,0,0.4-2-1-4.3c0,0,2,0.7,3.4-0.6c0,0,0.7-0.5,1.7-2.3c0,0,0.7-1.3,1.7-1.4
+				c0,0,1.2-0.4,1.9,0.7c0,0,0.7,1.4,0.6,3c0,0,0,3-3,3.8c0,0-3.5,1.1-3.7-2.5c0,0-0.4,0.4-0.2,2.3c0,0,0.2,3,3,3.6
+				c0,0,2,0.5,3.7-1.4c0,0,1.6-1.4,1.6-4.4c0,0,0.2-2.4-1-4.6c0,0-1.1-2-3-2.4c0,0-1.7-0.4-3.1,0.8c0,0-0.8,0.5-2.2,3.1
+				c0,0-0.6,1.4-1.8,1.4c0,0-0.5,0-0.7-0.2c0,0-0.7-0.4-1.1-0.4c0,0,1.6-0.6,2.3-2.5c0,0,0.7-1.8-0.2-3.4c0,0-0.7-1.8-4.1-1.6
+				C14.9,11.8,12.6,11.9,10.7,13.6z M17.9,8.4c0,0,0.5,2.9,4.1,3.4c0,0,2.3,0.1,4.3-2.2l1.8,2.3c0,0-1.8,2-5,2.2
+				c0,0-2.3,0.4-4.3-2.2C18.7,11.8,17.5,10.3,17.9,8.4z M19.9,9.4l2-2.2l2,2l-2,2L19.9,9.4z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/hospital-xl.svg b/data/styles/clear/style-night/symbols/hospital-xl.svg
new file mode 100644
index 0000000000..7181a19002
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/hospital-xl.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 38.9 38.9" style="enable-background:new 0 0 38.9 38.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;fill-opacity:0.1;}
+	.st1{fill:#612C23;}
+	.st2{fill:#FFFFFF;fill-opacity:0.7;}
+</style>
+<title>hospital-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-137.000000, -248.000000)">
+		<g id="hospital-l" transform="translate(137.000000, 248.000000)">
+			<circle id="Oval-1-Copy-39" class="st0" cx="19.4" cy="19.4" r="19.4"/>
+			<circle id="Oval-1-Copy-38" class="st1" cx="19.4" cy="19.4" r="18"/>
+			<path id="Combined-Shape" class="st2" d="M23,15.8v-5.8c0-0.8-0.6-1.4-1.4-1.4h-4.3c-0.8,0-1.4,0.6-1.4,1.4v5.8h-5.8
+				c-0.8,0-1.4,0.6-1.4,1.4v4.3c0,0.8,0.6,1.4,1.4,1.4h5.8v5.8c0,0.8,0.6,1.4,1.4,1.4h4.3c0.8,0,1.4-0.6,1.4-1.4V23h5.8
+				c0.8,0,1.4-0.6,1.4-1.4v-4.3c0-0.8-0.6-1.4-1.4-1.4H23z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/muslim-xl.svg b/data/styles/clear/style-night/symbols/muslim-xl.svg
new file mode 100644
index 0000000000..fa5422c09b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/muslim-xl.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>muslim-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-317.000000, -989.000000)">
+		<g id="muslim-l" transform="translate(317.000000, 989.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#26160D" cx="16.2" cy="16.2" r="15"/>
+			<polygon id="Star-4" fill="#FFFFFF" fill-opacity="0.7" points="22.2,17.7 20.2,18.7 20.7,16.7 19.2,15.2 21.2,15.2 22.2,13.2 
+				23.2,15.2 25.2,15.2 23.7,16.7 24.2,18.7 			"/>
+			<path id="Combined-Shape" fill="#FFFFFF" fill-opacity="0.7" d="M21.4,9.8c-1.6-1.6-3.9-2.6-6.4-2.6c-5,0-9,4-9,9c0,5,4,9,9,9
+				c2.5,0,4.7-1,6.4-2.6c-1,0.5-2.1,0.8-3.4,0.8c-4,0-7.2-3.2-7.2-7.2c0-4,3.2-7.2,7.2-7.2C19.2,9,20.4,9.3,21.4,9.8z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/nparkF-xl.svg b/data/styles/clear/style-night/symbols/nparkF-xl.svg
new file mode 100644
index 0000000000..de60692240
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/nparkF-xl.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>nparkF-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="nparkF-l">
+		<ellipse id="Oval-1-Copy-44" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+		<ellipse id="Oval-1-Copy-45" fill="#112906" cx="16.2" cy="16.2" rx="15" ry="15"/>
+		<polygon id="rect4152-3-3-5-copy-2" fill="#FFFFFF" fill-opacity="0.7" points="16.2,6 9.6,11.8 13.3,11.8 9.6,16.7 13.3,16.7 
+			9.6,21.6 15.6,21.6 15.6,26.3 16.8,26.3 16.8,21.6 22.8,21.6 19.1,16.7 22.8,16.7 19.1,11.8 22.8,11.8 		"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/park-xl.svg b/data/styles/clear/style-night/symbols/park-xl.svg
new file mode 100644
index 0000000000..e528c731e7
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/park-xl.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>park-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="park-l">
+		<ellipse id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+		<ellipse id="Oval-1-Copy-38" fill="#112906" cx="16.2" cy="16.2" rx="15" ry="15"/>
+		<path id="path4390-3" fill="#FFFFFF" fill-opacity="0.7" d="M24,16.2c0-1.3-0.8-2.4-2-2.8c0.5-0.5,0.8-1.2,0.8-2c0-1.7-1.3-3-3-3
+			c-0.2,0-0.5,0-0.7,0.1C18.9,7.1,17.7,6,16.2,6c-1.5,0-2.7,1.1-2.9,2.5c-0.2-0.1-0.4-0.1-0.7-0.1c-1.7,0-3,1.3-3,3
+			c0,0.8,0.3,1.5,0.8,2c-1.1,0.4-2,1.5-2,2.8c0,1.7,1.2,3,3,3H12l2.4,4.2v4.2H18v-4.2l2.4-4.2l0.9,0C22.8,19.2,24,17.8,24,16.2
+			L24,16.2z M14.4,19.2H18l-1.2,2.4h-1.2L14.4,19.2z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/parking-xl.svg b/data/styles/clear/style-night/symbols/parking-xl.svg
new file mode 100644
index 0000000000..71147e5bed
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/parking-xl.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25.2 25.2" enable-background="new 0 0 25.2 25.2" xml:space="preserve">
+<title>parking-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="parking-l">
+		<path id="Rectangle-346-Copy-3" fill="#FFFFFF" fill-opacity="0.1" d="M2.4,0h20.4c1.3,0,2.4,1.1,2.4,2.4v20.4
+			c0,1.3-1.1,2.4-2.4,2.4H2.4c-1.3,0-2.4-1.1-2.4-2.4V2.4C0,1.1,1.1,0,2.4,0z"/>
+		<path id="Rectangle-346" fill="#0C2133" d="M3.6,1.2h18c1.3,0,2.4,1.1,2.4,2.4v18c0,1.3-1.1,2.4-2.4,2.4h-18
+			c-1.3,0-2.4-1.1-2.4-2.4v-18C1.2,2.3,2.3,1.2,3.6,1.2z"/>
+		<path id="path15189-copy" fill="#FFFFFF" fill-opacity="0.7" d="M11.3,12.4h1c0.9,0,1.6-0.2,2-0.5c0.4-0.4,0.7-0.9,0.7-1.5
+			c0-0.7-0.2-1.2-0.6-1.5c-0.4-0.3-1-0.5-1.7-0.5h-1.3V12.4 M17.9,10.3c0,1.5-0.5,2.6-1.4,3.4c-0.9,0.8-2.2,1.2-3.9,1.2h-1.2v4.9
+			H8.4V6h4.4c1.7,0,2.9,0.4,3.8,1.1C17.4,7.8,17.9,8.9,17.9,10.3"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-xl.svg b/data/styles/clear/style-night/symbols/place-of-worship-xl.svg
new file mode 100644
index 0000000000..e7ae9dbb6f
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/place-of-worship-xl.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>place-of-worship-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-317.000000, -915.000000)">
+		<g id="place-of-worship-l" transform="translate(317.000000, 915.000000)">
+			<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" r="16.2"/>
+			<circle id="Oval-1-Copy-38" fill="#26160D" cx="16.2" cy="16.2" r="15"/>
+			<path id="path8846-copy" fill="#FFFFFF" fill-opacity="0.7" d="M16.2,6c0,0-3,1.2-3,2.4v2.4c0,1.2-2.4,1.2-2.4,2.4V24h10.8V13.2
+				c0-1.2-2.4-1.2-2.4-2.6V8.4C19.2,7.2,16.2,6,16.2,6L16.2,6z M6,15.6V24h2.4v-8.4c0-1.2-1.2-1.2-1.2-1.2S6,14.4,6,15.6L6,15.6z
+				 M24,15.6V24h2.4v-8.4c0-1.2-1.2-1.2-1.2-1.2S24,14.4,24,15.6L24,15.6z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/railway-crossing_l.svg b/data/styles/clear/style-night/symbols/railway-crossing_l.svg
new file mode 100644
index 0000000000..bf613f3f90
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/railway-crossing_l.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 19 12" enable-background="new 0 0 19 12" xml:space="preserve">
+<title>railway-crossing</title>
+<desc>Created with Sketch.</desc>
+<g>
+	<path id="path-1" fill="#C81D17" d="M18.4,10L18.4,10l0.6,1.5l-1.6,0.2l-2,0.2l-0.4,0l-0.3-0.2L1.9,4.4L1.6,4.2L1.4,3.8L0.6,2
+		L0,0.5l1.6-0.2l2-0.2L4,0l0.3,0.2l13.2,7.6l0,0l0.2,0.4L18.4,10z M0.6,10L0.6,10l0.8-1.8l0.2-0.4l0,0l13.2-7.6L15.1,0l0.4,0l2,0.2
+		L19,0.5L18.4,2l-0.8,1.8l-0.2,0.4l-0.3,0.2L4.3,11.8L4,12l-0.4,0l-2-0.2L0,11.5L0.6,10z"/>
+</g>
+<g>
+	<path id="path-1_1_" fill-opacity="0.4" d="M18.4,10L18.4,10l0.6,1.5l-1.6,0.2l-2,0.2l-0.4,0l-0.3-0.2L1.9,4.4L1.6,4.2L1.4,3.8
+		L0.6,2L0,0.5l1.6-0.2l2-0.2L4,0l0.3,0.2l13.2,7.6l0,0l0.2,0.4L18.4,10z M0.6,10L0.6,10l0.8-1.8l0.2-0.4l0,0l13.2-7.6L15.1,0l0.4,0
+		l2,0.2L19,0.5L18.4,2l-0.8,1.8l-0.2,0.4l-0.3,0.2L4.3,11.8L4,12l-0.4,0l-2-0.2L0,11.5L0.6,10z"/>
+</g>
+<path id="Rectangle-27-Copy" fill="#4C4C4B" d="M11.9,6l4.6,2.7l0.8,1.8l-2,0.2L9.5,7.4l-5.8,3.4l-2-0.2l0.8-1.8L7.1,6L2.5,3.3
+	L1.7,1.5l2-0.2l5.8,3.4l5.8-3.4l2,0.2l-0.8,1.8L11.9,6z"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/railway-crossing_xl.svg b/data/styles/clear/style-night/symbols/railway-crossing_xl.svg
new file mode 100644
index 0000000000..008d41b392
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/railway-crossing_xl.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 34.2 21.6" style="enable-background:new 0 0 34.2 21.6;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C81D17;}
+	.st1{fill-opacity:0.4;}
+	.st2{fill:#4C4C4B;}
+</style>
+<title>railway-crossing</title>
+<desc>Created with Sketch.</desc>
+<g>
+	<path id="path-1" class="st0" d="M33.2,18L33.2,18l1,2.7L31.3,21l-3.6,0.3H27L26.4,21L3.4,8L2.8,7.5L2.6,6.9L1.1,3.6L0,0.9l2.8-0.3
+		l3.6-0.3L7.2,0l0.6,0.3l23.7,13.8l0,0l0.3,0.8L33.2,18z M1,18L1,18l1.5-3.3L2.9,14l0,0L26.6,0.3L27.2,0h0.8l3.6,0.3l2.7,0.6l-1,2.7
+		l-1.5,3.3l-0.3,0.6l-0.6,0.3l-23,13.5l-0.6,0.3H6.5l-3.6-0.3L0,20.7L1,18z"/>
+</g>
+<g>
+	<path id="path-1_1_" class="st1" d="M33.2,18L33.2,18l1,2.7L31.3,21l-3.6,0.3H27L26.4,21L3.4,8L2.8,7.5L2.6,6.9L1.1,3.6L0,0.9
+		l2.8-0.3l3.6-0.3L7.2,0l0.6,0.3l23.7,13.8l0,0l0.3,0.8L33.2,18z M1,18L1,18l1.5-3.3L2.9,14l0,0L26.6,0.3L27.2,0h0.8l3.6,0.3
+		l2.7,0.6l-1,2.7l-1.5,3.3l-0.3,0.6l-0.6,0.3l-23,13.5l-0.6,0.3H6.5l-3.6-0.3L0,20.7L1,18z"/>
+</g>
+<path id="Rectangle-27-Copy" class="st2" d="M21.5,10.8l8.2,4.8l1.5,3.3l-3.6,0.3l-10.5-6L6.6,19.3L3,19l1.5-3.3l8.2-5.1L4.5,6
+	L3,2.7l3.6-0.3l10.5,6.1l10.5-6.1l3.6,0.3L29.7,6L21.5,10.8z"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/restaurant-xl.svg b/data/styles/clear/style-night/symbols/restaurant-xl.svg
new file mode 100644
index 0000000000..50f390f4e0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/restaurant-xl.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>restaurant-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-137.000000, -396.000000)">
+		<g id="restaurant-l" transform="translate(137.000000, 396.000000)">
+			<ellipse id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" rx="16.2" ry="16.2"/>
+			<ellipse id="Oval-1-Copy-38" fill="#332714" cx="16.2" cy="16.2" rx="15" ry="15"/>
+			<path id="Shape" fill="#FFFFFF" fill-opacity="0.7" d="M13.8,13.2V8.1c0-0.5-0.4-0.9-0.9-0.9l0,0c-0.5,0-0.9,0.4-0.9,0.9v5.1
+				h-1.8V8.1c0-0.5-0.4-0.9-0.9-0.9l0,0c-0.5,0-0.9,0.4-0.9,0.9v5.1c0,2.2,1.8,3.6,3.6,3.6L11.7,24c0,0.7,0.5,1.2,1.2,1.2l0,0
+				c0.7,0,1.2-0.5,1.2-1.2l-0.3-7.2c1.8,0,3.6-1.4,3.6-3.6V8.1c0-0.5-0.4-0.9-0.9-0.9l0,0c-0.5,0-0.9,0.4-0.9,0.9v5.1H13.8z
+				 M19.2,18h2.4v6c0,0.7,0.5,1.2,1.2,1.2l0,0c0.7,0,1.2-0.5,1.2-1.2V7.2c-2.8,0-4.8,2-4.8,3.6V18z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/shop-xl.svg b/data/styles/clear/style-night/symbols/shop-xl.svg
new file mode 100644
index 0000000000..de2f986cda
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shop-xl.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>shop-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-NIght">
+	<g id="shop-l">
+		<circle id="Oval-1-Copy-39" fill="#FFFFFF" fill-opacity="0.1" cx="16.2" cy="16.2" r="16.2"/>
+		<g id="Oval-1-Copy-38">
+			<g>
+				<circle id="path-1" fill="#2D7970" cx="16.2" cy="16.2" r="15"/>
+			</g>
+			<g>
+				<circle id="path-1_1_" fill="#825089" cx="16.2" cy="16.2" r="15"/>
+			</g>
+			<g>
+				<circle id="path-1_2_" fill-opacity="0.65" cx="16.2" cy="16.2" r="15"/>
+			</g>
+		</g>
+		<path id="rect13131-6-copy" fill="#FFFFFF" fill-opacity="0.7" d="M14.4,4.8c-1.2,0-2.3,1.2-2.4,2.4l-0.4,3.6h-2
+			c-0.6,0-1.2,0.6-1.2,1.2L7.2,24c0,0.6,0.6,1.2,1.2,1.2H24c0.6,0,1.2-0.6,1.2-1.2L24,12c0-0.6-0.6-1.2-1.2-1.2h-2l-0.4-3.6
+			C20.3,6,19.2,4.8,18,4.8H14.4z M14.4,6H18c0.6,0,1.1,0.6,1.2,1.2l0.4,3.6h-6.8l0.4-3.6C13.3,6.6,13.8,6,14.4,6L14.4,6z"/>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam-l.svg b/data/styles/clear/style-night/symbols/speedcam-l.svg
index a576a61e7d..26dd3c4afd 100644
--- a/data/styles/clear/style-night/symbols/speedcam-l.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-l.svg
@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>speedcam-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="POI-NIght" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="speedcam-l">
-            <rect id="Rectangle-346-Copy-3" fill-opacity="0.7" fill="#FFFFFF" x="0" y="0" width="21" height="21" rx="2"></rect>
-            <rect id="Rectangle-346" fill="#252522" x="1" y="1" width="19" height="19" rx="2"></rect>
-        </g>
-        <path d="M16.4180495,9.125 L16.4180495,8.4375 C16.4180495,8.058 16.0984067,7.75 15.7037638,7.75 L14.9894781,7.75 L14.9894781,12.5625 L14,12.5625 L14,6.71875 C14,5.7693125 13.2007143,5 12.2142857,5 L5.78571429,5 C4.79928571,5 4,5.7693125 4,6.71875 L4,14.28125 C4,15.2306875 4.79928571,16 5.78571429,16 L12.2142857,16 C13.2007143,16 14,15.2306875 14,14.28125 L14,13.9375 L15.7037638,13.9375 C16.0984067,13.9375 16.4180495,13.6298438 16.4180495,13.25 L16.4180495,12.5625 L17.7037638,12.5625 C17.9012638,12.5625 18.0609067,12.4088437 18,12.21875 L18,9.46875 C18.0609067,9.27865625 17.9012638,9.125 17.7037638,9.125 L16.4180495,9.125 Z M7.5,14.5 C6.395,14.5 5.5,13.6047413 5.5,12.5001667 C5.5,11.395592 6.395,10.5 7.5,10.5 C8.60466667,10.5 9.5,11.395592 9.5,12.5001667 C9.5,13.6047413 8.60466667,14.5 7.5,14.5 L7.5,14.5 Z M11.8932321,7.875 C11.4788571,7.875 11.1428571,7.539375 11.1428571,7.125375 C11.1428571,6.711 11.4788571,6.375 11.8932321,6.375 C12.3072321,6.375 12.6428571,6.711 12.6428571,7.125375 C12.6428571,7.539375 12.3072321,7.875 11.8932321,7.875 L11.8932321,7.875 Z" id="Imported-Layers-Copy-3" fill-opacity="0.7" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20.2 20.2" enable-background="new 0 0 20.2 20.2" xml:space="preserve">
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<path id="Rectangle-346-Copy-3" fill="#FFFFFF" fill-opacity="0.7" d="M1.9,0h16.3c1,0,1.9,0.9,1.9,1.9v16.3c0,1-0.9,1.9-1.9,1.9
+	H1.9c-1,0-1.9-0.9-1.9-1.9V1.9C0,0.9,0.9,0,1.9,0z"/>
+<path id="Rectangle-346" fill="#252522" d="M2.9,1h14.4c1,0,1.9,0.9,1.9,1.9v14.4c0,1-0.9,1.9-1.9,1.9H2.9c-1,0-1.9-0.9-1.9-1.9V2.9
+	C1,1.8,1.8,1,2.9,1z"/>
+<polygon id="Shape_2_" fill="#FFFFFF" fill-opacity="0.7" points="3.8,6.9 12.5,6.9 12.5,5.8 15.4,5.8 15.4,6.9 16.4,6.9 16.4,14.6 
+	3.8,14.6 "/>
+<circle id="Oval_4_" fill="#252522" cx="10.6" cy="10.7" r="2.9"/>
+<circle id="Oval_1_" fill="#FFFFFF" fill-opacity="0.7" cx="10.6" cy="10.7" r="1.9"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam-xl.svg b/data/styles/clear/style-night/symbols/speedcam-xl.svg
new file mode 100644
index 0000000000..08ebd53fde
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/speedcam-xl.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25.2 25.2" enable-background="new 0 0 25.2 25.2" xml:space="preserve">
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<path id="Rectangle-346-Copy-3" fill="#FFFFFF" fill-opacity="0.7" d="M2.4,0h20.4c1.3,0,2.4,1.1,2.4,2.4v20.4
+	c0,1.3-1.1,2.4-2.4,2.4H2.4c-1.3,0-2.4-1.1-2.4-2.4V2.4C0,1.1,1.1,0,2.4,0z"/>
+<path id="Rectangle-346" fill="#252522" d="M3.6,1.2h18c1.3,0,2.4,1.1,2.4,2.4v18c0,1.3-1.1,2.4-2.4,2.4h-18c-1.3,0-2.4-1.1-2.4-2.4
+	v-18C1.2,2.3,2.3,1.2,3.6,1.2z"/>
+<polygon id="Shape_2_" fill="#FFFFFF" fill-opacity="0.7" points="4.7,8.6 15.6,8.6 15.6,7.3 19.3,7.3 19.3,8.6 20.5,8.6 20.5,18.2 
+	4.7,18.2 "/>
+<circle id="Oval_4_" fill="#252522" cx="13.2" cy="13.4" r="3.6"/>
+<circle id="Oval_1_" fill="#FFFFFF" fill-opacity="0.7" cx="13.2" cy="13.4" r="2.4"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam1-l.svg b/data/styles/clear/style-night/symbols/speedcam1-l.svg
index e5e3ed57cf..50858220bc 100644
--- a/data/styles/clear/style-night/symbols/speedcam1-l.svg
+++ b/data/styles/clear/style-night/symbols/speedcam1-l.svg
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 25.9 24.6" enable-background="new 0 0 25.9 24.6" xml:space="preserve">
+	 viewBox="0 0 26 24.5" enable-background="new 0 0 26 24.5" xml:space="preserve">
 <title>speedcam-l</title>
 <desc>Created with Sketch.</desc>
-<path id="Rectangle-346-Copy-3" fill="#4A4A4A" d="M2.5,0h21C24.9,0,26,1.1,26,2.3v19.9c0,1.3-1.1,2.3-2.5,2.3h-21
-	c-1.4,0-2.5-1.1-2.5-2.3V2.3C0,1.1,1.1,0,2.5,0z"/>
-<path id="Rectangle-346" fill="#9B730E" d="M3.7,1.2h18.5c1.4,0,2.5,1.1,2.5,2.3v17.6c0,1.3-1.1,2.3-2.5,2.3H3.7
-	c-1.4,0-2.5-1.1-2.5-2.3V3.5C1.2,2.2,2.3,1.2,3.7,1.2z"/>
 <path display="none" fill="#4A4A4A" d="M-91.3,7.7c-1.5,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6
 	C-88.6,8.9-89.8,7.7-91.3,7.7z M-84.2,5.6h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4H-95c-0.2,0-0.4,0.2-0.4,0.4l-0.2,2.3h-0.5V5.1
 	c0-0.2-0.2-0.3-0.3-0.3h-1.5c-0.2,0-0.3,0.1-0.3,0.3v0.5l0,0c-0.4,0-0.8,0.3-0.8,0.8v8.2c0,0.4,0.3,0.8,0.8,0.8h14.1
@@ -20,9 +16,15 @@
 		c0.7,0,1.3-0.6,1.3-1.3v-8.3c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H10.7z M12.9,962.1c1.9,0,3.4,1.5,3.4,3.4s-1.5,3.4-3.4,3.4
 		s-3.4-1.5-3.4-3.4S11,962.1,12.9,962.1z"/>
 </g>
-<path fill="#4A4A4A" d="M12.9,10.4c-2.8,0-5.1,2.2-5.1,4.9s2.3,4.9,5.1,4.9S18,18,18,15.3C18.1,12.6,15.8,10.4,12.9,10.4z M12.9,18
-	c-1.6,0-2.9-1.2-2.9-2.7s1.3-2.7,2.9-2.7s2.9,1.2,2.9,2.7C15.8,16.8,14.5,18,12.9,18z"/>
-<path fill="#4A4A4A" d="M20.4,7.2h-7.8c0-0.9-0.7-1.6-1.6-1.6H8.3c-0.9,0-1.6,0.7-1.6,1.6H5.5c-0.9,0-1.6,0.7-1.6,1.5v7.1
-	c0,0.8,0.7,1.5,1.6,1.5h2.2c-0.3-0.6-0.4-1.3-0.4-2.1c0-3,2.6-5.4,5.7-5.4s5.7,2.4,5.7,5.4c0,0.7-0.2,1.4-0.4,2.1h2.2
-	c0.9,0,1.6-0.7,1.6-1.5V8.7C22,7.9,21.3,7.2,20.4,7.2z"/>
+<g>
+	<path id="Rectangle-346-Copy-3" fill="#232323" d="M2.5,0h21C24.9,0,26,1.1,26,2.3v19.9c0,1.3-1.1,2.3-2.5,2.3h-21
+		c-1.4,0-2.5-1.1-2.5-2.3V2.3C0,1.1,1.1,0,2.5,0z"/>
+	<path id="Rectangle-346" fill="#9B730E" d="M3.7,1.2h18.5c1.4,0,2.5,1.1,2.5,2.3v17.6c0,1.3-1.1,2.3-2.5,2.3H3.7
+		c-1.4,0-2.5-1.1-2.5-2.3V3.5C1.2,2.2,2.3,1.2,3.7,1.2z"/>
+	<path fill="#232323" d="M12.9,10.4c-2.8,0-5.1,2.2-5.1,4.9s2.3,4.9,5.1,4.9S18,18,18,15.3C18.1,12.6,15.8,10.4,12.9,10.4z M12.9,18
+		c-1.6,0-2.9-1.2-2.9-2.7s1.3-2.7,2.9-2.7s2.9,1.2,2.9,2.7C15.8,16.8,14.5,18,12.9,18z"/>
+	<path fill="#232323" d="M20.4,7.2h-7.8c0-0.9-0.7-1.6-1.6-1.6H8.3c-0.9,0-1.6,0.7-1.6,1.6H5.5c-0.9,0-1.6,0.7-1.6,1.5v7.1
+		c0,0.8,0.7,1.5,1.6,1.5h2.2c-0.3-0.6-0.4-1.3-0.4-2.1c0-3,2.6-5.4,5.7-5.4s5.7,2.4,5.7,5.4c0,0.7-0.2,1.4-0.4,2.1h2.2
+		c0.9,0,1.6-0.7,1.6-1.5V8.7C22,7.9,21.3,7.2,20.4,7.2z"/>
+</g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam1-m.svg b/data/styles/clear/style-night/symbols/speedcam1-m.svg
new file mode 100644
index 0000000000..5201afb574
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/speedcam1-m.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20.8 19.6" enable-background="new 0 0 20.8 19.6" xml:space="preserve">
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<path id="Rectangle-346-Copy-3" fill="#232323" d="M2,0h16.8c1.1,0,2,0.9,2,1.8v15.9c0,1-0.9,1.8-2,1.8H2c-1.1,0-2-0.9-2-1.8V1.8
+	C0,0.9,0.9,0,2,0z"/>
+<path id="Rectangle-346" fill="#9B730E" d="M3,1h14.8c1.1,0,2,0.9,2,1.8v14.1c0,1-0.9,1.8-2,1.8H3c-1.1,0-2-0.9-2-1.8V2.8
+	C1,1.8,1.8,1,3,1z"/>
+<path display="none" fill="#4A4A4A" d="M-93.9,5.2c-1.5,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6
+	C-91.2,6.4-92.4,5.2-93.9,5.2z M-86.8,3.2h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4h-7.5c-0.2,0-0.4,0.2-0.4,0.4l-0.2,2.3h-0.5V2.7
+	c0-0.2-0.2-0.3-0.3-0.3h-1.5c-0.2,0-0.3,0.1-0.3,0.3v0.5l0,0c-0.4,0-0.8,0.3-0.8,0.8v8.2c0,0.4,0.3,0.8,0.8,0.8h14.1
+	c0.4,0,0.8-0.3,0.8-0.8V4C-86,3.5-86.4,3.2-86.8,3.2z M-99.8,6.4c-0.5,0-1-0.4-1-0.9s0.4-0.9,1-0.9c0.5,0,1,0.4,1,0.9
+	S-99.2,6.4-99.8,6.4z M-95.9,1.5h4c0.2,0,0.4,0.2,0.4,0.4c0,0.2-0.2,0.4-0.4,0.4h-4c-0.2,0-0.4-0.2-0.4-0.4
+	C-96.3,1.7-96.1,1.5-95.9,1.5z M-93.9,11.7c-2.1,0-3.8-1.7-3.8-3.8s1.7-3.8,3.8-3.8c2.1,0,3.8,1.7,3.8,3.8
+	C-90,9.9-91.7,11.7-93.9,11.7z"/>
+<g transform="translate(0,-952.36218)" display="none">
+	<path display="inline" fill="#4A4A4A" d="M8.1,955.6l-1,1.9H3.3c-0.7,0-1.3,0.6-1.3,1.3v8.3c0,0.7,0.6,1.3,1.3,1.3h14.1
+		c0.7,0,1.3-0.6,1.3-1.3v-8.3c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H8.1z M10.3,959.6c1.9,0,3.4,1.5,3.4,3.4s-1.5,3.4-3.4,3.4
+		S6.9,965,6.9,963S8.4,959.6,10.3,959.6z"/>
+</g>
+<path fill="#232323" d="M10.3,8.3c-2.2,0-4.1,1.8-4.1,3.9s1.8,3.9,4.1,3.9s4.1-1.8,4.1-3.9C14.5,10.1,12.6,8.3,10.3,8.3z M10.3,14.4
+	c-1.3,0-2.3-1-2.3-2.2s1-2.2,2.3-2.2s2.3,1,2.3,2.2C12.6,13.4,11.6,14.4,10.3,14.4z"/>
+<path fill="#232323" d="M16.3,5.8h-6.2c0-0.7-0.6-1.3-1.3-1.3H6.6C5.9,4.5,5.4,5,5.4,5.8h-1C3.7,5.8,3.1,6.3,3.1,7v5.7
+	c0,0.6,0.6,1.2,1.3,1.2h1.8c-0.2-0.5-0.3-1-0.3-1.7c0-2.4,2.1-4.3,4.6-4.3S15,9.8,15,12.2c0,0.6-0.2,1.1-0.3,1.7h1.8
+	c0.7,0,1.3-0.6,1.3-1.2V7C17.6,6.3,17,5.8,16.3,5.8z"/>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam1-xl.svg b/data/styles/clear/style-night/symbols/speedcam1-xl.svg
new file mode 100644
index 0000000000..cea4700abc
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/speedcam1-xl.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 31.2 29.4" enable-background="new 0 0 31.2 29.4" xml:space="preserve">
+<title>speedcam-l</title>
+<desc>Created with Sketch.</desc>
+<path display="none" fill="#4A4A4A" d="M-88.7,10.1c-1.5,0-2.6,1.2-2.6,2.6s1.2,2.6,2.6,2.6c1.5,0,2.6-1.2,2.6-2.6
+	C-86,11.3-87.2,10.1-88.7,10.1z M-81.6,8h-2.7l-0.2-2.3c0-0.2-0.2-0.4-0.4-0.4h-7.5c-0.2,0-0.4,0.2-0.4,0.4L-93,8h-0.5V7.5
+	c0-0.2-0.2-0.3-0.3-0.3h-1.5c-0.2,0-0.3,0.1-0.3,0.3V8l0,0c-0.4,0-0.8,0.3-0.8,0.8V17c0,0.4,0.3,0.8,0.8,0.8h14.1
+	c0.4,0,0.8-0.3,0.8-0.8V8.9C-80.8,8.4-81.2,8-81.6,8z M-94.6,11.2c-0.5,0-1-0.4-1-0.9c0-0.5,0.4-0.9,1-0.9c0.5,0,1,0.4,1,0.9
+	C-93.6,10.8-94,11.2-94.6,11.2z M-90.7,6.3h4c0.2,0,0.4,0.2,0.4,0.4c0,0.2-0.2,0.4-0.4,0.4h-4c-0.2,0-0.4-0.2-0.4-0.4
+	C-91.1,6.5-90.9,6.3-90.7,6.3z M-88.7,16.5c-2.1,0-3.8-1.7-3.8-3.8s1.7-3.8,3.8-3.8c2.1,0,3.8,1.7,3.8,3.8
+	C-84.8,14.8-86.5,16.5-88.7,16.5z"/>
+<g transform="translate(0,-952.36218)" display="none">
+	<path display="inline" fill="#4A4A4A" d="M13.3,960.5l-1,1.9H8.5c-0.7,0-1.3,0.6-1.3,1.3v8.3c0,0.7,0.6,1.3,1.3,1.3h14.1
+		c0.7,0,1.3-0.6,1.3-1.3v-8.3c0-0.7-0.6-1.3-1.3-1.3h-3.8l-1-1.9H13.3z M15.5,964.5c1.9,0,3.4,1.5,3.4,3.4s-1.5,3.4-3.4,3.4
+		s-3.4-1.5-3.4-3.4S13.6,964.5,15.5,964.5z"/>
+</g>
+<g>
+	<path id="Rectangle-346-Copy-3" fill="#232323" d="M3,0h25.2c1.7,0,3,1.3,3,2.8v23.9c0,1.6-1.3,2.8-3,2.8H3c-1.7,0-3-1.3-3-2.8V2.8
+		C0,1.3,1.3,0,3,0z"/>
+	<path id="Rectangle-346" fill="#9B730E" d="M4.4,1.4h22.2c1.7,0,3,1.3,3,2.8v21.1c0,1.6-1.3,2.8-3,2.8H4.4c-1.7,0-3-1.3-3-2.8V4.2
+		C1.4,2.6,2.8,1.4,4.4,1.4z"/>
+	<path fill="#232323" d="M15.5,12.5c-3.4,0-6.1,2.6-6.1,5.9s2.8,5.9,6.1,5.9s6.1-2.6,6.1-5.9C21.7,15.1,19,12.5,15.5,12.5z
+		 M15.5,21.6c-1.9,0-3.5-1.4-3.5-3.2s1.6-3.2,3.5-3.2s3.5,1.4,3.5,3.2C19,20.2,17.4,21.6,15.5,21.6z"/>
+	<path fill="#232323" d="M24.5,8.6h-9.4c0-1.1-0.8-1.9-1.9-1.9H10C8.9,6.7,8,7.6,8,8.6H6.6c-1.1,0-1.9,0.8-1.9,1.8V19
+		c0,1,0.8,1.8,1.9,1.8h2.6c-0.4-0.7-0.5-1.6-0.5-2.5c0-3.6,3.1-6.5,6.8-6.5s6.8,2.9,6.8,6.5c0,0.8-0.2,1.7-0.5,2.5h2.6
+		c1.1,0,1.9-0.8,1.9-1.8v-8.5C26.4,9.5,25.6,8.6,24.5,8.6z"/>
+</g>
+</svg>
diff --git a/data/styles/clear/style-night/symbols/toll_booth-xl.svg b/data/styles/clear/style-night/symbols/toll_booth-xl.svg
new file mode 100644
index 0000000000..9a694f31ec
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/toll_booth-xl.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Слой_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32.4 32.4" enable-background="new 0 0 32.4 32.4" xml:space="preserve">
+<title>toll_booth-l</title>
+<desc>Created with Sketch.</desc>
+<g id="POI-Night">
+	<g id="Artboard-1" transform="translate(-677.000000, -248.000000)">
+		<g id="toll_booth-l" transform="translate(677.000000, 248.000000)">
+			<path id="Shape" fill="#FFFFFF" fill-opacity="0.1" d="M16.2,32.4C7.3,32.4,0,25.1,0,16.2S7.3,0,16.2,0s16.2,7.3,16.2,16.2
+				S25.1,32.4,16.2,32.4L16.2,32.4z"/>
+			<path id="Shape_1_" fill="#252522" d="M31.2,16.2c0,8.3-6.7,15-15,15s-15-6.7-15-15s6.7-15,15-15S31.2,7.9,31.2,16.2L31.2,16.2z"
+				/>
+			<path id="Shape_2_" fill="#FFFFFF" fill-opacity="0.7" d="M25.8,7.4c-0.2-0.6-0.8-1-1.5-0.8l-11.1,3V9.4c-1.1-0.6-2.3-1-3.6-1
+				S7.1,8.8,6,9.4v2.1l-1.4,0.4l0.6,2.3L6,14v8.8h7.2V12.1l11.7-3.1C25.6,8.7,26,8.1,25.8,7.4L25.8,7.4z M8.4,14.6
+				C7.6,14.6,7,14,7,13.2c0-0.8,0.6-1.4,1.4-1.4s1.4,0.6,1.4,1.4C9.8,14,9.2,14.6,8.4,14.6L8.4,14.6z"/>
+			<path id="Combined-Shape" fill="#FFFFFF" fill-opacity="0.7" d="M22.6,14.5v-1.3h-1.2v1.2c-1,0.1-1.7,0.3-2.3,0.8
+				c-0.6,0.5-0.9,1.2-0.9,2c0,0.9,0.3,1.5,1,2c0.4,0.3,1.1,0.5,2,0.7l0.2,0v2.5c-0.5-0.1-0.9-0.2-1.1-0.5c-0.2-0.2-0.3-0.5-0.4-0.9
+				H18c0,0.9,0.4,1.7,1.1,2.2c0.6,0.4,1.4,0.7,2.3,0.8v1.2h1.2V24c0.9-0.1,1.7-0.3,2.2-0.8c0.7-0.5,1-1.2,1-2.1
+				c0-0.8-0.3-1.4-0.9-1.9c-0.4-0.3-0.9-0.5-1.6-0.7l-0.8-0.2v-2.3c0.1,0,0.2,0.1,0.3,0.1c0.5,0.2,0.7,0.6,0.7,1.2h1.9
+				c0-1-0.4-1.7-1.1-2.2C23.8,14.8,23.2,14.5,22.6,14.5z M22.6,20.2v2.2c0.2,0,0.3-0.1,0.5-0.1c0.6-0.2,0.8-0.5,0.8-1.1
+				c0-0.3-0.1-0.5-0.4-0.7C23.3,20.4,23,20.3,22.6,20.2z M21.4,18.1V16c-0.4,0-0.7,0.1-0.9,0.3c-0.3,0.2-0.5,0.5-0.5,0.8
+				c0,0.3,0.2,0.6,0.5,0.7C20.6,17.9,20.9,18,21.4,18.1z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index b1fee5caf0..07268b5407 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -61,8 +61,6 @@ area[sport=multi],
 area[sport=soccer],
 {z-index: 5;}
 
-/*area[amenity=parking]
-{z-index: 6;}*/
 
 area[natural=wood],
 area[landuse=forest],
@@ -127,7 +125,6 @@ area[landuse=salt_pond],
 area[landuse=basin],
 area[landuse=reservoir],
 area[leisure=swimming_pool],
-area[amenity=fountain],
 {z-index: 100;}
 
 area[waterway=dam],
@@ -333,16 +330,13 @@ area|z11-[natural=wetland],
 area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
 area|z13-[leisure=swimming_pool],
-area|z16-[amenity=fountain],
 {fill-position: background;	fill-opacity: 1;}
 
 line|z10-[waterway=river],
 line|z10-[waterway=riverbank],
-line|z13-[waterway=stream],
-line|z13-[waterway=stream][intermittent=yes],
 line|z13-[waterway=canal],
 line|z16-[waterway=lock],
-{opacity: 1;color: @river;-x-me-line-priority: -15600;}
+{opacity: 1;color: @river;}
 
 /* 6.1 Area water(lake,pond etc.) */
 
@@ -357,7 +351,6 @@ area|z10-[natural=bay],
 area|z12-[landuse=basin],
 area|z12-[landuse=reservoir],
 area|z13-[leisure=swimming_pool],
-area|z16-[amenity=fountain],
 {fill-color: @water;}
 
 area|z11-[natural=wetland],
@@ -381,29 +374,29 @@ line|z11-12[waterway=riverbank],
 line|z13[waterway=river],
 line|z13[waterway=riverbank],
 {width: 1.6;}
-line|z13[waterway=stream],
+/*line|z13[waterway=stream],
 line|z13[waterway=canal],
 {width: 0.7;}
 line|z13[waterway=stream][intermittent=yes]
-{width: 0.7;dashes: 2.7,2.7;}
+{width: 0.7;dashes: 2.7,2.7;}*/
 
 line|z14[waterway=river],
 line|z14[waterway=riverbank],
 {width: 1.8;}
-line|z14[waterway=stream],
+/*line|z14[waterway=stream],
 line|z14[waterway=canal],
 {width: 1;}
 line|z14[waterway=stream][intermittent=yes]
-{width: 1;dashes: 2.7,2.7;}
+{width: 1;dashes: 2.7,2.7;}*/
 
 line|z15-[waterway=river],
 line|z15-[waterway=riverbank],
 {width: 2.2;}
-line|z15-[waterway=stream],
+/*line|z15-[waterway=stream],
 line|z15-[waterway=canal],
 {width: 1.6;}
 line|z15-[waterway=stream][intermittent=yes]
-{width: 1.4;dashes: 4.95,4.95;}
+{width: 1.4;dashes: 4.95,4.95;}*/
 area|z15-[waterway=dam],
 line|z15-[waterway=dam],
 line|z15-[waterway=weir],
@@ -458,14 +451,11 @@ area|z15-[landuse=quarry]
 
 /* 7.2 Hostital */
 
-/*area|z14-[amenity=hospital],
-area|z14-[amenity=doctors]
-{fill-color: @hospital;fill-opacity: 0.25;}*/
+
 
 /* 7.3 University & Sport */
 
-/*area|z14-[amenity=university]
-{fill-color: @unversity;fill-opacity: 0.25;}*/
+
 
 
 area|z15-[leisure=stadium],
@@ -487,22 +477,7 @@ area|z16-[landuse=cemetery]
 
 /* 7.5 Pedestrian areas */
 
-/*area|z14-[highway=pedestrian][area?],
-area|z14-[area:highway=pedestrian],
-area|z14-[highway=footway][area?][!sac_scale],
-area|z14-[area:highway=footway],
-area|z14-[area:highway=living_street],
-area|z16-[public_transport=platform],
-area|z16-[railway=platform],
-area|z16-[amenity=place_of_worship]
-{fill-color: @pedestrian_area;fill-opacity: 1;}
 
-area|z16-[highway=pedestrian][area?],
-area|z16-[area:highway=pedestrian],
-area|z16-[highway=footway][area?][!sac_scale],
-area|z16-[area:highway=footway],
-area|z16-[area:highway=living_street],
-{fill-color: @pedestrian_area_light;fill-opacity: 1;}*/
 
 /* 7.6 Airports */
 
@@ -565,10 +540,6 @@ line|z14-[man_made=cutline]
 
 /* 8.2 Building */
 
-/*area|z14[building],
-area|z14[landuse=garages],
-area|z14[building=train_station],
-{fill-color: @building;fill-opacity: 0.55;casing-width: 1;casing-color: @building_border;}*/
 
 area|z15[building],
 area|z15[landuse=garages],
@@ -598,18 +569,7 @@ area|z18-[building=train_station],
 
 /* 8.3 Barrier */
 
-/*line|z16-[barrier=retaining_wall],
-{fill-color: @fence;opacity: 1;}*/
-
-/*line|z16-[barrier=wall],
-line|z16-[barrier=city_wall],
-line|z16-[barrier=fence],
-line|z16-[barrier=hedge],
-line|z16-[historic=citywalls],
-{fill-color: @fence;opacity: 0.35;}*/
 
-/*line|z16[barrier=retaining_wall],
-{width: 0.7;dashes: 0.12,0.12;opacity: 0.5;}*/
 
 line|z16[barrier=wall],
 line|z16[barrier=city_wall],
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index 75b77a2602..cca86523fb 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -38,7 +38,7 @@ area[building],
 node[building],
 area[addr:housenumber][addr:street],
 node[addr:housenumber][addr:street],
-{z-index: 300;}
+{z-index: 50;}
 
 area[landuse=cemetery],
 node[landuse=cemetery],
@@ -64,7 +64,8 @@ area[landuse=military],
 node[landuse=military]
 {z-index: 1000;}
 
-node[place=state]
+node[place=state],
+node[place=suburb]
 {z-index: 1001;}
 
 node[place=hamlet]
@@ -99,10 +100,9 @@ area[landuse=reservoir],
 area[natural=water],
 line[waterway=river],
 line[waterway=riverbank],
-line[waterway=stream],
 line[waterway=canal],
 line[waterway],
-{z-index: 10000;}
+{z-index: 4500;}
 
 /* 2.CONTINENTS */
 
@@ -365,15 +365,11 @@ node|z13-[place=hamlet]
 /* 4.4 Districts & Small localities */
 
 node|z8-9[place=region],
-node|z13-14[place=suburb],
 node|z13-[place=locality],
-node|z13-16[place=neighbourhood],
 node|z14-[place=farm],
 node|z14-[place=isolated_dwelling],
 {text: name;text-color: @district_label;}
-node|z13-14[place=suburb]::int_name,
 node|z13-[place=locality]::int_name,
-node|z13-16[place=neighbourhood]::int_name,
 node|z14-[place=farm]::int_name,
 node|z14-[place=isolated_dwelling]::int_name,
 {text: int_name;text-color: @district_label;}
@@ -381,24 +377,18 @@ node|z14-[place=isolated_dwelling]::int_name,
 /*node|z10[place=suburb]
 {font-size: 8;}
 node|z11[place=suburb]
-{font-size: 8.5;}
-node|z12[place=suburb]
-{font-size: 9;}
-node|z12[place=suburb]::int_name
-{font-size: 8;}*/
-node|z13-14[place=suburb]
-{font-size: 10;}
-node|z13-14[place=suburb]::int_name
 {font-size: 9;}
+node|z12[place=suburb]
+{font-size: 10;}*/
+
+
 
 node|z8-9[place=region],
 node|z13-[place=locality],
-node|z13-16[place=neighbourhood],
 node|z14-[place=farm],
 node|z14-[place=isolated_dwelling],
 {font-size: 10;}
 node|z13-[place=locality]::int_name,
-node|z13-16[place=neighbourhood]::int_name,
 node|z14-[place=isolated_dwelling]::int_name,
 node|z14-[place=farm]::int_name,
 {font-size: 9;}
@@ -409,22 +399,16 @@ node|z14-[place=farm]::int_name,
 area|z18-[leisure=park][name],
 area|z18-[landuse=forest][name],
 {text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;}
-area|z18-[leisure=park][name]::int_name,
-area|z18-[landuse=forest][name]::int_name,
-{text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;}
+
 
 area|z14-[leisure=park][name],
 area|z14-[landuse=forest][name],
-area|z16-[leisure=garden][name]
 {text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;}
-area|z14-[leisure=park][name]::int_name,
-area|z14-[landuse=forest][name]::int_name,
-area|z16-[leisure=garden][name]::int_name
-{text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
+
 
 area|z14-[leisure=park][name],
 area|z14-[landuse=forest][name]
-{icon-image: park-s.svg;text-offset: 6;font-size: 11;}
+{icon-image: park-m.svg;text-offset: 6;font-size: 11;}
 area|z14-[leisure=park][name]::int_name,
 area|z14-[landuse=forest][name]::int_name
 {text-offset: 6;}
@@ -434,7 +418,7 @@ area|z14-[landuse=forest][!name]
 
 area|z15-[leisure=park][name],
 area|z15-[landuse=forest][name]
-{icon-image: park-m.svg;text-offset: 8;font-size: 12;}
+{icon-image: park-l.svg;text-offset: 8;font-size: 12;}
 area|z15-17[leisure=park][name]::int_name,
 area|z15-17[landuse=forest][name]::int_name,
 area|z16-17[landuse=forest][name]::int_name
@@ -445,54 +429,29 @@ area|z15[landuse=forest][!name]
 
 area|z16[leisure=park][name],
 area|z16[landuse=forest][name]
-{icon-image: park-m.svg;text-offset: 10;font-size: 12.5;}
-area|z16[leisure=garden][name]
-{icon-image: garden-m.svg;text-offset: 10;font-size: 12.5;}
+{icon-image: park-l.svg;text-offset: 10;font-size: 12.5;}
 area|z16[leisure=park][!name],
-area|z16[leisure=garden][!name],
 area|z16[landuse=forest][!name],
 area|z16[leisure=park][!name]::int_name,
-area|z16[leisure=garden][!name]::int_name,
 area|z16[landuse=forest][!name]::int_name
 {}/*check*/
 
 area|z18-[leisure=park][name],
 area|z18-[landuse=forest][name]
-{icon-image: park-l.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: park-xl.svg;text-offset: 10;font-size: 13.5;}
 area|z18-[leisure=park][name],
 area|z18-[landuse=forest][name]
 {}
-/*area|z17[leisure=garden][name]
-{icon-image: garden-l.svg;text-offset: 10;font-size: 12;}
-area|z17[leisure=park][!name],
-area|z17[landuse=forest][!name],
-area|z17[leisure=garden][!name],
-area|z17[leisure=park][!name]::int_name,
-area|z17[leisure=garden][!name]::int_name,
-area|z17[leisure=forest][!name]::int_name
-{}*/
+
 
 area|z18-[leisure=park],
 area|z18-[landuse=forest]
-{icon-image: park-l.svg;text-offset: 10;font-size: 13.5;}
-area|z18-[leisure=garden]
-{icon-image: garden-l.svg;text-offset: 10;font-size: 13.5;}
+{icon-image: park-xl.svg;text-offset: 10;font-size: 13.5;}
 area|z18-[leisure=park]::int_name,
-area|z18-[leisure=garden]::int_name,
 area|z18-[leisure=forest]::int_name
 {text-offset: 18;font-size: 11;}
 
-/*area|z15-[landuse=farmland],
-area|z15-[landuse=allotments],
-area|z15-[landuse=recreation_ground],
-area|z15-[landuse=orchard],
-area|z15-[landuse=vineyard],
-node|z17-[landuse=farmland],
-node|z17-[landuse=allotments],
-node|z17-[landuse=recreation_ground],
-node|z17-[landuse=orchard],
-node|z17-[landuse=vineyard],
-{text: name;font-size: 10;text-color: @poi_label;}*/
+
 
 /* 5.2 Beach & Glacier */
 
@@ -508,19 +467,20 @@ node|z1-[place=ocean],
 node|z4-[place=sea],
 area|z10-[natural=lake][bbox_area>=4000000],
 area|z10-[landuse=reservoir][bbox_area>=4000000],
-area|z10-[natural=water][bbox_area>=4000000],
+area|z10-[natural=water][bbox_area>=80000000],
 line|z11-[waterway=river],
 line|z11-[waterway=riverbank],
-line|z13-[waterway=stream],
 line|z13-[waterway=canal],
-node|z14-[natural=water],
+node|z14-[natural=water][bbox_area>=1000000],
 node|z14-[natural=bay],
-area|z14-[natural=water][bbox_area>=70000],
+area|z14-[natural=water][bbox_area>=1000000],
 area|z14-[natural=bay],
 node|z16-[natural=wetland],
 area|z16-[natural=wetland],
 {text:name;text-color: @water_label;}
 
+
+
 /*6.1 Area water(ocean,sea,lake,pond etc.)*/
 
 node|z1-2[place=ocean]
@@ -566,15 +526,12 @@ line[waterway][tunnel]
 
 line|z11-14[waterway=river],
 line|z11-14[waterway=riverbank],
-line|z13-14[waterway=stream],
 line|z13-14[waterway=canal]
 {font-size: 9.5;text:name;text-color: @water_label;}
-line|z15-17[waterway=stream],
 line|z15-17[waterway=canal],
 {font-size: 10;text:name;text-color: @water_label;}
 line|z15-[waterway=river],
 line|z15-[waterway=riverbank],
-line|z18-[waterway=stream],
 line|z18-[waterway=canal],
 {font-size: 11;text:name;text-color: @water_label;}
 
@@ -583,9 +540,6 @@ line|z18-[waterway=canal],
 /*7.2 Hostital 7.3 University & Sport */
 
 /* 	7.1 Industrial */
-/*area|z15-[landuse=industrial],
-node|z15-[landuse=industrial],
-{text: name;font-size: 10;text-color: @city_label;text-position: center;}*/
 
 
 
@@ -598,42 +552,19 @@ node|z15-[landuse=quarry],
 
 /* 	7.4 Cemetry */
 
-/*area|z15-[landuse=cemetery],
-node|z15-[landuse=cemetery],
-area|z17-[amenity=grave_yard],
-node|z17-[amenity=grave_yard],
-{text: name;text-offset: 10;font-size: 10;text-color: @poi_label;}
 
-area|z15-16[landuse=cemetery]
-{icon-image: cemetery-m.svg;}
-area|z17-[landuse=cemetery],
-node|z17-[landuse=cemetery],
-area|z17-[amenity=grave_yard],
-node|z17-[amenity=grave_yard],
-{icon-image: cemetery-l.svg;}*/
 
 /* 	7.5 Pedestrian areas */
 
-/*area|z15-[highway=pedestrian][area?],
-area|z15-[area:highway=pedestrian],
-area|z15-[highway=footway][area?][!sac_scale],
-area|z15-[area:highway=footway],
-{text: name;font-size: 11;text-color: @city_label;text-position: center;}*/
+
 
 /* 	7.6 Military */
 
-/*area|z16[landuse=military],
-node|z16[landuse=military]
-{icon-image: military-m.svg;icon-min-distance: 10;}
 
-area|z17-[landuse=military],
-node|z17-[landuse=military]
-{icon-image: military-l.svg;text-offset: 10;text: name;font-size: 10;text-color: @poi_label;}*/
 
 /* 	7.7 Commercial */
 
-/*area|z17-[landuse=commercial]
-{text: name;font-size: 10;text-color: @poi_label;text-position: center;}*/
+
 
 /* 8.BUILDINGS */
 
@@ -656,19 +587,7 @@ node|z18-[entrance]
 {text-color: @building_label;}
 
 /* 8.1 Pier */
-/*area|z15-[waterway=dam],
-line|z15-[waterway=dam],
-line|z15-[waterway=weir],
-node|z15-[waterway=weir]
-{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;}*/
-
-/*area|z17-[man_made=pier],
-area|z17-[man_made=breakwater],
-line|z17-[man_made=pier],
-line|z17-[man_made=breakwater],
-node|z17-[man_made=pier],
-node|z17-[man_made=breakwater]
-{text: name;font-size: 10;text-color:@poi_label;fill-opacity: 1;-x-me-area-priority:16000;}*/
+
 
 /*	8.2 Building */
 
@@ -677,13 +596,13 @@ area|z16[building],
 node|z16[building],
 area|z16[addr:housenumber][addr:street],
 node|z16[addr:housenumber][addr:street],
-{text:"addr:housename";font-size: 11.5;text-color: @housename;}
+{text:"addr:housename";font-size: 12.5;text-color: @housename;}
 
 area|z17[building],
 node|z17[building],
 area|z17[addr:housenumber][addr:street],
 node|z17[addr:housenumber][addr:street]
-{font-size: 12.5;}
+{font-size: 13;}
 area|z17[building]::int_name,
 node|z17[building]::int_name,
 area|z17[addr:housenumber][addr:street]::int_name,
@@ -694,28 +613,25 @@ area|z18[building],
 node|z18[building],
 area|z18[addr:housenumber][addr:street],
 node|z18[addr:housenumber][addr:street]
-{font-size: 13.5;}
+{font-size: 14;}
 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.5;}
+{font-size: 13;}
 
 area|z19[building],
 node|z19[building],
 area|z19[addr:housenumber][addr:street],
 node|z19[addr:housenumber][addr:street]
-{font-size: 14;}
+{font-size: 14.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;}
 
-/*node|z18-[entrance]
-{icon-image: entrance-s.svg;font-size: 10;text: ref;text-offset-x: 10;}
-node|z19-[entrance]::flats
-{text: "addr:flats";font-size: 12;text-offset-y: 10;}*/
+
 
 /* 8.3 Airports */
 area|z14-[aeroway=terminal]
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 927be87af1..9bacb6bb4e 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -44,237 +44,12 @@ node[amenity=marketplace],
 area[amenity=marketplace]
 {z-index: 6;}
 
-/*node|z17-[leisure=golf_course],
-area|z17-[leisure=golf_course]
-{z-index: 50;}*/
-/* нельзя другой z-inex^иначе пропадают все объекты на поле */
-
-/*node[amenity=fountain],
-area[amenity=fountain]
-{z-index: 2000;}
-node[natural=spring],
-area[natural=spring],
-node[natural=tree],
-node[amenity=drinking_water],
-area[amenity=drinking_water],
-node[amenity=water_point],
-area[amenity=water_point],
-node[amenity=bench],
-node[amenity=waste_basket],
-node[amenity=waste_disposal],
-area[amenity=waste_disposal],
-node[man_made=survey_point]
-{z-index: 2100;}*/
-
-/*node[natural=cave_entrance],
-area[natural=cave_entrance],
-node[waterway=waterfall],
-area[waterway=waterfall],
-node[natural=volcano],
-area[natural=volcano],
-node[natural=peak],
-area[natural=peak],
-node[tourism=information],
-node[historic=wayside_shrine],
-area[historic=wayside_shrine],
-node[historic=tomb],
-area[historic=tomb],
-node[historic=wayside_cross],
-area[historic=wayside_cross],
-node[historic=boundary_stone],
-area[historic=boundary_stone],
-node[amenity=post_box],
-area[amenity=post_box],
-node[amenity=telephone],
-node[emergency=phone],
-node[amenity=recycling],
-area[amenity=recycling],
-node[amenity=vending_machine],
-area[amenity=vending_machine],
-node[aeroway=gate],
-area[aeroway=gate],
-node[amenity=hunting_stand],
-area[amenity=hunting_stand],
-node[man_made=chimney],
-area[man_made=chimney],
-node[vending=parking_tickets],
-area[vending=parking_tickets]
-{z-index: 2200;}*/
-
-/*node[natural=beach],
-area[natural=beach],
-node[shop],
-area[shop],
-node[amenity=marketplace],
-area[amenity=marketplace],
-node[amenity=veterinary],
-area[amenity=veterinary],
-node[sport],
-area[sport],
-node[leisure=playground],
-node[historic=ship],
-area[historic=ship],
-node[tourism=caravan_site],
-area[tourism=caravan_site],
-node[amenity=bicycle_parking],
-area[amenity=bicycle_parking],
-node[amenity=dentist],
-area[amenity=dentist],
-node[leisure=water_park],
-area[leisure=water_park],
-node[amenity=taxi],
-area[amenity=taxi],
-node[barrier=lift_gate],
-area[barrier=lift_gate],
-node[leisure=dog_park],
-area[leisure=dog_park],
-node[leisure=water_park],
-area[leisure=water_park],
-node[man_made=windmill],
-area[man_made=windmill],
-node[amenity=casino],
-area[amenity=casino],
-node[amenity=kindergarten],
-area[amenity=kindergarten],
-node[amenity=childcare],
-area[amenity=childcare],
-node[amenity=post_office],
-node[amenity=car_sharing],
-area[amenity=car_sharing],
-node[power=station],
-area[power=station],
-node[power=substation],
-area[power=substation],
-node|z18-[tourism],
-area|z18-[tourism],
-node|z18-[craft],
-area|z18-[craft],
-node[amenity=bbq],
-area[amenity=bbq],
-{z-index: 2400;}*/
-
-/*node|z18-[sport=archery],
-area|z18-[sport=archery],
-node|z18-[sport=shooting],
-area|z18-[sport=shooting],
-node|z18-[sport=australian_football],
-area|z18-[sport=australian_football],
-node|z18-[sport=bowls],
-area|z18-[sport=bowls],
-node|z18-[sport=cricket],
-area|z18-[sport=cricket],
-node|z18-[sport=curling],
-area|z18-[sport=curling],
-node|z18-[sport=diving],
-area|z18-[sport=diving],
-node|z18-[sport=scuba_diving],
-area|z18-[sport=scuba_diving]
-{z-index: 2440;}
-
-node|z18-[sport=swimming],
-node|z18-[sport=baseball],
-node|z18-[sport=basketball],
-node|z18-[sport=american_football],
-node|z18-[sport=athletics],
-node|z18-[sport=golf],
-node|z18-[sport=gymnastics]
-{z-index: 2460;}*/
-
-/*node[landuse=landfill],
-area[landuse=landfill],
-node|z17-[sport=tennis],
-node|z17-[leisure=skiing],
-node[tourism=camp_site],
-area[tourism=camp_site],
-node[tourism=picnic_site],
-area[tourism=picnic_site],
-node[amenity=shelter],
-area[amenity=shelter],
-node[highway=speed_camera],
-node[amenity=school],
-area[amenity=school],
-node[amenity=bicycle_rental],
-area[amenity=bicycle_rental],
-node[amenity=car_wash],
-area[amenity=car_wash],
-node[amenity=car_rental],
-area[amenity=car_rental],
-node|z18-[office],
-area|z18-[office],
-node[amenity=nightclub],
-area[amenity=nightclub],
-node[amenity=fire_station],
-area[amenity=fire_station],
-node[amenity=toilets],
-area[amenity=toilets],
-node[amenity=atm],
-area[amenity=atm],
-node[amenity=bureau_de_change],
-node[amenity=library],
-{z-index: 2500;}*/
 
-node[amenity=fuel],
-area[amenity=fuel],
-node[amenity=charging_station],
-area[amenity=charging_station]
-{z-index: 2590;}
-
-/*node[aerialway=station],
-node[aerialway=cable_car],
-node[aerialway=chair_lift],
-node[aerialway=gondola],
-node[aerialway=mixed_lift],
-node[aerialway=drag_lift],
-node[aerialway=j-bar],
-node[aerialway=t-bar],
-node[aerialway=magic_carpet],
-node[aerialway=platter],
-node[aerialway=rope_tow],
-node[railway=level_crossing],
-node[shop=supermarket],
-area[shop=supermarket],
-node[shop=car_repair][service=tyres],
-area[shop=car_repair][service=tyres],
-node[amenity=clinic],
-area[amenity=clinic],
-node[amenity=doctors],
-area[amenity=doctors],
-node[leisure=swimming_pool],
-area[leisure=swimming_pool],
-area[aeroway=heliport],
-area[aeroway=helipad],
-node[aeroway=heliport],
-node[aeroway=helipad],
-node[historic=archaeological_site],
-area[historic=archaeological_site],
-node[amenity=bank],
-area[amenity=bank],
-node[amenity=courthouse],
-area[amenity=courthouse],
-node[amenity=college],
-area[amenity=college],
-node[amenity=cinema],
-area[amenity=cinema],
-node[amenity=police],
-area[amenity=police],
-node[amenity=embassy],
-area[amenity=embassy],
-node[office=lawyer],
-area[office=lawyer]
-{z-index: 2600;}*/
 
 node[shop=supermarket],
 area[shop=supermarket],
 {z-index: 2600;}
 
-/*node[landuse=forest],
-area[landuse=forest],
-node[landuse=forest][boundary=national_park],
-area[landuse=forest][boundary=national_park],
-node[amenity=place_of_worship],
-area[amenity=place_of_worship],
-{z-index: 2650;}*/
-
 
 node[boundary=national_park],
 area[boundary=national_park],
@@ -305,43 +80,10 @@ node[highway=bus_stop],
 area[highway=bus_stop],
 node[amenity=bus_station],
 area[amenity=bus_station],
-node[amenity=ferry_terminal],
 node[public_transport=station],
 area[public_transport=station],
 {z-index: 2800;}
 
-/*node[historic=monument],
-area[historic=monument],
-node[historic=memorial],
-area[historic=memorial]
-{z-index: 2800;}*/
-
-/*node[tourism=motel],
-area[tourism=motel],
-node[tourism=apartment],
-area[tourism=apartment]
-{z-index: 2812;}
-
-node[tourism=alpine_hut],
-area[tourism=alpine_hut],
-node[tourism=chalet],
-area[tourism=chalet],
-node[tourism=resort],
-area[tourism=resort]
-{z-index: 2814;}
-
-node[tourism=guest_house],
-area[tourism=guest_house]
-{z-index: 2816;}
-
-node[tourism=hostel],
-area[tourism=hostel]
-{z-index: 2818;}
-
-node[tourism=hotel],
-area[tourism=hotel],
-{z-index: 2820;}*/
-
 
 node[amenity=car_wash],
 area[amenity=car_wash],
@@ -351,34 +93,6 @@ node[shop=car_repair][service=tyres],
 area[shop=car_repair][service=tyres],
 {z-index: 2832;}
 
-/*node[tourism=attraction],
-area[tourism=attraction],
-node[amenity=community_centre],
-area[amenity=community_centre],
-node[tourism=artwork]
-{z-index: 2840;}
-node[tourism=attraction],
-area[tourism=attraction]
-{z-index: 2842;}
-node[tourism=gallery]
-{z-index: 2844;}
-node[tourism=museum],
-area[tourism=museum],
-{z-index: 2846;}
-node[leisure=stadium],
-area[leisure=stadium]
-{z-index: 2848;}
-node[tourism=viewpoint]
-{z-index: 2850;}
-node[tourism=zoo],
-area[tourism=zoo]
-{z-index: 2860;}*/
-
-/*node[historic=fort],
-area[historic=fort],
-node[historic=castle],
-area[historic=castle],
-{z-index: 2890;}*/
 
 node[amenity=hospital],
 node[building=hospital],
@@ -388,9 +102,6 @@ node[building=university],
 area[building=university],
 {z-index: 2900;}
 
-/*node[shop=mall],
-area[shop=mall]
-{z-index: 2930;}*/
 
 node[railway=halt],
 node[barrier=border_control],
@@ -412,43 +123,24 @@ area[aeroway=airport],
 area[aeroway=aerodrome],
 node[aeroway=airport],
 node[aeroway=aerodrome],
-node|z16[amenity=parking],
-area|z16[amenity=parking],
+node[amenity=parking],
+area[amenity=parking],
 node[railway=station][transport=subway],
 {z-index: 3100;}
 
-area[olympics=transport_airport],
-node[olympics=transport_airport],
-area[olympics=transport_railway],
-node[olympics=transport_railway],
-area[olympics=transport_cable],
-node[olympics=transport_cable],
-node[olympics=transport_bus],
-area[olympics=transport_bus],
-node[olympics=transport_boat],
-node[olympics=transport_tram],
-area[olympics=transport_tram],
-node[olympics=transport_subway],
+node[amenity=fuel],
+area[amenity=fuel],
+node[amenity=charging_station],
+area[amenity=charging_station]
+{z-index: 3590;}
+
+
 area[building=train_station],
 node[highway=speed_camera],
 {z-index: 8000;}
 
 /* 2. NATURAL */
 
-/*node|z10-[natural=volcano],
-area|z10-[natural=volcano],
-node|z11-[natural=cave_entrance],
-area|z11-[natural=cave_entrance],
-node|z11-[waterway=waterfall],
-area|z11-[waterway=waterfall],
-node|z13-[natural=peak],
-area|z13-[natural=peak],
-node|z14-[natural=spring],
-area|z14-[natural=spring],
-node|z16-[natural=beach],
-area|z16-[natural=beach],
-{text: name;text-color: @poi_label;text-position: center;text-offset: 5;}*/
-
 node|z12-[landuse=forest][boundary=national_park],
 area|z12-[landuse=forest][boundary=national_park],
 node|z12-[boundary=national_park],
@@ -457,147 +149,52 @@ node|z12-[leisure=nature_reserve],
 area|z12-[leisure=nature_reserve]
 {text: name;text-color: @park_label;text-halo-opacity: 0.75;text-halo-color: @label_halo_light;text-halo-radius:0.4;}
 
-/*node|z11[natural=cave_entrance],
-area|z11[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;text-offset: 8;font-size: 10;}
-node|z15-[natural=cave_entrance],
-area|z15-[natural=cave_entrance]
-{icon-image: cave-m.svg;text-offset: 10;font-size: 10;}
-node|z17-[natural=cave_entrance],
-area|z17-[natural=cave_entrance]
-{icon-image: cave-l.svg;text-offset: 10;font-size: 11;}
-
-node|z11[waterway=waterfall],
-area|z11[waterway=waterfall]
-{icon-image: waterfall-s.svg;icon-min-distance: 15;}
-node|z12-[waterway=waterfall],
-area|z12-[waterway=waterfall]
-{icon-image: waterfall-s.svg;text-offset: 10;font-size: 10;}
-node|z15-[waterway=waterfall],
-area|z15-[waterway=waterfall]
-{icon-image: waterfall-m.svg;text-offset: 8;font-size: 10;}
-node|z17-[waterway=waterfall],
-area|z17-[waterway=waterfall]
-{icon-image: waterfall-l.svg;text-offset: 10;font-size: 10;}
-node|z10-[natural=volcano],
-area|z10-[natural=volcano]
-{icon-image: volcano-s.svg;text-offset: 10;font-size: 10;}
-node|z15-[natural=volcano],
-area|z15-[natural=volcano]
-{icon-image: volcano-m.svg;text-offset: 8;font-size: 10;}
-node|z17-[natural=volcano],
-area|z17-[natural=volcano]
-{icon-image: volcano-l.svg;text-offset: 10;font-size: 10;}
-
-node|z12[natural=peak][name],
-area|z12[natural=peak][name],
-{icon-image: peakt-s.svg;icon-min-distance: 10;text-offset: 5;text: name;text-color: @poi_label;text-position: center;}
-node|z12-14[natural=peak][!name],
-node|z12-14[natural=bare_rock][!name],
-node|z12-14[natural=rock][!name],
-area|z12-14[natural=peak][!name],
-area|z12-14[natural=bare_rock][!name],
-area|z12-14[natural=rock][!name]
-{font-size: 0;}
-node|z13[natural=peak][name],
-area|z13[natural=peak][name],
-{icon-image: peakt-s.svg;text-offset: 5;font-size: 9;}
-node|z14[natural=peak][name],
-area|z14[natural=peak][name],
-{icon-image: peakt-s.svg;text-offset: 5;font-size: 10;}
-node|z15-16[natural=peak],
-node|z15-16[natural=bare_rock],
-node|z15-16[natural=rock],
-area|z15-16[natural=peak],
-area|z15-16[natural=bare_rock],
-area|z15-16[natural=rock]
-{icon-image: peakt-m.svg;text-offset: 5;font-size: 10;}
-node|z17-[natural=peak],
-node|z17-[natural=bare_rock],
-node|z17-[natural=rock],
-area|z17-[natural=peak],
-area|z17-[natural=bare_rock],
-area|z17-[natural=rock]
-{icon-image: peakt-l.svg;text-offset: 6;font-size: 11;}
-
-node|z16[natural=beach],
-area|z16[natural=beach]
-{icon-image: beach-m.svg;}
-node|z17-[natural=beach],
-area|z17-[natural=beach]
-{icon-image: beach-l.svg;font-size: 11;}*/
-
-node|z11[landuse=forest][boundary=national_park],
+
+
+/*node|z11[landuse=forest][boundary=national_park],
 area|z11[landuse=forest][boundary=national_park],
 node|z11[boundary=national_park],
 area|z11[boundary=national_park],
 node|z11[leisure=nature_reserve],
 area|z11[leisure=nature_reserve]
-{icon-image: nparkf-s.svg;icon-min-distance: 20;}
+{icon-image: nparkf-s.svg;icon-min-distance: 20;}*/
 node|z12-13[landuse=forest][boundary=national_park],
 area|z12-13[landuse=forest][boundary=national_park],
 node|z12-13[boundary=national_park],
 area|z12-13[boundary=national_park],
 node|z12-13[leisure=nature_reserve],
 area|z12-13[leisure=nature_reserve]
-{icon-image: nparkf-s.svg;text-offset: 6;font-size: 10;icon-min-distance: 12;}
+{icon-image: nparkf-s.svg;text-offset: 6;font-size: 11;icon-min-distance: 12;}
 node|z14[landuse=forest][boundary=national_park],
 area|z14[landuse=forest][boundary=national_park],
 node|z14[boundary=national_park],
 area|z14[boundary=national_park],
 node|z14[leisure=nature_reserve],
 area|z14[leisure=nature_reserve]
-{icon-image: nparkf-s.svg;text-offset: 8;font-size: 11;}
+{icon-image: nparkf-m.svg;text-offset: 8;font-size: 12.25;}
 node|z15-16[landuse=forest][boundary=national_park],
 area|z15-16[landuse=forest][boundary=national_park],
 node|z15-16[boundary=national_park],
 area|z15-16[boundary=national_park],
 node|z15-16[leisure=nature_reserve],
 area|z15-16[leisure=nature_reserve]
-{icon-image: nparkf-m.svg;text-offset: 10;font-size: 11;text-halo-opacity: 0.85;}
+{icon-image: nparkf-m.svg;text-offset: 10;font-size: 12.5;text-halo-opacity: 0.85;}
 node|z17-[landuse=forest][boundary=national_park],
 area|z17-[landuse=forest][boundary=national_park],
 node|z17-[boundary=national_park],
 area|z17-[boundary=national_park],
 node|z17-[leisure=nature_reserve],
 area|z17-[leisure=nature_reserve]
-{icon-image: nparkf-m.svg;text-offset: 10;font-size: 11;text-halo-opacity: 0.9;}
-
-/*node|z14[natural=spring],
-area|z14[natural=spring]
-{icon-image: drinking-water-s.svg;text-offset:6;font-size: 10;icon-min-distance: 24;}
-node|z15-16[natural=spring],
-area|z15-16[natural=spring]
-{icon-image: drinking-water-m.svg;text-offset:8;font-size: 10;icon-min-distance: 24;}
-node|z17-[natural=spring],
-area|z17-[natural=spring]
-{icon-image: drinking-water-l.svg;text-offset:8;font-size: 10;icon-min-distance: 24;}
-
-node|z18-[natural=tree]
-{icon-image: tree-s.svg;}*/
-
-/*node|z15-16[amenity=drinking_water],
-area|z15-16[amenity=drinking_water],
-node|z15-16[amenity=water_point] ,
-area|z15-16[amenity=water_point]
-{icon-image: drinking-water-m.svg;icon-min-distance: 36;}
-node|z17-[amenity=drinking_water],
-area|z17-[amenity=drinking_water],
-node|z17-[amenity=water_point],
-area|z17-[amenity=water_point],
-{icon-image: drinking-water-l.svg;}*/
+{icon-image: nparkf-l.svg;text-offset: 10;font-size: 12.75;text-halo-opacity: 0.9;}
+
+
 
 /* 3. TRANSPORT */
-/*node|z17-[highway=bus_stop],
-area|z17-[highway=bus_stop],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}*/
+
 area|z11-[building=train_station],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light; icon-min-distance: 2; -x-me-icon-priority: 9100;}
+{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light; icon-min-distance: 2; -x-me-icon-priority: 19100;}
 area|z11-[building=train_station]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;icon-min-distance: 2; -x-me-icon-priority: 9100;}
+{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;icon-min-distance: 2; -x-me-icon-priority: 19100;}
 
 node|z13-[railway=station],
 node|z14-[railway=halt],
@@ -609,12 +206,6 @@ node|z14-15[railway=station][transport=subway]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 
-/*node|z17-[railway=tram_stop],
-area|z17-[railway=tram_stop]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
-node|z17-[railway=tram_stop]::int_name,
-area|z17-[railway=tram_stop]::int_name
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}*/
 
 
 node|z12-15[railway=station][transport=subway][city=moscow],
@@ -625,8 +216,6 @@ node|z12-15[railway=station][transport=subway][city=spb]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z17-[public_transport=station],
 area|z17-[public_transport=station],
-node|z14-[amenity=bus_station],
-area|z14-[amenity=bus_station],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
 node|z17-[public_transport=station]::int_name,
 area|z17-[public_transport=station]::int_name
@@ -636,18 +225,6 @@ area|z10-[aeroway=airport],
 area|z10-[aeroway=aerodrome],
 node|z10-[aeroway=airport],
 node|z10-[aeroway=aerodrome],
-node|z15-[aerialway=station],
-node|z15-[aerialway=cable_car],
-node|z15-[aerialway=chair_lift],
-node|z15-[aerialway=gondola],
-node|z15-[aerialway=mixed_lift],
-node|z15-[aerialway=drag_lift],
-node|z15-[aerialway=j-bar],
-node|z15-[aerialway=t-bar],
-node|z15-[aerialway=magic_carpet],
-node|z15-[aerialway=platter],
-node|z15-[aerialway=rope_tow],
-node|z16-[amenity=ferry_terminal],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 area|z12-[aeroway=airport]::int_name,
 area|z12-[aeroway=aerodrome]::int_name,
@@ -680,37 +257,12 @@ node|z16-[railway=subway_entrance][city=moscow]::int_name,
 node|z17-[railway=tram_stop]::int_name,
 area|z17-[railway=tram_stop]::int_name
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
-/*node|z17-[highway=bus_stop],
-area|z17-[highway=bus_stop],
-node|z17-[public_transport=station],
-area|z17-[public_transport=station],
-node|z14-[amenity=bus_station],
-area|z14-[amenity=bus_station],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
-node|z17-[highway=bus_stop]::int_name,
-area|z17-[highway=bus_stop]::int_name,
-node|z17-[public_transport=station]::int_name,
-area|z17-[public_transport=station]::int_name,
-node|z14-[amenity=bus_station]::int_name,
-area|z14-[amenity=bus_station]::int_name
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}*/
+
 
 area|z10-[aeroway=airport],
 area|z10-[aeroway=aerodrome],
 node|z10-[aeroway=airport],
 node|z10-[aeroway=aerodrome],
-node|z15-[aerialway=station],
-node|z15-[aerialway=cable_car],
-node|z15-[aerialway=chair_lift],
-node|z15-[aerialway=gondola],
-node|z15-[aerialway=mixed_lift],
-node|z15-[aerialway=drag_lift],
-node|z15-[aerialway=j-bar],
-node|z15-[aerialway=t-bar],
-node|z15-[aerialway=magic_carpet],
-node|z15-[aerialway=platter],
-node|z15-[aerialway=rope_tow],
-node|z16-[amenity=ferry_terminal],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 area|z12-[aeroway=airport]::int_name,
 area|z12-[aeroway=aerodrome]::int_name,
@@ -722,22 +274,17 @@ node|z12-[aeroway=aerodrome]::int_name,
 
 /*check offset int_name*/
 
-/*node|z11[railway=halt]
-{icon-image: train-s.svg;icon-min-distance: 10;}
-node|z12[railway=halt]
-{icon-image: train-s.svg;text-offset: 6;font-size: 9;}
-node|z12[railway=halt]::int_name
-{text-offset: 6;font-size: 8;}*/
+
 node|z13[railway=station],
 area|z13[building=train_station],
-{icon-image: train-s.svg;text-offset: 6;font-size: 10;}
+{icon-image: train-m.svg;text-offset: 6;font-size: 11.75;}
 node|z13[railway=station]::int_name,
 area|z13[building=train_station]::int_name,
 {text-offset: 6;font-size: 9;}
 node|z14[railway=station],
 node|z14[railway=halt],
 area|z14[building=train_station],
-{icon-image: train-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.7;}
+{icon-image: train-m.svg;text-offset: 6;font-size: 12.25;text-halo-opacity: 0.7;}
 node|z14[railway=station]::int_name,
 node|z14[railway=halt]::int_name,
 area|z14[building=train_station]::int_name,
@@ -745,7 +292,7 @@ area|z14[building=train_station]::int_name,
 node|z15[railway=station],
 node|z15[railway=halt],
 area|z15[building=train_station],
-{icon-image: train-m.svg;text-offset: 8;font-size: 12;text-halo-opacity: 0.8;}
+{icon-image: train-m.svg;text-offset: 8;font-size: 12.5;text-halo-opacity: 0.8;}
 node|z15[railway=station]::int_name,
 node|z15[railway=halt]::int_name,
 area|z15[building=train_station]::int_name,
@@ -753,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-m.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;}
+{icon-image: train-l.svg;text-offset: 8;font-size: 12.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,
@@ -770,265 +317,197 @@ area|z17-[building=train_station]::int_name,
 /* 3.2 Subway Station */
 
 node|z13[railway=station][transport=subway]
-{icon-image: subway-s.svg;icon-min-distance: 1;}
+{icon-image: subway-m.svg;icon-min-distance: 1;font-size: 11.75;}
 node|z14[railway=station][transport=subway]
-{icon-image: subway-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.7;icon-min-distance: 1;}
+{icon-image: subway-m.svg;text-offset: 6;font-size: 12.25;text-halo-opacity: 0.7;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway]::int_name
 {text-offset: 7;font-size: 9;text-halo-opacity: 0.7;icon-min-distance: 1;}
 node|z15[railway=station][transport=subway]
-{icon-image: subway-m.svg;text-offset: 7;font-size: 12;text-halo-opacity: 0.8;}
+{icon-image: subway-m.svg;text-offset: 7;font-size: 12.5;text-halo-opacity: 0.8;}
 node|z15[railway=station][transport=subway]::int_name
 {text-offset: 7;font-size: 10;text-halo-opacity: 0.8;} /*check*/
 node|z16-[railway=station][transport=subway]
-{icon-image: zero-icon.svg;font-size: 9;text-opacity: 0;text-halo-opacity: 0}
+{icon-image: zero-icon.svg;font-size: 12.75;text-opacity: 0;text-halo-opacity: 0}
 node|z16-[railway=station][transport=subway]::int_name
 {font-size: 9;text-opacity: 0;text-halo-opacity: 0} /*check*/
-/*node|z17-[railway=station][transport=subway]
-{icon-image: subway-l.svg;text-offset: 7;font-size: 13;text-halo-opacity: 0.9;}
-node|z17-[railway=station][transport=subway]::int_name
-{text-offset: 7;font-size: 11;text-halo-opacity: 0.9;} /*check*/
+
 
 node|z17-[railway=subway_entrance]
-{icon-image: subway-entrance-m.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.9;}
+{icon-image: subway-entrance-l.svg;text-offset: 8;font-size: 13.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*/
 
 /* 3.2.1 Moscow Subway Station */
 
-node|z11[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-s.svg;icon-min-distance: 1;}
-node|z12-13[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-s.svg;text-offset: 5;font-size: 10;text-halo-opacity: 0.7;icon-min-distance: 1;}
-node|z12-13[railway=station][transport=subway][city=moscow]::int_name
+/*node|z11[railway=station][transport=subway][city=moscow]
+{icon-image: subway-moscow-s.svg;icon-min-distance: 1;}*/
+node|z12[railway=station][transport=subway][city=moscow]
+{icon-image: subway-moscow-s.svg;text-offset: 5;font-size: 11;text-halo-opacity: 0.7;icon-min-distance: 1;}
+node|z12[railway=station][transport=subway][city=moscow]::int_name
+{text-offset: 20;font-size: 9;text-halo-opacity: 0.7;}
+node|z13[railway=station][transport=subway][city=moscow]
+{icon-image: subway-moscow-m.svg;text-offset: 5;font-size: 11.75;text-halo-opacity: 0.7;icon-min-distance: 1;}
+node|z13[railway=station][transport=subway][city=moscow]::int_name
 {text-offset: 20;font-size: 9;text-halo-opacity: 0.7;}
 node|z14[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-s.svg;text-offset: 8;font-size: 11;}
+{icon-image: subway-moscow-m.svg;text-offset: 8;font-size: 12.25;}
 node|z14[railway=station][transport=subway][city=moscow]::int_name
 {text-offset: 24;font-size: 9;}
 node|z15[railway=station][transport=subway][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 9;font-size: 12;}
+{icon-image: subway-moscow-m.svg;text-offset: 9;font-size: 12.5;}
 node|z15[railway=station][transport=subway][city=moscow]::int_name
 {text-offset: 24;font-size: 10;}
 node|z16-[railway=station][transport=subway][city=moscow]
-{icon-image: zero-icon.svg;font-size: 9;text-opacity: 0;text-halo-opacity: 0}
+{icon-image: zero-icon.svg;font-size: 12.75;text-opacity: 0;text-halo-opacity: 0}
 node|z16-[railway=station][transport=subway][city=moscow]::int_name
 {}
 
 
-/*
-node[railway=station][transport=subway][city=moscow]check
-{icon-image: subway-moscow-m.svg;text-offset: 9;font-size: 10;text-color: @district_label;text-halo-radius: 0;}
-node[railway=station][transport=subway][city=moscow]::int_name
-{text-offset: 24;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check
-*/
+
 
 /* Moscow Subway Station entrance */
 node|z16[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 10;font-size: 12;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;}
 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-m.svg;text-offset: 10;font-size: 12;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 12.75;}
 node|z17[railway=subway_entrance][city=moscow]::int_name
 {text-offset: 25;font-size: 11;}
 node|z18-[railway=subway_entrance][city=moscow]
-{icon-image: subway-moscow-m.svg;text-offset: 10;font-size: 13;}
+{icon-image: subway-moscow-l.svg;text-offset: 10;font-size: 13.5;}
 node|z18-[railway=subway_entrance][city=moscow]::int_name
 {text-offset: 25;font-size: 11;}
 
 /* 3.2.2 Saint Petersburg Subway Station */
 
-node|z11[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-s.svg;icon-min-distance: 1;}
+/*node|z11[railway=station][transport=subway][city=spb]
+{icon-image: subway-spb-s.svg;icon-min-distance: 1;}*/
 node|z12[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-s.svg;text-offset: 6;font-size: 10;text-halo-opacity: 0.6;}
+{icon-image: subway-spb-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.6;}
 node|z12[railway=station][transport=subway][city=spb]::int_name
 {text-offset: 5;font-size: 9;text-halo-opacity: 0.6;}
 node|z13[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-s.svg;text-offset: 6;font-size: 11;text-halo-opacity: 0.6;}
+{icon-image: subway-spb-m.svg;text-offset: 6;font-size: 11.75;text-halo-opacity: 0.6;}
 node|z13[railway=station][transport=subway][city=spb]::int_name
 {text-offset: 5;font-size: 10;text-halo-opacity: 0.6;}
 node|z14[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-s.svg;text-offset: 8;font-size: 11;text-halo-opacity: 0.7;}
+{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 12.25;text-halo-opacity: 0.7;}
 node|z14[railway=station][transport=subway][city=spb]::int_name
 {text-offset: 24;font-size: 10;text-halo-opacity: 0.7;}
 node|z15[railway=station][transport=subway][city=spb]
-{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 11;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 12.5;text-halo-opacity: 0.8;}
 node|z15[railway=station][transport=subway][city=spb]::int_name
 {text-offset: 24;font-size: 10;text-halo-opacity: 0.8;}
-/*
-node[railway=station][transport=subway][city=spb] check
-{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 10;text-color: @district_label;text-halo-radius: 0;}
-node[railway=station][transport=subway][city=spb]::int_name
-{text-offset: 24;font-size: 9;text-color: @district_label;text-halo-radius: 0;} check
-*/
+
 
 /* Saint Petersburg Subway Station entrance */
 
 node|z16[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-m.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.75;text-halo-opacity: 0.8;}
 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: 13;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 12.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;}
 node|z18-[railway=subway_entrance][city=spb]
-{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13;text-halo-opacity: 0.8;}
+{icon-image: subway-spb-l.svg;text-offset: 8;font-size: 13.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;}
 
 /* 3.2.3 Minsk Subway Station */
-node|z13[railway=station][transport=subway][city=minsk] {icon-image: subway-minsk-s.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-s.svg;text-offset: 5;}
+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: none.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: none.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-m.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-m.svg;font-size: 13;}
-node|z18-[railway=subway_entrance][city=minsk] {icon-image: subway-minsk-m.svg;font-size: 13;}
+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;}
 
 /* 3.2.4 Kiev Subway Station */
-node|z13[railway=station][transport=subway][city=kiev] {icon-image: subway-kiev-s.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-s.svg;}
+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: none.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-m.svg;font-size: 13;}
+node|z17-[railway=subway_entrance][city=kiev] {icon-image: subway-kiev-l.svg;font-size: 13;}
 
 /* 3.2.5 London Subway Station */
-node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=london] {icon-image: subway-london-s.svg;}
+node|z13[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
 node|z15-16[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
 node|z17-[railway=station][transport=subway][city=london] {icon-image: subway-london-m.svg;}
-node|z17[railway=subway_entrance][city=london] {icon-image: subway-london-s.svg;}
-node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-m.svg;}
+node|z17[railway=subway_entrance][city=london] {icon-image: subway-london-l.svg;}
+node|z18-[railway=subway_entrance][city=london] {icon-image: subway-london-l.svg;}
 
 /* 3.2.6 Paris Subway Station */
-node|z13[railway=station][transport=subway][city=paris] {icon-image: subway-paris-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=paris] {icon-image: subway-paris-s.svg;}
+node|z13[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
 node|z15-16[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
-node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-m.svg;}
-node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-s.svg;}
+node|z17-[railway=station][transport=subway][city=paris] {icon-image: subway-paris-l.svg;}
+node|z17-[railway=subway_entrance][city=paris] {icon-image: subway-paris-l.svg;}
 
 /* 3.2.7 Barselona Subway Station */
-node|z13[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-s.svg;}
+node|z13[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
 node|z15-16[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
-node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-m.svg;}
-node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-s.svg;}
-node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-m.svg;}
+node|z17-[railway=station][transport=subway][city=barcelona] {icon-image: subway-barcelona-l.svg;}
+node|z17[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-l.svg;}
+node|z18-[railway=subway_entrance][city=barcelona] {icon-image: subway-barcelona-l.svg;}
 
 /* 3.2.8 Madrid Subway Station */
-node|z13[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-s.svg;}
+node|z13[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
 node|z15-16[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
-node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-m.svg;}
-node|z17[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-s.svg;}
-node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-m.svg;}
+node|z17-[railway=station][transport=subway][city=madrid] {icon-image: subway-madrid-l.svg;}
+node|z17[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-l.svg;}
+node|z18-[railway=subway_entrance][city=madrid] {icon-image: subway-madrid-l.svg;}
 
 /* 3.2.9 Berlin Subway Station*/
-node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-s.svg;}
+node|z13[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
 node|z15-16[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-m.svg;}
-node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-s.svg;}
+node|z17-[railway=station][transport=subway][city=berlin] {icon-image: subway-berlin-l.svg;}
+node|z17-[railway=subway_entrance][city=berlin] {icon-image: subway-berlin-l.svg;}
 
 /* 3.2.10 Roma Subway Station */
-node|z13[railway=station][transport=subway][city=roma] {icon-image: subway-rome-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=roma] {icon-image: subway-rome-s.svg;}
+node|z13[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;}
 node|z15[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;}
-node|z16[railway=station][transport=subway][city=roma] {icon-image: subway-rome-m.svg;}
+node|z16[railway=station][transport=subway][city=roma] {icon-image: subway-rome-l.svg;}
 node|z17-[railway=station][transport=subway][city=roma] {icon-image: none.svg;text: name;text-color: @district_label;text-halo-radius: 0;}
-node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-m.svg;}
+node|z17-[railway=subway_entrance][city=roma] {icon-image: subway-rome-l.svg;}
 
 /* 3.2.11 New York Subway Station */
-node|z13[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-s.svg;icon-min-distance: 1;}
-node|z14[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-s.svg;}
+node|z13[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;}
 node|z15[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-m.svg;}
 node|z17-[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-l.svg;}
-node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-s.svg;}
+node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-l.svg;}
+
 
-/*node|z17-[railway=station][transport=subway][city=newyork] {icon-image: subway-newyork-l.svg;}
-node|z17-[railway=subway_entrance][city=newyork] {icon-image: subway-newyork-s.svg;}*/
 
 /* 3.3 Tram Station */
 
-/*node|z14[railway=tram_stop],
-{icon-image: tram-s.svg;}
-node|z15-16[railway=tram_stop],
-area|z15-16[railway=tram_stop]
-{icon-image: tram-s.svg;}*/
+
 node|z17[railway=tram_stop],
 area|z17[railway=tram_stop]
-{icon-image: tram-s.svg;text-offset: 8;font-size: 11;text-opacity: 0;text-halo-opacity: 0;}
+{icon-image: tram-l.svg;text-offset: 8;font-size: 12;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*/
 node|z18-[railway=tram_stop],
 area|z18-[railway=tram_stop]
-{icon-image: tram-s.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;}
+{icon-image: tram-l.svg;text-offset: 8;font-size: 12;text-opacity: 0; text-halo-opacity: 0;}
 
 /* 3.4 Bus Station */
 
-/*node|z12-13[amenity=bus_station],
-area|z12-13[amenity=bus_station]
-{icon-image: bus-s.svg;icon-min-distance: 1;}
-node|z14[amenity=bus_station],
-area|z14[amenity=bus_station]
-{icon-image: bus-s.svg;text-offset: 6;font-size: 10;text-halo-opacity: 0.8;}
-node|z15-16[amenity=bus_station],
-area|z15-16[amenity=bus_station]
-{icon-image: bus-m.svg;text-offset: 8;font-size: 11;text-halo-opacity: 0.8;}
-node|z15-16[amenity=bus_station]::int_name,
-area|z15-16[amenity=bus_station]::int_name
-{text-offset: 8;font-size: 9;text-halo-opacity: 0.8;}
-node|z17[amenity=bus_station],
-area|z17[amenity=bus_station]
-{icon-image: bus-l.svg;text-offset: 8;font-size: 11;}
-node|z17[amenity=bus_station]::int_name,
-area|z17[amenity=bus_station]::int_name
-{text-offset: 8;font-size: 9;}
-node|z18[amenity=bus_station],
-area|z18[amenity=bus_station]
-{icon-image: bus-l.svg;text-offset: 8;font-size: 12;}
-node|z18[amenity=bus_station]::int_name,
-area|z18[amenity=bus_station]::int_name
-{text-offset: 8;font-size: 10;}
-node|z19-[amenity=bus_station],
-area|z19-[amenity=bus_station]
-{icon-image: bus-l.svg;text-offset: 10;font-size: 12;}
-node|z19-[amenity=bus_station]::int_name,
-area|z19-[amenity=bus_station]::int_name
-{text-offset: 10;font-size: 10;}
-
-node|z16[highway=bus_stop],
-area|z16[highway=bus_stop]
-{icon-image: bus-m.svg;}
-node|z17-[highway=bus_stop],
-area|z17-[highway=bus_stop],
-node|z18-[public_transport=station],
-area|z18-[public_transport=station]
-{icon-image: bus-l.svg;text-offset: 10;font-size: 11;}
-node|z18-19[highway=bus_stop]::int_name,
-area|z18-19[highway=bus_stop]::int_name,
-node|z18-19[public_transport=station]::int_name,
-area|z18-19[public_transport=station]::int_name
-{icon-image: bus-l.svg;text-offset: 10;font-size: 9;}*/
+
 
 /* 3.5 Ferry terminal */
 
-/*node|z11-12[amenity=ferry_terminal]
-{icon-image: ship-s.svg;icon-min-distance: 12;}
-node|z13-14[amenity=ferry_terminal]
-{icon-image: ship-s.svg;}*/
-node|z15[amenity=ferry_terminal]
-{icon-image: ship-s.svg;}
-node|z16[amenity=ferry_terminal]
-{icon-image: ship-s.svg;text-offset: 8;font-size: 8.5;text-halo-opacity: 0.8;}
-node|z17-18[amenity=ferry_terminal]
-{icon-image: ship-s.svg;text-offset: 10;font-size: 9;}
-node|z19[amenity=ferry_terminal]
-{icon-image: ship-m.svg;text-offset: 10;font-size: 10;}
+
 
 /* 3.6 Airport */
 
@@ -1072,9 +551,7 @@ area|z17-[aeroway=aerodrome]::int_name,
 node|z17-[aeroway=aerodrome]::int_name,
 {font-size: 11;}
 
-/*area|z17-[aeroway=helipad],
-node|z17-[aeroway=helipad]
-{icon-image: helipad-l.svg;text-offset: 10;font-size: 10;text: name;text-color: @poi_label;}*/
+
 
 
 area|z17-[aeroway=heliport],
@@ -1083,412 +560,20 @@ node|z17-[aeroway=heliport],
 
 /* 3.7 Aerialway */
 
-/*node|z12-13[aerialway=station],
-node|z12-13[aerialway=cable_car],
-node|z12-13[aerialway=chair_lift],
-node|z12-13[aerialway=gondola],
-node|z12-13[aerialway=mixed_lift]
-{icon-image: cable-car-s.svg;icon-min-distance: 10;}
-node|z14[aerialway=station],
-node|z14[aerialway=cable_car],
-node|z14[aerialway=chair_lift],
-node|z14[aerialway=gondola],
-node|z14[aerialway=mixed_lift]
-{icon-image: cable-car-s.svg;}
-node|z15-16[aerialway=station],
-node|z15-16[aerialway=cable_car],
-node|z15-16[aerialway=chair_lift],
-node|z15-16[aerialway=gondola],
-node|z15-16[aerialway=mixed_lift],
-node|z15-16[aerialway=drag_lift],
-node|z15-16[aerialway=j-bar],
-node|z15-16[aerialway=t-bar],
-node|z15-16[aerialway=magic_carpet],
-node|z15-16[aerialway=platter],
-node|z15-16[aerialway=rope_tow],
-{icon-image: cable-car-m.svg;text-offset: 6;font-size: 10;}
-node|z17-[aerialway=station],
-node|z17-[aerialway=cable_car],
-node|z17-[aerialway=chair_lift],
-node|z17-[aerialway=gondola],
-node|z17-[aerialway=mixed_lift],
-node|z17-[aerialway=drag_lift],
-node|z17-[aerialway=j-bar],
-node|z17-[aerialway=t-bar],
-node|z17-[aerialway=magic_carpet],
-node|z17-[aerialway=platter],
-node|z17-[aerialway=rope_tow],
-{icon-image: cable-car-l.svg;text-offset: 8;font-size: 12;}*/
 
+
+node|z15-[railway=level_crossing]
+{icon-image: railway-crossing_l.svg;}
 node|z17-[railway=level_crossing]
-{icon-image: railway-crossing.svg;}
+{icon-image: railway-crossing_xl.svg;}
 
 /* 4.TOURISM */
 
 /* 4.1 Main POI */
 
-/*node|z12-[historic=fort],
-area|z12-[historic=fort],
-node|z12-[historic=castle],
-area|z12-[historic=castle],
-node|z13-[historic=monument],
-area|z13-[historic=monument],
-node|z13-[tourism=museum],
-area|z13-[tourism=museum],
-node|z13-[tourism=zoo],
-area|z13-[tourism=zoo],
-node|z14-[amenity=theatre],
-area|z14-[amenity=theatre],
-node|z14-[tourism=attraction],
-area|z14-[tourism=attraction],
-node|z14-[amenity=community_centre],
-area|z14-[amenity=community_centre],
-node|z14-[tourism=viewpoint],
-node|z15-[historic=memorial],
-area|z15-[historic=memorial],
-node|z15-[tourism=gallery],
-area|z15-[tourism=gallery],
-node|z15-[tourism=artwork],
-node|z16-[tourism=information],
-node|z16-[historic=boundary_stone],
-area|z16-[historic=boundary_stone],
-node|z16-[historic=wayside_cross],
-area|z16-[historic=wayside_cross],
-node|z16-[historic=ship],
-area|z16-[historic=ship],
-node|z16-[historic=tomb],
-area|z16-[historic=tomb],
-node|z16-[historic=museum],
-area|z16-[historic=museum],
-node|z17-[historic=ruins],
-area|z17-[historic=ruins],
-node|z17-[historic=wayside_shrine],
-area|z17-[historic=wayside_shrine],
-node|z17-[historic=archaeological_site],
-area|z17-[historic=archaeological_site]
-{text: name;text-offset: 10;font-size: 10;text-color: @poi_label;}
-
-node|z12-14[historic=fort],
-area|z12-14[historic=fort]
-node|z12-14[historic=castle],
-area|z12-14[historic=castle]
-{icon-image: remains-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z15[historic=fort],
-area|z15[historic=fort]
-node|z15[historic=castle],
-area|z15[historic=castle]
-{icon-image: remains-m.svg;icon-min-distance: 5;}
-node|z16[historic=fort],
-area|z16[historic=fort]
-node|z16[historic=castle],
-area|z16[historic=castle]
-{icon-image: remains-m.svg;text-offset: 12;}
-node|z17-[historic=ruins],
-area|z17-[historic=ruins]
-node|z17-[historic=fort],
-area|z17-[historic=fort]
-node|z17-[historic=castle],
-area|z17-[historic=castle],
-node|z17-[historic=archaeological_site],
-area|z17-[historic=archaeological_site]
-{icon-image: remains-l.svg;}
-
-node|z13-14[historic=monument],
-area|z13-14[historic=monument]
-{icon-image: monument-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z15[historic=monument],
-area|z15[historic=monument]
-node|z15[historic=memorial],
-area|z15[historic=memorial]
-{icon-image: monument-m.svg;icon-min-distance: 24;}
-node|z16[historic=monument],
-area|z16[historic=monument]
-node|z16[historic=memorial],
-area|z16[historic=memorial]
-{icon-image: monument-m.svg;icon-min-distance: 12;}
-node|z17-[historic=memorial],
-area|z17-[historic=memorial]
-node|z17-[historic=monument],
-area|z17-[historic=monument]
-{icon-image: monument-l.svg;}
-
-node|z13-14[tourism=museum],
-area|z13-14[tourism=museum]
-{icon-image: museum-s.svg;icon-min-distance: 16;}
-node|z15[tourism=museum],
-area|z15[tourism=museum]
-{icon-image: museum-m.svg;icon-min-distance: 24;}
-node|z16[tourism=museum],
-area|z16[tourism=museum]
-node|z16[historic=museum],
-area|z16[historic=museum]
-{icon-image: museum-m.svg;text-offset: 12;icon-min-distance: 12;}
-node|z17-[tourism=museum],
-area|z17-[tourism=museum]
-node|z17-[historic=museum],
-area|z17-[historic=museum]
-{icon-image: museum-l.svg;}
-
-node|z15[tourism=gallery]
-{icon-image: gallery-m.svg;icon-min-distance: 8;} /* <-- <-- не показывается, непонятно почему, позже разобраться */
-/*node|z16[tourism=gallery],
-area|z16[tourism=gallery]
-{icon-image: gallery-m.svg;text-offset: 12;icon-min-distance: 12;}
-node|z17-[tourism=gallery],
-area|z17-[tourism=gallery]
-{icon-image: gallery-l.svg;}
-
-node|z14[amenity=theatre],
-area|z14[amenity=theatre]
-{icon-image: theatre-s.svg;text-offset: 6;icon-min-distance: 8;}
-node|z16[amenity=theatre],
-area|z16[amenity=theatre]
-{icon-image: theatre-m.svg;icon-min-distance: 10;}
-node|z17[amenity=theatre],
-area|z17[amenity=theatre]
-{icon-image: theatre-l.svg;}
-node|z18-[amenity=theatre],
-area|z18-[amenity=theatre]
-{icon-image: theatre-l.svg;font-size: 11;}
-
-node|z13-14[tourism=zoo],
-area|z13-14[tourism=zoo]
-{icon-image: zoo-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z15[tourism=zoo],
-area|z15[tourism=zoo]
-{icon-image: zoo-m.svg;icon-min-distance: 8;}
-node|z16[tourism=zoo],
-area|z16[tourism=zoo]
-{icon-image: zoo-m.svg;text-offset: 12;icon-min-distance: 8;}
-node|z17-[tourism=zoo],
-area|z17-[tourism=zoo]
-{icon-image: zoo-l.svg;}
-
-node|z14[tourism=viewpoint]
-{icon-image: viewpoint-s.svg;text-offset: 6;icon-min-distance: 8;}
-node|z15-16[tourism=viewpoint]
-{icon-image: viewpoint-m.svg;icon-min-distance: 8;}
-node|z17-[tourism=viewpoint]
-{icon-image: viewpoint-l.svg;}
-
-node|z16[tourism=information]
-{icon-image: information-m.svg;text-offset: 6;icon-min-distance: 10;}
-node|z17-[tourism=information]
-{icon-image: information-l.svg;text-offset: 6;}
-
-node|z16[historic=boundary_stone],
-area|z16[historic=boundary_stone]
-node|z16[historic=wayside_cross],
-area|z16[historic=wayside_cross]
-{icon-image: monument-m.svg;font-size: 11;;icon-min-distance: 8;}
-node|z16[historic=ship],
-area|z16[historic=ship]
-{icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;}
-node|z16[historic=tomb],
-area|z16[historic=tomb]
-{icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;}
-node|z16[historic=wayside_shrine],
-area|z16[historic=wayside_shrine]
-{icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;}
-
-node|z17-[historic=boundary_stone],
-area|z17-[historic=boundary_stone],
-node|z17-[historic=wayside_cross],
-area|z17-[historic=wayside_cross]
-{icon-image: monument-l.svg;font-size: 11;icon-min-distance: 8;}
-node|z17-[historic=ship],
-area|z17-[historic=ship]
-{icon-image: historic-ship-l.svg;font-size: 11;icon-min-distance: 8;}
-node|z17-[historic=tomb],
-area|z17-[historic=tomb]
-{icon-image: tomb-l.svg;font-size: 11;icon-min-distance: 8;}
-node|z17-[historic=wayside_shrine],
-area|z17-[historic=wayside_shrine]
-{icon-image: wayside_shrine-l.svg;font-size: 11;icon-min-distance: 8;}
-
-node|z15[tourism=artwork]
-{icon-image: tourism-m.svg;icon-min-distance: 8;}
-node|z16[tourism=artwork]
-{icon-image: tourism-m.svg;icon-min-distance: 28;}
-node|z14[tourism=attraction],
-area|z14[tourism=attraction]
-{icon-image: tourism-s.svg;icon-min-distance: 12;}
-node|z15[tourism=attraction],
-area|z15[tourism=attraction ]
-{icon-image: tourism-m.svg;icon-min-distance: 36;}
-node|z16[tourism=attraction],
-area|z16[tourism=attraction]
-{icon-image: tourism-m.svg;icon-min-distance: 36}
-node|z17-[tourism=artwork]
-node|z17-[tourism=attraction],
-area|z17-[tourism=attraction]
-{icon-image: tourism-l.svg;icon-min-distance: 24;}
-
-node|z14[amenity=community_centre],
-area|z14[amenity=community_centre]
-{icon-image: tourism-s.svg;icon-min-distance: 8;}
-node|z15[amenity=community_centre],
-area|z15[amenity=community_centre]
-{icon-image: tourism-m.svg;icon-min-distance: 24;}
-node|z16[amenity=community_centre],
-area|z16[amenity=community_centre]
-{icon-image: tourism-m.svg;icon-min-distance: 16} */
-
-/* 4.2 Apartament */
-
-/*node|z14-[tourism=hotel],
-node|z14-[tourism=hostel],
-node|z14-[tourism=guest_house],
-area|z14-[tourism=guest_house],
-node|z14-[tourism=alpine_hut],
-area|z14-[tourism=alpine_hut],
-node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
-node|z14-[tourism=resort],
-area|z14-[tourism=resort],
-node|z14-[tourism=motel],
-area|z14-[tourism=motel],
-node|z14-[tourism=apartment],
-area|z14-[tourism=apartment],
-{text: name;text-offset: 10;font-size: 10; text-color: @poi_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
-node|z15-[tourism=camp_site],
-area|z15-[tourism=camp_site],
-node|z16-[tourism=picnic_site],
-area|z16-[tourism=picnic_site],
-node|z16-[amenity=shelter],
-area|z16-[amenity=shelter],
-node|z16-[tourism=caravan_site],
-area|z16-[tourism=caravan_site],
-{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;}
-
-node|z14[tourism=hotel]
-{icon-image: hotel-s.svg;text-offset: 6;icon-min-distance: 24;}
-node|z14[tourism=hostel]
-{icon-image: hotel-s.svg;text-offset: 6;icon-min-distance: 24;}
-node|z14[tourism=guest_house],
-area|z14[tourism=guest_house]
-{icon-image: motel-s.svg;text-offset: 6;icon-min-distance: 24;}
-node|z14[tourism=alpine_hut],
-area|z14[tourism=alpine_hut],
-node|z14[tourism=chalet],
-area|z14[tourism=chalet],
-node|z14[tourism=resort],
-area|z14[tourism=resort]
-{icon-image: alpine_hut-s.svg;text-offset: 6;icon-min-distance: 24;}
-node|z14[tourism=motel],
-area|z14[tourism=motel],
-node|z14[tourism=apartment],
-area|z14[tourism=apartment]
-{icon-image: motel-s.svg;text-offset: 6;icon-min-distance: 24;}
-
-node|z15[tourism=hotel]
-{icon-image: hotel-m.svg;icon-min-distance: 32;}
-node|z15[tourism=hostel]
-{icon-image: hotel-m.svg;icon-min-distance: 32;}
-node|z15[tourism=guest_house],
-area|z15[tourism=guest_house]
-{icon-image: motel-m.svg;icon-min-distance: 32;}
-node|z15[tourism=alpine_hut],
-area|z15[tourism=alpine_hut],
-node|z15[tourism=chalet],
-area|z15[tourism=chalet],
-node|z15[tourism=resort],
-area|z15[tourism=resort]
-{icon-image: alpine_hut-m.svg;icon-min-distance: 32;}
-node|z15[tourism=motel],
-area|z15[tourism=motel],
-node|z15[tourism=apartment],
-area|z15[tourism=apartment]
-{icon-image: motel-m.svg;icon-min-distance: 32;}
-
-node|z16[tourism=hotel]
-{icon-image: hotel-m.svg;icon-min-distance: 24;}
-node|z16[tourism=hostel]
-{icon-image: hotel-m.svg;icon-min-distance: 24;}
-node|z16[tourism=guest_house],
-area|z16[tourism=guest_house]
-{icon-image: motel-m.svg;icon-min-distance: 24;}
-node|z16[tourism=alpine_hut],
-area|z16[tourism=alpine_hut],
-node|z16[tourism=chalet],
-area|z16[tourism=chalet],
-node|z16[tourism=resort],
-area|z16[tourism=resort]
-{icon-image: alpine_hut-m.svg;icon-min-distance: 24;}
-node|z16[tourism=motel],
-area|z16[tourism=motel],
-node|z16[tourism=apartment],
-area|z16[tourism=apartment]
-{icon-image: motel-m.svg;icon-min-distance: 24;}
-
-node|z17[tourism=hotel]
-{icon-image: hotel-l.svg;icon-min-distance: 16;}
-node|z17[tourism=hostel]
-{icon-image: hotel-l.svg;icon-min-distance: 16;}
-node|z17[tourism=guest_house],
-area|z17[tourism=guest_house]
-{icon-image: motel-l.svg;icon-min-distance: 16;}
-node|z17[tourism=alpine_hut],
-area|z17[tourism=alpine_hut],
-node|z17[tourism=chalet],
-area|z17[tourism=chalet],
-node|z17[tourism=resort],
-area|z17[tourism=resort]
-{icon-image: alpine_hut-l.svg;icon-min-distance: 16;}
-node|z17[tourism=motel],
-area|z17[tourism=motel],
-node|z17[tourism=apartment],
-area|z17[tourism=apartment]
-{icon-image: motel-l.svg;icon-min-distance: 16;}
-
-node|z18-[tourism=hotel]
-{icon-image: hotel-l.svg;}
-node|z18-[tourism=hostel]
-{icon-image: hotel-l.svg;}
-node|z18-[tourism=guest_house],
-area|z18-[tourism=guest_house]
-{icon-image: motel-l.svg;}
-node|z18-[tourism=alpine_hut],
-area|z18-[tourism=alpine_hut],
-node|z18-[tourism=chalet],
-area|z18-[tourism=chalet],
-node|z18-[tourism=resort],
-area|z18-[tourism=resort]
-{icon-image: alpine_hut-l.svg;}
-node|z18-[tourism=motel],
-area|z18-[tourism=motel],
-node|z18-[tourism=apartment],
-area|z18-[tourism=apartment]
-{icon-image: motel-l.svg;}
-
-node|z15-16[tourism=camp_site],
-area|z15-16[tourism=camp_site]
-{icon-image: campsite-m.svg;icon-min-distance: 12;}
-node|z17-[tourism=camp_site],
-area|z17-[tourism=camp_site]
-{icon-image: campsite-l.svg;}
-node|z16-[tourism=picnic_site],
-area|z16-[tourism=picnic_site]
-{icon-image: picnic-m.svg;icon-min-distance: 10;}
-node|z17-[tourism=picnic_site],
-area|z17-[tourism=picnic_site]
-{icon-image: picnic-l.svg;}
-node|z16-[amenity=shelter],
-area|z16-[amenity=shelter]
-{icon-image: picnic-m.svg;icon-min-distance: 10;}
-node|z17-[amenity=shelter],
-area|z17-[amenity=shelter]
-{icon-image: picnic-l.svg;}
-
-node|z16[tourism=caravan_site],
-area|z16[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-image: caravan_site-l.svg;font-size: 11;icon-min-distance: 20;}
-node|z18-[tourism=caravan_site],
-area|z18-[tourism=caravan_site]
-{icon-image: caravan_site-l.svg;font-size: 11;}*/
+
+
+
 
 /* 4.3 Food */
 node|z15-[amenity=cafe],
@@ -1499,92 +584,49 @@ node|z17-[amenity=fast_food],
 area|z17-[amenity=fast_food],
 {text: name;text-color: @poi_label;text-offset: 10;font-size: 13;}
 
-/*node|z17-[amenity=bar],
-area|z17-[amenity=bar],
-node|z17-[amenity=pub],
-area|z17-[amenity=pub],
-{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;}*/
-/*node|z15[amenity=cafe],
-area|z15[amenity=cafe]
-{icon-image: cafe-m.svg;icon-min-distance: 12;}
-node|z15[amenity=restaurant],
-area|z15[amenity=restaurant]
-{icon-image: restaurant-m.svg;icon-min-distance: 28;}
-node|z15[amenity=fast_food],
-area|z15[amenity=fast_food]
-{icon-image: fastfood-m.svg;icon-min-distance: 28;}
-node|z15[amenity=bar],
-area|z15[amenity=bar]
-{icon-image: beer-m.svg;icon-min-distance: 28;}
-node|z15[amenity=pub],
-area|z15[amenity=pub]
-{icon-image: beer-m.svg;icon-min-distance: 28;}*/
-
-/*node|z16[amenity=cafe],
-area|z16[amenity=cafe]
-{icon-image: cafe-m.svg;icon-min-distance: 12;}
-node|z16[amenity=restaurant],
-area|z16[amenity=restaurant]
-{icon-image: restaurant-m.svg;icon-min-distance: 12;}
-node|z16[amenity=fast_food],
-area|z16[amenity=fast_food]
-{icon-image: fastfood-m.svg;icon-min-distance: 12;}
-node|z16[amenity=bar],
-area|z16[amenity=bar]
-{icon-image: beer-m.svg;icon-min-distance: 12;}
-node|z16[amenity=pub],
-area|z16[amenity=pub]
-{icon-image: beer-m.svg;icon-min-distance: 12;}*/
+
+
+
 node|z15[amenity=cafe],
 area|z15[amenity=cafe]
-{icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 11;}
+{icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 12.5;}
 node|z16[amenity=cafe],
 area|z16[amenity=cafe]
-{icon-image: cafe-m.svg;icon-min-distance: 10;font-size: 12.5;}
+{icon-image: cafe-l.svg;icon-min-distance: 10;font-size: 12.75;}
 node|z16[amenity=restaurant],
 area|z16[amenity=restaurant]
-{icon-image: restaurant-m.svg;icon-min-distance: 22;}
+{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;}
+{icon-image: cafe-l.svg;icon-min-distance: 20;font-size: 12.75;}
 node|z17[amenity=restaurant],
 area|z17[amenity=restaurant]
-{icon-image: restaurant-l.svg;icon-min-distance: 22;}
+{icon-image: restaurant-l.svg;icon-min-distance: 22;font-size: 12.75;}
 node|z17[amenity=fast_food],
 area|z17[amenity=fast_food]
-{icon-image: fastfood-l.svg;icon-min-distance: 25;}
-/*node|z17[amenity=bar],
-area|z17[amenity=bar]
-{icon-image: beer-l.svg;icon-min-distance: 12;}*/
-/*node|z17[amenity=pub],
-area|z17[amenity=pub]
-{icon-image: beer-l.svg;icon-min-distance: 12;}*/
+{icon-image: fastfood-l.svg;icon-min-distance: 25;font-size: 12.75;}
+
 
 node|z18[amenity=cafe],
 area|z18[amenity=cafe]
-{icon-image: cafe-l.svg;icon-min-distance: 25;}
+{icon-image: cafe-xl.svg;icon-min-distance: 25;font-size: 13.5;}
 node|z18[amenity=restaurant],
 area|z18[amenity=restaurant]
-{icon-image: restaurant-l.svg;icon-min-distance: 25;}
+{icon-image: restaurant-xl.svg;icon-min-distance: 25;font-size: 13.5;}
 node|z18[amenity=fast_food],
 area|z18[amenity=fast_food]
-{icon-image: fastfood-l.svg;icon-min-distance: 25;}
+{icon-image: fastfood-xl.svg;icon-min-distance: 25;font-size: 13.5;}
 
 node|z19[amenity=cafe],
 area|z19[amenity=cafe]
-{icon-image: cafe-l.svg;icon-min-distance: 35;}
+{icon-image: cafe-xl.svg;icon-min-distance: 35;font-size: 13.5;}
 node|z19[amenity=restaurant],
 area|z19[amenity=restaurant]
-{icon-image: restaurant-l.svg;icon-min-distance: 40;}
+{icon-image: restaurant-xl.svg;icon-min-distance: 40;font-size: 13.5;}
 node|z19[amenity=fast_food],
 area|z19[amenity=fast_food]
-{icon-image: fastfood-l.svg;icon-min-distance: 45;}
-/*node|z18-[amenity=bar],
-area|z18-[amenity=bar]
-{icon-image: beer-l.svg;}*/
-/*node|z18-[amenity=pub],
-area|z18-[amenity=pub]
-{icon-image: beer-l.svg;}*/
+{icon-image: fastfood-xl.svg;icon-min-distance: 45;font-size: 13.5;}
+
 
 /* 5.AMENITY (infrastructure) */
 node|z17-[amenity=place_of_worship],
@@ -1593,11 +635,11 @@ area|z17-[amenity=place_of_worship],
 
 /*node|z13-[leisure=stadium],
 area|z13-[leisure=stadium],*/
-area|z16-[amenity=university],
-node|z16-[amenity=university],
-node|z16-[amenity=hospital],
-node|z16-[building=hospital],
-area|z16-[building=hospital],
+area|z15-[amenity=university],
+node|z15-[amenity=university],
+node|z15-[amenity=hospital],
+node|z15-[building=hospital],
+area|z15-[building=hospital],
 
 
 node|z14-[barrier=toll_booth],
@@ -1611,387 +653,133 @@ node|z17-[vending=parking_tickets],
 area|z17-[vending=parking_tickets],
 node|z17-[amenity=vending_machine],
 area|z17-[amenity=vending_machine],
-{text: name;text-color: @poi_label;text-offset: 10;font-size: 10;text-min-distance: 14}
+{text: name;text-color: @poi_label;text-offset: 10;font-size: 11;text-min-distance: 14}
 
 /* POI */
-/*
-node|z18-[tourism],
-area|z18-[tourism]
-{font-size: 11;text-offset: 12;}
-node|z18-[office],
-area|z18-[office]
-{icon-image: office-l.svg;font-size: 11;}
-
-node|z18-[craft],
-area|z18-[craft]
-{icon-image: hand-l.svg;font-size: 11;}*/
+
+
 
 /* 5.1 Hospital */
 
-/*area|z14[amenity=hospital]
-{icon-image: hospital-s.svg;icon-min-distance: 8;}
-node|z15[amenity=hospital]
-{icon-image: hospital-m.svg;icon-min-distance: 6;}*/
+node|z15[amenity=hospital],
+node|z15[building=hospital],
+area|z15[building=hospital]
+{icon-image: hospital-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z16[amenity=hospital],
 node|z16[building=hospital],
 area|z16[building=hospital]
-{icon-image: hospital-m.svg;icon-min-distance: 8;}
+{icon-image: hospital-l.svg;icon-min-distance: 8;font-size: 12.75;}
 node|z17[amenity=hospital],
 node|z17[building=hospital],
 area|z17[building=hospital]
-{icon-image: hospital-l.svg;icon-min-distance: 14;}
+{icon-image: hospital-l.svg;icon-min-distance: 14;font-size: 12.75;}
 node|z18-[amenity=hospital],
 node|z18-[building=hospital],
 area|z18-[building=hospital],
-{icon-image: hospital-l.svg;font-size: 13;}
-
-/*node|z16[amenity=veterinary],
-area|z16[amenity=veterinary]
-{icon-image: veterinary-m.svg;}
-node|z17[amenity=veterinary],
-area|z17[amenity=veterinary]
-{icon-image: veterinary-l.svg;}
-node|z18-[amenity=veterinary],
-area|z18-[amenity=veterinary]
-{icon-image: veterinary-l.svg;font-size: 11;}*/
-
-/*node|z16[amenity=pharmacy],
-area|z16[amenity=pharmacy]
-{icon-image: pharmacy-m.svg;icon-min-distance: 20;}
-node|z17[amenity=pharmacy],
-area|z17[amenity=pharmacy]
-{icon-image: pharmacy-l.svg;text-offset: 8;font-size: 11;icon-min-distance: 20;}
-node|z18-[amenity=pharmacy],
-area|z18-[amenity=pharmacy]
-{icon-image: pharmacy-l.svg;font-size: 11;}*/
+{icon-image: hospital-xl.svg;font-size: 13.5;}
+
+
 
 /* 5.2 Education */
 
-/*area|z15[amenity=university][name]
-{icon-image: college-s.svg;icon-min-distance: 12;-x-me-text-priority:16000;}*/
+area|z15[amenity=university][name],
+node|z15[amenity=university][name]
+{icon-image: college-m.svg;icon-min-distance: 15;-x-me-text-priority:16000;font-size: 12.5;}
+node|z15[amenity=university][!name]
+{}
 area|z16[amenity=university][name],
 node|z16[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 12;-x-me-text-priority:16000;}
+{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;}
 node|z16[amenity=university][!name]
 {}
 node|z17[amenity=university][name],
 area|z17[amenity=university][name]
-{icon-image: college-m.svg;icon-min-distance: 11;-x-me-text-priority:16000;}
+{icon-image: college-l.svg;icon-min-distance: 9;-x-me-text-priority:16000;font-size: 12.75;}
 node|z17[amenity=university][!name],
 area|z17[amenity=university][!name]
 {}
 node|z18[amenity=university][name],
 area|z18[amenity=university][name]
-{icon-image: college-l.svg;icon-min-distance: 10;-x-me-text-priority:16000;}
+{icon-image: college-xl.svg;icon-min-distance: 10;-x-me-text-priority:16000;font-size: 13.5;}
 node|z18[amenity=university][!name],
 area|z18[amenity=university][!name]
 {}
 node|z19[amenity=university][name],
 area|z19[amenity=university][name]
-{icon-image: college-l.svg;font-size: 113;-x-me-text-priority:16000;}
+{icon-image: college-xl.svg;font-size: 14.5;-x-me-text-priority:16000;font-size: 13.5;}
 node|z19[amenity=university][!name],
 area|z19[amenity=university][!name]
 {}
 
-/*node|z17[amenity=kindergarten],
-area|z17[amenity=kindergarten]
-{icon-image: kindergarten-l.svg;}
-node|z18-[amenity=kindergarten],
-area|z18-[amenity=kindergarten]
-{icon-image: kindergarten-l.svg;font-size: 11;}
-node|z17[amenity=childcare],
-area|z17[amenity=childcare]
-{icon-image: kindergarten-l.svg;}
-node|z18-[amenity=childcare],
-area|z18-[amenity=childcare]
-{icon-image: kindergarten-l.svg;font-size: 11;}
-node|z17[amenity=school],
-area|z17[amenity=school]
-{icon-image: school-l.svg;}
-node|z18-[amenity=school],
-area|z18-[amenity=school]
-{icon-image: school-l.svg;font-size: 11;}
-node|z17[amenity=college],
-area|z17[amenity=college]
-{icon-image: college-l.svg;}
-node|z18-[amenity=college],
-area|z18-[amenity=college]
-{icon-image: college-l.svg;font-size: 11;}*/
+
 
 /* 5.3 Sport */
 
-/*node|z13-14[leisure=stadium]
-{icon-image: stadium-s.svg;icon-min-distance: 16;}
-node|z15-16[leisure=stadium]
-{icon-image: stadium-m.svg;icon-min-distance: 8;}
-node|z17-[leisure=stadium]
-{icon-image: stadium-l.svg;icon-min-distance: 8;}*/
-
-/*node|z16-[sport=equestrian],
-area|z16-[sport=equestrian]
-{icon-image: equestrian-m.svg;font-size: 11;icon-min-distance: 30;}
-node|z17-[sport=equestrian],
-area|z17-[sport=equestrian]
-{icon-image: equestrian-l.svg;font-size: 11;icon-min-distance: 20;}
-node|z18-[sport=equestrian],
-area|z18-[sport=equestrian]
-{icon-image: equestrian-l.svg;font-size: 11;}
-
-node|z17-[sport=multi]
-{icon-image: pitch-l.svg;icon-min-distance: 10;}
-node|z17-[leisure=pitch]
-{icon-image: pitch-l.svg;;icon-min-distance: 10;-x-me-text-priority: 16000;}
-node|z17-[leisure=sports_centre]
-{icon-image: pitch-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
-node|z17-[leisure=sports_centre][sport=climbing]
-{icon-image: climbing-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
-node|z17-[leisure=sports_centre][sport=swimming]
-{icon-image: swimming-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
-node|z17-[leisure=fitness_centre]
-{icon-image: gym-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
-node|z17-[leisure=sauna]
-{icon-image: sauna-l.svg;-x-me-text-priority: 15500;icon-min-distance: 10;}
-node|z17-[leisure=playground]
-{icon-image: pitch-l.svg;font-size: 11;;icon-min-distance: 10;}
-node|z17-[leisure=swimming_pool],
-area|z17-[leisure=swimming_pool]
-{icon-image: swimming-l.svg;icon-min-distance: 10;}
-node|z17-[leisure=golf_course],
-area|z17-[leisure=golf_course]
-{icon-image: golf-l.svg;icon-min-distance: 10;}
-node|z17-[sport=soccer],
-area|z17-[sport=soccer]
-{icon-image: soccer-l.svg;icon-min-distance: 10;}
-node|z17-[sport=football],
-area|z17-[sport=football]
-{icon-image: soccer-l.svg;icon-min-distance: 10;}
-node|z17-[sport=tennis]
-{icon-image: tennis-l.svg;icon-min-distance: 10;}
-node|z17-[leisure=skiing]
-{icon-image: skiing-l.svg;icon-min-distance: 10;}
-
-node|z17-[sport=archery],
-area|z17-[sport=archery]{icon-image: archery-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=shooting],
-area|z17-[sport=shooting]
-{icon-image: archery-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=australian_football],
-area|z17-[sport=australian_football]
-{icon-image: australian-football-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=bowls],
-area|z17-[sport=bowls]
-{icon-image: bowls-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=cricket],
-area|z17-[sport=cricket]
-{icon-image: cricket-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=curling],
-area|z17-[sport=curling]
-{icon-image: curling-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=diving],
-area|z17-[sport=diving]
-{icon-image: diving-l.svg;font-size: 11;icon-min-distance: 10;}
-node|z17-[sport=scuba_diving],
-area|z17-[sport=scuba_diving]
-{icon-image: diving-l.svg;font-size: 11;icon-min-distance: 10;}
-
-node|z18-[sport=swimming]
-{icon-image: swimming-l.svg;font-size: 11;}
-node|z18-[sport=baseball]
-{icon-image: baseball-l.svg;font-size: 11;}
-node|z18-[sport=basketball]
-{icon-image: basketball-l.svg;font-size: 11;}
-node|z18-[sport=american_football]
-{icon-image: america-football-l.svg;font-size: 11;}
-node|z18-[sport=athletics]
-{icon-image: pitch-l.svg;font-size: 11;}
-node|z18-[sport=golf]
-{icon-image: golf-l.svg;font-size: 11;}
-node|z18-[sport=gymnastics]
-{icon-image: pitch-l.svg;font-size: 11;}
-
-node|z18-[sport=archery],
-area|z18-[sport=archery]
-{icon-image: archery-l.svg;font-size: 11;}
-node|z18-[sport=shooting],
-area|z18-[sport=shooting]
-{icon-image: archery-l.svg;font-size: 11;}
-node|z18-[sport=australian_football],
-area|z18-[sport=australian_football]
-{icon-image: australian-football-l.svg;font-size: 11;}
-node|z18-[sport=bowls],
-area|z18-[sport=bowls]
-{icon-image: bowls-l.svg;font-size: 11;}
-node|z18-[sport=cricket],
-area|z18-[sport=cricket]
-{icon-image: cricket-l.svg;font-size: 11;}
-node|z18-[sport=curling],
-area|z18-[sport=curling]
-{icon-image: curling-l.svg;font-size: 11;}
-node|z18-[sport=diving],
-area|z18-[sport=diving]
-{icon-image: diving-l.svg;font-size: 11;}
-node|z18-[sport=scuba_diving],
-area|z18-[sport=scuba_diving]
-{icon-image: diving-l.svg;font-size: 11;}*/
+
 
 /* 5.4 Religion */
 
-/*node|z14[amenity=place_of_worship],
-area|z14[amenity=place_of_worship]
-{icon-image: place-of-worship-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=christian],
-area|z14[amenity=place_of_worship][religion=christian]
-{icon-image: christian-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=muslim],
-area|z14[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=buddhist],
-area|z14[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=hindu],
-area|z14[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=shinto],
-area|z14[amenity=place_of_worship][religion=shinto]
-{icon-image: shinto-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=jewish],
-area|z14[amenity=place_of_worship][religion=jewish]
-{icon-image: jewish-s.svg;text-offset: 6;icon-min-distance: 12;}
-node|z14[amenity=place_of_worship][religion=taoist],
-area|z14[amenity=place_of_worship][religion=taoist]
-{icon-image: taoist-s.svg;text-offset: 6;icon-min-distance: 12;}*/
-
-node|z16[amenity=place_of_worship],
-area|z16[amenity=place_of_worship]
-{icon-image: place-of-worship-m.svg;icon-min-distance: 10;}
-node|z16[amenity=place_of_worship][religion=christian],
-area|z16[amenity=place_of_worship][religion=christian]
-{icon-image: christian-m.svg;}
-node|z16[amenity=place_of_worship][religion=muslim],
-area|z16[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-m.svg;}
-node|z16[amenity=place_of_worship][religion=buddhist],
-area|z16[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-m.svg;}
-node|z16[amenity=place_of_worship][religion=hindu],
-area|z16[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-m.svg;}
-node|z16[amenity=place_of_worship][religion=shinto],
-area|z16[amenity=place_of_worship][religion=shinto]
-{icon-image: shinto-m.svg;}
-node|z16[amenity=place_of_worship][religion=jewish],
-area|z16[amenity=place_of_worship][religion=jewish]
-{icon-image: jewish-m.svg;}
-node|z16[amenity=place_of_worship][religion=taoist],
-area|z16[amenity=place_of_worship][religion=taoist]
-{icon-image: taoist-m.svg;}
 
-node|z17-[amenity=place_of_worship],
-area|z17-[amenity=place_of_worship]
-{icon-image: place-of-worship-l.svg;}
-node|z17-[amenity=place_of_worship][religion=christian],
-area|z17-[amenity=place_of_worship][religion=christian]
-{icon-image: christian-l.svg;}
-node|z17-[amenity=place_of_worship][religion=muslim],
-area|z17-[amenity=place_of_worship][religion=muslim]
-{icon-image: muslim-l.svg;}
-node|z17-[amenity=place_of_worship][religion=buddhist],
-area|z17-[amenity=place_of_worship][religion=buddhist]
-{icon-image: buddhist-l.svg;}
-node|z17-[amenity=place_of_worship][religion=hindu],
-area|z17-[amenity=place_of_worship][religion=hindu]
-{icon-image: hindu-l.svg;}
-node|z17-[amenity=place_of_worship][religion=shinto],
-area|z17-[amenity=place_of_worship][religion=shinto]
-{icon-image: shinto-l.svg;}
-node|z17-[amenity=place_of_worship][religion=jewish],
-area|z17-[amenity=place_of_worship][religion=jewish]
-{icon-image: jewish-l.svg;}
-node|z17-[amenity=place_of_worship][religion=taoist],
-area|z17-[amenity=place_of_worship][religion=taoist]
-{icon-image: taoist-l.svg;}
+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;}
+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;}
+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;}
+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;}
+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;}
+
+
+node|z18-[amenity=place_of_worship],
+area|z18-[amenity=place_of_worship]
+{icon-image: place-of-worship-l.svg;font-size: 13.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;}
+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;}
+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;}
+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;}
+
 
 /* 5.5 Others */
 
-/*node|z16-[amenity=nightclub],
-area|z16-[amenity=nightclub]
-{icon-image: bar-l.svg;font-size: 11;}*/
 
-/*node|z16[amenity=bank],
-area|z16[amenity=bank]
-{icon-image: bank-m.svg;text-offset: 6;font-size: 11;}*/
 node|z17[amenity=bank],
 area|z17[amenity=bank]
-{icon-image: bank-m.svg;font-size: 12.75; icon-min-distance: 15}
+{icon-image: bank-l.svg;font-size: 12.75; icon-min-distance: 15}
 node|z18-[amenity=bank],
 area|z18-[amenity=bank]
-{icon-image: bank-l.svg;font-size: 13; icon-min-distance: 10}
-
-/*node|z15-[landuse=landfill],
-area|z15-[landuse=landfill]
-{icon-image: recycling-m.svg;text-offset: 8;font-size: 10;}
-node|z17-[landuse=landfill],
-area|z17-[landuse=landfill]
-{icon-image: recycling-l.svg;text-offset: 8;font-size: 10;}*/
-
-/*node|z16-[leisure=water_park],
-area|z16-[leisure=water_park]
-{icon-image: swimming-m.svg;icon-min-distance: 10}
-node|z17-[leisure=water_park],
-area|z17-[leisure=water_park]
-{icon-image: swimming-l.svg;}
-node|z18-[leisure=water_park],
-area|z18-[leisure=water_park]
-{icon-image: swimming-l.svg;font-size: 11;}
-
-node|z16[amenity=fountain],
-area|z16[amenity=fountain]
-{icon-image: fountain-m.svg;icon-min-distance: 20;}
-node|z17-[amenity=fountain],
-area|z17-[amenity=fountain]
-{icon-image: fountain-l.svg;icon-min-distance: 24;}
-
-node|z14[man_made=lighthouse],
-area|z14[man_made=lighthouse]
-{icon-image: lighthouse-s.svg;text-offset: 6;icon-min-distance: 5;}
-node|z15-16[man_made=lighthouse],
-area|z15-16[man_made=lighthouse]
-{icon-image: lighthouse-m.svg;}
-node|z17-[man_made=lighthouse],
-area|z17-[man_made=lighthouse]
-{icon-image: lighthouse-l.svg;}*/
+{icon-image: bank-xl.svg;font-size: 13.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;}
 node|z15-16[barrier=toll_booth],
 area|z15-16[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
+{icon-image: toll_booth-l.svg;icon-min-distance: 8;}
 node|z17-[barrier=toll_booth],
 area|z17-[barrier=toll_booth]
-{icon-image: toll_booth-m.svg;icon-min-distance: 8;}
+{icon-image: toll_booth-xl.svg;icon-min-distance: 8;}
 
 node|z15-[barrier=border_control]
 {icon-image:bcontrol-m.svg;}
 node|z17-[barrier=border_control]
 {icon-image:bcontrol-l.svg;}
-/*line|z16-[barrier=block],
-line|z16-[barrier=bollard],
-line|z16-[barrier=entrance],
-line|z16-[barrier=gate],
-line|z16-[barrier=stile],
-line|z16-[power=tower],
-{icon-image: dot-m.svg;font-size: 11;}*/
-
-/*node|z16[amenity=taxi],
-area|z16[amenity=taxi]
-{icon-image: taxi-m.svg;icon-min-distance: 30;}
-node|z17[amenity=taxi],
-area|z17[amenity=taxi]
-{icon-image: taxi-l.svg;icon-min-distance: 20;}
-node|z18-[amenity=taxi],
-area|z18-[amenity=taxi]
-{icon-image: taxi-l.svg;}*/
+
 
 node|z16-[barrier=lift_gate],
 area|z16-[barrier=lift_gate]
@@ -2003,114 +791,6 @@ node|z18-[barrier=lift_gate],
 area|z18-[barrier=lift_gate]
 {icon-image: lift_gate-l.svg;}
 
-/*node|z16-[leisure=dog_park],
-area|z16-[leisure=dog_park]
-{icon-image: dog_park-m.svg;icon-min-distance: 30;}
-node|z17-[leisure=dog_park],
-area|z17-[leisure=dog_park]
-{icon-image: dog_park-l.svg;icon-min-distance: 20;}
-node|z18-[leisure=dog_park],
-area|z18-[leisure=dog_park]
-{icon-image: dog_park-l.svg;}
-
-node|z16-[leisure=water_park],
-area|z16-[leisure=water_park]
-{icon-image: swimming-m.svg;icon-min-distance: 30;}
-node|z17-[leisure=water_park],
-area|z17-[leisure=water_park]
-{icon-image: swimming-l.svg;icon-min-distance: 20;}
-node|z18-[leisure=water_park],
-area|z18-[leisure=water_park]
-{icon-image: swimming-l.svg;}
-
-node|z16-[man_made=windmill],
-area|z16-[man_made=windmill]
-{icon-image: windmill-m.svg;icon-min-distance: 30;}
-node|z17-[man_made=windmill],
-area|z17-[man_made=windmill]
-{icon-image: windmill-l.svg;icon-min-distance: 20;}
-node|z18-[man_made=windmill],
-area|z18-[man_made=windmill]
-{icon-image: windmill-l.svg;}
-
-node|z17-[amenity=casino],
-area|z17-[amenity=casino]
-{icon-image: casino-l.svg;icon-min-distance: 20;}
-node|z18-[amenity=casino],
-area|z18-[amenity=casino]
-{icon-image: casino-l.svg;}
-
-node|z17[amenity=courthouse],
-area|z17[amenity=courthouse]
-{icon-image: public-building-l.svg;}
-node|z18-[amenity=courthouse],
-area|z18-[amenity=courthouse]
-{icon-image: public-building-l.svg;}
-
-node|z17[amenity=cinema],
-area|z17[amenity=cinema]
-{icon-image: cinema-l.svg;}
-node|z18-[amenity=cinema],
-area|z18-[amenity=cinema]
-{icon-image: cinema-l.svg;font-size: 11;}
-
-node|z17[amenity=police],
-area|z17[amenity=police]
-{icon-image: police-l.svg;}
-node|z18-[amenity=police],
-area|z18-[amenity=police]
-{icon-image: police-l.svg;font-size: 11;}
-
-node|z17[amenity=embassy],
-area|z17[amenity=embassy]
-{icon-image: embassy-l.svg;}
-node|z18-[amenity=embassy],
-area|z18-[amenity=embassy]
-{icon-image: embassy-l.svg;font-size: 11;}
-
-node|z17[amenity=bicycle_rental],
-area|z17[amenity=bicycle_rental]
-{icon-image: bicycle-l.svg;}
-node|z18-[amenity=bicycle_rental],
-area|z18-[amenity=bicycle_rental]
-{icon-image: bicycle-l.svg;font-size: 11;}
-
-node|z17[amenity=post_office]
-{icon-image: mail-l.svg;}
-node|z18-[amenity=post_office]
-{icon-image: mail-m.svg;font-size: 11;}
-node|z18-[amenity=post_box],
-area|z18-[amenity=post_box]
-{icon-image: postbox-l.svg;font-size: 11;}
-
-node|z17-[office=lawyer],
-area|z17-[office=lawyer]
-{icon-image: lawyer-l.svg;icon-min-distance: 10;}
-
-node|z17-[amenity=telephone]
-node|z17-[emergency=phone]
-{icon-image: phone-l.svg;icon-min-distance: 30;}
-node|z18-[amenity=telephone]
-node|z18-[emergency=phone]
-{icon-image: phone-l.svg;}
-
-node|z17-[amenity=recycling],
-area|z17-[amenity=recycling],
-{icon-image: recycling-l.svg;icon-min-distance: 30;}
-node|z18-[amenity=recycling],
-area|z19-[amenity=recycling],
-{icon-image: recycling-l.svg;}
-
-node|z17-[power=station],
-area|z17-[power=station],
-node|z17-[power=substation],
-area|z17-[power=substation]
-{icon-image: power-l.svg;font-size: 11;icon-min-distance: 20;}
-node|z18-[power=station],
-area|z18-[power=station],
-node|z18-[power=substation],
-area|z18-[power=substation]
-{icon-image: power-l.svg;font-size: 11;z-index: 2400;}*/
 
 node|z17-[amenity=vending_machine],
 area|z17-[amenity=vending_machine]
@@ -2125,397 +805,88 @@ node|z18-[vending=parking_tickets],
 area|z18-[vending=parking_tickets]
 {icon-image: parking-meter-l.svg;}
 
-/*node|z17-[aeroway=gate],
-area|z17-[aeroway=gate]
-{icon-image: gate-l.svg;font-size: 11;}
-node|z18-[aeroway=gate],
-area|z18-[aeroway=gate]
-{icon-image: gate-l.svg;tfont-size: 11; z-index: 24200;}/*check*/
-
-/*node|z17-[amenity=bureau_de_change]
-{icon-image: banknote-l.svg;font-size: 11;}
-
-node|z18-[amenity=fire_station],
-area|z18-[amenity=fire_station]
-{icon-image: fire_station-l.svg;font-size: 11;}
-node|z18-[amenity=toilets],
-area|z18-[amenity=toilets]
-{icon-image: toilets-l.svg;font-size: 11;}
-node|z18-[amenity=atm],
-area|z18-[amenity=atm]
-{z-index: 4200;icon-image: atm-l.svg;font-size: 11;}
-
-node|z18-[amenity=bench]
-{icon-image: bench.svg;}
-node|z18-[amenity=waste_basket]
-{icon-image: waste-basket-s.svg;}
-
-node|z18-[amenity=library]
-{icon-image: library-l.svg;font-size: 11;}
-node|z18-[amenity=waste_disposal],
-area|z18-[amenity=waste_disposal]
-{icon-image: recycling-l.svg;font-size: 11;}
-
-node|z18-[amenity=hunting_stand],
-area|z18-[amenity=hunting_stand]
-{icon-image: hunting-tower-l.svg;font-size: 11;}
-
-node|z18-[man_made=chimney],
-area|z18-[man_made=chimney]
-{icon-image: chimney-l.svg;font-size: 11;}
-
-node|z18-[amenity=bbq],
-area|z18-[amenity=bbq]
-{icon-image: bbq-l.svg;font-size: 11;-x-me-text-priority:16000;}
-
-node|z19-[man_made=survey_point]
-{icon-image: survey_point-l.svg;}*/
 
 /* 6. SHOP */
-node|z16-[shop],
-area|z16-[shop]
-{icon-image: shop-m.svg;text-offset: 10;font-size: 10;icon-min-distance: 20}
-node|z17-[shop],
-area|z17-[shop]
-{icon-image: shop-l.svg;text-offset: 10;font-size: 10;icon-min-distance: 27}
-
-node|z12-[shop=mall],
-area|z12-[shop=mall],
+
+
+node|z14-[shop=mall],
+area|z14-[shop=mall],
 node|z14-[shop=supermarket],
 area|z14-[shop=supermarket],
 node|z15-[shop=car_repair][service=tyres],
 area|z15-[shop=car_repair][service=tyres],
 {text: name;text-color: @poi_label;text-offset: 8;font-size: 11.5;text-min-distance: 3;}
 
-node|z12[shop=mall],
-area|z12[shop=mall]
-{icon-image: shop-s.svg;icon-min-distance: 4;-x-me-icon-priority:15000; -x-me-text-priority:15500;}
-node|z13[shop=mall],
-area|z13[shop=mall]
-{icon-image: shop-s.svg;icon-min-distance: 4;-x-me-icon-priority:15000; -x-me-text-priority:15500;}
+
 node|z14[shop=mall],
 area|z14[shop=mall]
-{icon-image: shop-s.svg;icon-min-distance: 5;-x-me-icon-priority:15500;-x-me-text-priority:15500;}
-node|z15-16[shop=mall],
-area|z15-16[shop=mall]
-{icon-image: shop-m.svg;font-size:12;icon-min-distance: 6;-x-me-icon-priority:15500; -x-me-text-priority:15500;}
-node|z17-[shop=mall],
-area|z17-[shop=mall]
+{icon-image: shop-m.svg;font-size:12.25;icon-min-distance: 5;-x-me-icon-priority:15500;-x-me-text-priority:15500;}
+node|z15[shop=mall],
+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;}
+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;}
 
 node|z14[shop=supermarket],
 area|z14[shop=supermarket]
-{icon-image: grocery-s.svg;icon-min-distance: 4;}
+{icon-image: grocery-m.svg;font-size:12.25;icon-min-distance: 4;}
 node|z15[shop=supermarket],
 area|z15[shop=supermarket]
-{icon-image: grocery-m.svg;font-size:12;icon-min-distance: 3;}
-node|z16[shop=supermarket],
-area|z16[shop=supermarket]
-{icon-image: grocery-m.svg;font-size: 12;icon-min-distance: 16;text-min-distance:6;}
-/*node|z16[amenity=marketplace],
-area|z16[amenity=marketplace]
-{icon-image: marketplace-s.svg;text-offset: 11;font-size: 11;icon-min-distance: 24;}*/
-node|z17-[shop=supermarket],
-area|z17-[shop=supermarket]
-{icon-image: grocery-l.svg;font-size: 12.75;icon-min-distance: 15;}
-/*node|z17[amenity=marketplace],
-area|z17[amenity=marketplace]
-{icon-image: marketplace-m.svg;font-size: 11;icon-min-distance: 8;}
-node|z18-[amenity=marketplace],
-area|z18-[amenity=marketplace]
-{icon-image: marketplace-m.svg;font-size: 11;}*/
+{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;}
+
+
+node|z18-[shop=supermarket],
+area|z18-[shop=supermarket]
+{icon-image: grocery-xl.svg;font-size: 13.5;icon-min-distance: 15;}
+
 
 node|z15[shop=car_repair][service=tyres],
 area|z15[shop=car_repair][service=tyres]
-{icon-image: car-repair-m.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: car-repair-m.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;font-size:12.5;}
 node|z16[shop=car_repair][service=tyres],
 area|z16[shop=car_repair][service=tyres]
-{icon-image: car-repair-m.svg;;-x-me-text-priority:15500;}
+{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;}
+{icon-image: car-repair-l.svg;font-size: 12.75;}
 node|z18-[shop=car_repair][service=tyres],
 area|z18-[shop=car_repair][service=tyres]
-{icon-image: car-repair-l.svg;font-size: 13;}
-
-/*node|z16-[shop],
-area|z16-[shop]
-{icon-image: shop-m.svg;text-offset: 10;font-size: 10;icon-min-distance: 10}
-node|z17-[shop],
-area|z17-[shop]
-{icon-image: shop-l.svg;text-offset: 10;font-size: 10;icon-min-distance: 10}*/
-
-/*node|z17[shop=alcohol],
-area|z17[shop=alcohol]
-{icon-image: alcohol-l.svg;icon-min-distance: 24;}
-node|z17[shop=wine],
-area|z17[shop=wine]
-{icon-image: alcohol-l.svg;icon-min-distance: 24;}
-node|z17[shop=books],
-area|z17[shop=books]
-{icon-image: book-shop-l.svg;icon-min-distance: 24;}
-node|z17[shop=bookmaker],
-area|z17[shop=bookmaker]
-{icon-image: bookmaker-l.svg;icon-min-distance: 24;}
-node|z17[shop=bakery],
-area|z17[shop=bakery]
-{icon-image: bakery-l.svg;icon-min-distance: 24;}
-node|z17[shop=beauty],
-area|z17[shop=beauty]
-{icon-image: beauty-l.svg;icon-min-distance: 24;}
-node|z17[shop=cosmetics],
-area|z17[shop=cosmetics]
-{icon-image: beauty-l.svg;icon-min-distance: 24;}
-node|z17[shop=beverages],
-area|z17[shop=beverages]
-{icon-image: alcohol-l.svg;icon-min-distance: 24;}
-node|z17[shop=bicycle],
-area|z17[shop=bicycle]
-{icon-image: shop-bicycle-l.svg;icon-min-distance: 24;}
-node|z17[shop=butcher],
-area|z17[shop=butcher]
-{icon-image: butcher-l.svg;icon-min-distance: 24;}*/
+{icon-image: car-repair-l.svg;font-size: 13.5;}
+
+
 node|z17[shop=car],
 area|z17[shop=car]
-{icon-image: car_shop-l.svg;icon-min-distance: 24;}
+{icon-image: car_shop-l.svg;icon-min-distance: 24;font-size: 12.75;}
 node|z17[shop=motorcycle],
 area|z17[shop=motorcycle]
-{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;}
+{icon-image: motorcycle_shop-l.svg;icon-min-distance: 24;font-size: 12.75;}
 node|z17[shop=car_parts],
 area|z17[shop=car_parts]
-{icon-image: car-part-l.svg;icon-min-distance: 24;}
+{icon-image: car-part-l.svg;icon-min-distance: 24;font-size: 12.75;}
 node|z17[shop=car_repair],
 area|z17[shop=car_repair]
-{icon-image: car-repair-l.svg;icon-min-distance: 24;}
-/*node|z17[shop=tyres],
-area|z17[shop=tyres]
-{icon-image: car-repair-l.svg;icon-min-distance: 24;}
-node|z17[shop=chemist],
-area|z17[shop=chemist]
-{icon-image: chemist-l.svg;icon-min-distance: 24;}
-node|z17[shop=clothes],
-area|z17[shop=clothes]
-{icon-image: clothes-l.svg;icon-min-distance: 24;}
-node|z17[shop=computer],
-area|z17[shop=computer]
-{icon-image: computer-l.svg;icon-min-distance: 24;}
-node|z17[shop=confectionery],
-area|z17[shop=confectionery]
-{icon-image: sweets-l.svg;icon-min-distance: 24;}
-node|z17[shop=convenience],
-area|z17[shop=convenience]
-{icon-image: grocery-l.svg;icon-min-distance: 24;}
-node|z17[shop=copyshop],
-area|z17[shop=copyshop]
-{icon-image: copyshop-l.svg;icon-min-distance: 24;}
-node|z17[shop=photo],
-area|z17[shop=photo]
-{icon-image: photo-shop-l.svg;icon-min-distance: 24;}
-node|z17[shop=pet],
-area|z17[shop=pet]
-{icon-image: petshop-l.svg;icon-min-distance: 24;}
-node|z17[shop=department_store],
-area|z17[shop=department_store]
-{icon-image: department_store-l.svg;icon-min-distance: 24;}
-node|z17[shop=doityourself],
-area|z17[shop=doityourself]
-{icon-image: doityourself-l.svg;icon-min-distance: 24;}
-node|z17[shop=electronics],
-area|z17[shop=electronics]
-{icon-image: electronics-l.svg;icon-min-distance: 24;}
-node|z17[shop=florist],
-area|z17[shop=florist]
-{icon-image: florist-l.svg;icon-min-distance: 24;}
-node|z17[shop=furniture],
-area|z17[shop=furniture]
-{icon-image: furniture-l.svg;icon-min-distance: 24;}
-node|z17[shop=garden_centre],
-area|z17[shop=garden_centre]
-{icon-image: garden_center-l.svg;icon-min-distance: 24;}
-node|z17[shop=gift],
-area|z17[shop=gift]
-{icon-image: gift-l.svg;icon-min-distance: 24;}
-node|z17[shop=greengrocer],
-area|z17[shop=greengrocer]
-{icon-image: greengrocer-l.svg;icon-min-distance: 24;}
-node|z17[shop=hairdresser],
-area|z17[shop=hairdresser]
-{icon-image: hairdresser-l.svg;icon-min-distance: 24;}
-node|z17[shop=hardware],
-area|z17[shop=hardware]
-{icon-image: doityourself-l.svg;icon-min-distance: 24;}
-node|z17[shop=jewelry],
-area|z17[shop=jewelry]
-{icon-image: jewelry-l.svg;icon-min-distance: 24;}
-node|z17[shop=kiosk],
-area|z17[shop=kiosk]
-{icon-image: kiosk-l.svg;icon-min-distance: 24;}
-node|z17[shop=laundry],
-area|z17[shop=laundry]
-{icon-image:laundry-l.svg;icon-min-distance: 24;}
-node|z17[shop=dry_cleaning],
-area|z17[shop=dry_cleaning]
-{icon-image:laundry-l.svg;icon-min-distance: 24;}
-node|z17[shop=mobile_phone],
-area|z17[shop=mobile_phone]
-{icon-image: mobile_phone-l.svg;icon-min-distance: 24;}
-node|z17[shop=optician],
-area|z17[shop=optician]
-{icon-image: optician-l.svg;icon-min-distance: 24;}
-node|z17[shop=outdoor],
-area|z17[shop=outdoor]
-{icon-image: outdoor-shop-l.svg;icon-min-distance: 24;}
-node|z17[shop=seafood],
-area|z17[shop=seafood]
-{icon-image: seafood-shop-l.svg;icon-min-distance: 24;}
-node|z17[shop=shoes],
-area|z17[shop=shoes]
-{icon-image: shoes-l.svg;icon-min-distance: 24;}
-node|z17[shop=sports],
-area|z17[shop=sports]
-{icon-image: sports-l.svg;icon-min-distance: 24;}
-node|z17[shop=ticket],
-area|z17[shop=ticket]
-{icon-image: ticket-shop-l.svg;icon-min-distance: 24;}
-node|z17[shop=toys],
-area|z17[shop=toys]
-{icon-image: toys-l.svg;icon-min-distance: 24;}*/
-
-/*node|z18-[shop=alcohol],
-area|z18-[shop=alcohol]
-{icon-image: alcohol-l.svg;}
-node|z18-[shop=wine],
-area|z18-[shop=wine]
-{icon-image: alcohol-l.svg;}
-node|z18-[shop=books],
-area|z18-[shop=books]
-{icon-image: book-shop-l.svg;}
-node|z18-[shop=bookmaker],
-area|z18-[shop=bookmaker]
-{icon-image: bookmaker-l.svg;}
-node|z18-[shop=bakery],
-area|z18-[shop=bakery]
-{icon-image: bakery-l.svg;}
-node|z18-[shop=beauty],
-area|z18-[shop=beauty]
-{icon-image: beauty-l.svg;}
-node|z18-[shop=cosmetics],
-area|z18-[shop=cosmetics]
-{icon-image: beauty-l.svg;}
-node|z18-[shop=beverages],
-area|z18-[shop=beverages]
-{icon-image: alcohol-l.svg;}
-node|z18-[shop=bicycle],
-area|z18-[shop=bicycle]
-{icon-image: shop-bicycle-l.svg;}
-node|z18-[shop=butcher],
-area|z18-[shop=butcher]
-{icon-image: butcher-l.svg;}*/
+{icon-image: car-repair-l.svg;icon-min-distance: 24;font-size: 12.75;}
+
 node|z18-[shop=car],
 area|z18-[shop=car]
-{icon-image: car_shop-l.svg;}
+{icon-image: car_shop-xl.svg;font-size: 13.5;}
 node|z18-[shop=motorcycle],
 area|z18-[shop=motorcycle]
-{icon-image: motorcycle_shop-l.svg;}
+{icon-image: motorcycle_shop-l.svg;font-size: 13.5;}
 node|z18-[shop=car_parts],
 area|z18-[shop=car_parts]
-{icon-image: car-part-l.svg;}
+{icon-image: car-part-xl.svg;font-size: 13.5;}
 node|z18-[shop=car_repair],
 area|z18-[shop=car_repair]
-{icon-image: car-repair-l.svg;}
-/*node|z18-[shop=tyres],
-area|z18-[shop=tyres]
-{icon-image: car-repair-l.svg;}
-node|z18-[shop=chemist],
-area|z18-[shop=chemist]
-{icon-image: chemist-l.svg;}
-node|z18-[shop=clothes],
-area|z18-[shop=clothes]
-{icon-image: clothes-l.svg;}
-node|z18-[shop=computer],
-area|z18-[shop=computer]
-{icon-image: computer-l.svg;}
-node|z18-[shop=confectionery],
-area|z18-[shop=confectionery]
-{icon-image: sweets-l.svg;}
-node|z18-[shop=convenience],
-area|z18-[shop=convenience]
-{icon-image: grocery-l.svg;}
-node|z18-[shop=copyshop],
-area|z18-[shop=copyshop]
-{icon-image: copyshop-l.svg;}
-node|z18-[shop=photo],
-area|z18-[shop=photo]
-{icon-image: photo-shop-l.svg;}
-node|z18-[shop=pet],
-area|z18-[shop=pet]
-{icon-image: petshop-l.svg;}
-node|z18-[shop=department_store],
-area|z18-[shop=department_store]
-{icon-image: department_store-l.svg;}
-node|z18-[shop=doityourself],
-area|z18-[shop=doityourself]
-{icon-image: doityourself-l.svg;}
-node|z18-[shop=electronics],
-area|z18-[shop=electronics]
-{icon-image: electronics-l.svg;}
-node|z18-[shop=florist],
-area|z18-[shop=florist]
-{icon-image: florist-l.svg;}
-node|z18-[shop=furniture],
-area|z18-[shop=furniture]
-{icon-image: furniture-l.svg;}
-node|z18-[shop=garden_centre],
-area|z18-[shop=garden_centre]
-{icon-image: garden_center-l.svg;}
-node|z18-[shop=gift],
-area|z18-[shop=gift]
-{icon-image: gift-l.svg;}
-node|z18-[shop=greengrocer],
-area|z18-[shop=greengrocer]
-{icon-image: greengrocer-l.svg;}
-node|z18-[shop=hairdresser],
-area|z18-[shop=hairdresser]
-{icon-image: hairdresser-l.svg;}
-node|z18-[shop=hardware],
-area|z18-[shop=hardware]
-{icon-image: doityourself-l.svg;}
-node|z18-[shop=jewelry],
-area|z18-[shop=jewelry]
-{icon-image: jewelry-l.svg;}
-node|z18-[shop=kiosk],
-area|z18-[shop=kiosk]
-{icon-image: kiosk-l.svg;}
-node|z18-[shop=laundry],
-area|z18-[shop=laundry]
-{icon-image:laundry-l.svg;}
-node|z18-[shop=dry_cleaning],
-area|z18-[shop=dry_cleaning]
-{icon-image:laundry-l.svg;}
-node|z18-[shop=mobile_phone],
-area|z18-[shop=mobile_phone]
-{icon-image: mobile_phone-l.svg;}
-node|z18-[shop=optician],
-area|z18-[shop=optician]
-{icon-image: optician-l.svg;}
-node|z18-[shop=outdoor],
-area|z18-[shop=outdoor]
-{icon-image: outdoor-shop-l.svg;}
-node|z18-[shop=seafood],
-area|z18-[shop=seafood]
-{icon-image: seafood-shop-l.svg;}
-node|z18-[shop=shoes],
-area|z18-[shop=shoes]
-{icon-image: shoes-l.svg;}
-node|z18-[shop=sports],
-area|z18-[shop=sports]
-{icon-image: sports-l.svg;}
-node|z18-[shop=ticket],
-area|z18-[shop=ticket]
-{icon-image: ticket-shop-l.svg;}
-node|z18-[shop=toys],
-area|z18-[shop=toys]
-{icon-image: toys-l.svg;}*/
+{icon-image: car-repair-xl.svg;font-size: 13.5;}
+
 
 /* 7. CAR */
 
@@ -2525,8 +896,8 @@ node|z14-[amenity=charging_station],
 area|z14-[amenity=charging_station],
 node|z17-[amenity=car_wash],
 area|z17-[amenity=car_wash],
-node|z18-[amenity=parking],
-area|z18-[amenity=parking],
+node|z16-[amenity=parking],
+area|z16-[amenity=parking],
 node|z18-[amenity=car_rental],
 area|z18-[amenity=car_rental],
 node|z18-[amenity=car_sharing],
@@ -2538,79 +909,92 @@ area|z12[amenity=fuel]
 {icon-image: fuel-s.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;}
 node|z13[amenity=fuel],
 area|z13[amenity=fuel]
-{icon-image: fuel-s.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: fuel-m.svg;text-offset: 6;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 11.75;}
 node|z14[amenity=fuel],
 area|z14[amenity=fuel]
-{icon-image: fuel-s.svg;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.25;}
 node|z15[amenity=fuel],
 area|z15[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;}
 node|z16[amenity=fuel],
 area|z16[amenity=fuel]
-{icon-image: fuel-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;}
+{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;}
+{icon-image: fuel-l.svg;font-size: 12.75;}
 node|z18-[amenity=fuel],
 area|z18-[amenity=fuel]
-{icon-image: fuel-l.svg;font-size: 13;text:}
+{icon-image: fuel-xl.svg;font-size: 13.5;text:}
 
 node|z14[amenity=charging_station],
 area|z14[amenity=charging_station]
-{icon-image: charging-station-s.svg;text-offset: 6;font-size: 11;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: charging-station-m.svg;text-offset: 6;font-size: 12.25;-x-me-text-priority:15500;icon-min-distance: 20;}
 node|z15[amenity=charging_station],
 area|z15[amenity=charging_station]
-{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;}
+{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 20;font-size: 12.5;}
 node|z16[amenity=charging_station],
 area|z16[amenity=charging_station]
-{icon-image: charging-station-m.svg;-x-me-text-priority:15500;icon-min-distance: 10;}
+{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;}
+{icon-image: charging-station-l.svg; font-size: 12.75;}
 node|z18-[amenity=charging_station],
 area|z18-[amenity=charging_station]
-{icon-image: charging-station-l.svg;font-size: 12.75;}
+{icon-image: charging-station-xl.svg;font-size: 12.75;}
 
 node|z13[highway=speed_camera]
-{icon-image: speedcam-m.svg;}
-node|z14-[highway=speed_camera]
-{icon-image: speedcam-m.svg;}
+{icon-image: speedcam-l.svg; z-index: 75000;}
+node|z14[highway=speed_camera]
+{icon-image: speedcam-l.svg; z-index: 75000;}
+node|z15[highway=speed_camera]
+{icon-image: speedcam-l.svg; z-index: 75000;}
 node|z16-[highway=speed_camera]
-{icon-image: speedcam1-l.svg;}
+{icon-image: speedcam-xl.svg; z-index: 75000;}
+node|z18-[highway=speed_camera]
+{icon-image: speedcam-xl.svg; z-index: 75000;}
+
 
 node|z17[amenity=car_wash],
 area|z17[amenity=car_wash]
-{icon-image: car-wash-l.svg;font-size: 11;icon-min-distance: 24;}
+{icon-image: car-wash-l.svg;font-size: 12.75;icon-min-distance: 24;}
 node|z18-[amenity=car_wash],
 area|z18-[amenity=car_wash ]
-{icon-image: car-wash-l.svg;text-offset: 10;font-size: 12.75;}
+{icon-image: car-wash-xl.svg;text-offset: 10;font-size: 13.5;}
 
 node|z18-[amenity=car_rental],
 area|z18-[amenity=car_rental]
-{icon-image: car_sharing-l.svg;text-offset: 10;font-size: 11;}
+{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;}
 
 node|z18-[amenity=car_sharing],
 area|z18-[amenity=car_sharing]
-{icon-image: car_sharing-l.svg;text-offset: 10;font-size: 11;}
+{icon-image: car_sharing-xl.svg;text-offset: 10;font-size: 13.5;}
 
 /* 7.1 Parking */
 
+node|z15-16[amenity=parking],
+area|z15-16[amenity=parking]
+{icon-image: parking-m.svg;icon-min-distance: 3;z-index: 20000;}
+node|z15-16[amenity=parking][access=permissive],
+node|z15-16[amenity=parking][access=private]
+{icon-image: zero-icon.svg; icon-min-distance: 3;z-index: 20000;}
+
+
 node|z17[amenity=parking],
 area|z17[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 15;}
+{icon-image: parking-l.svg;icon-min-distance: 15;}
 node|z17[amenity=parking][access=permissive],
 node|z17[amenity=parking][access=private]
 {icon-image: zero-icon.svg;z-index: 6;icon-min-distance: 7;}
 
 node|z18[amenity=parking] area|z18[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 10;}
+{icon-image: parking-xl.svg;icon-min-distance: 10;}
 node|z18[amenity=parking][access=permissive],
 node|z18[amenity=parking][access=private]
 {icon-image: zero-icon.svg;}
 
 node|z19-[amenity=parking],
 area|z19-[amenity=parking]
-{icon-image: parking-m.svg;font-size: 13;icon-min-distance: 6;}
+{icon-image: parking-xl.svg;icon-min-distance: 6;}
 
 /*node|z17-[amenity=bicycle_parking],
 area|z17-[amenity=bicycle_parking]
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index 5844bfe19d..c1aa28645b 100644..100755
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -124,8 +124,7 @@ line[highway=footway][bridge?]::bridgeblack,
 line[highway=steps][bridge?]::bridgeblack,
 line[highway=road][bridge?]::bridgeblack,
 line[highway=service][bridge?]::bridgeblack,
-line[railway=rail][bridge?]::bridgeblack,
-line[railway=tram][bridge?]::bridgeblack,
+line[railway=rail][bridge?]::bridgeblack
 {z-index: 390;}
 
 line[highway=motorway][bridge?]::bridgewhite,
@@ -145,8 +144,7 @@ line[highway=footway][bridge?]::bridgewhite,
 line[highway=steps][bridge?]::bridgewhite,
 line[highway=road][bridge?]::bridgewhite,
 line[highway=service][bridge?]::bridgewhite,
-line[railway=rail][bridge?]::bridgewhite,
-line[railway=tram][bridge?]::bridgewhite,
+line[railway=rail][bridge?]::bridgewhite
 {z-index: 400;}
 
 line[highway=construction],
@@ -204,30 +202,27 @@ line[highway=secondary_link]
 line[highway=secondary]
 {z-index: 800;}
 
-/*line[highway=primary_link]
-{z-index: 840;}*/
+line[highway=primary_link]
+{z-index: 840;}
 
-line[highway=motorway_link],
-line[highway=trunk_link],
+line[highway=primary],
 line|z8-9[highway=world_towns_level],
 line|z8-9[highway=world_level],
 {z-index: 850;}
 
-
-line[highway=primary_link],
-line[highway=primary],
-{z-index: 910;}
+line[highway=motorway_link],
+line[highway=trunk_link]
+{z-index: 890;}
 
 line|z4-7[highway=world_towns_level],
 line|z4-7[highway=world_level],
 line[highway=trunk],
 line[highway=motorway]
-{z-index: 940;}
+{z-index: 900;}
 
 line[railway=monorail],
 line[railway=narrow_gauge],
-line[railway=tram],
-line[railway=tram]::centerline
+line[railway=tram]
 {z-index: 950;}
 
 line[highway=cycleway],
@@ -267,7 +262,7 @@ line[piste:lift=j-bar],
 line[piste:lift=magic_carpet],
 line[piste:lift=platter],
 line[piste:lift=rope_tow],
-line[piste:lift=t-bar],
+line[piste:lift=t-bar]
 {z-index: 6888;}
 
 line[highway]
@@ -301,19 +296,19 @@ line|z7-[highway=trunk],
 line|z7-[highway=motorway],
 line|z13-[highway=motorway_link],
 line|z13-[highway=trunk_link]
-{color: @trunk_orange_light;opacity: 1; casing-linecap: butt; casing-color:@casing_road;}
+{color: @trunk_orange_light;opacity: 1;casing-color:@casing_road;}
 line|z12-[highway=motorway][tunnel?],
 line|z12-[highway=trunk][tunnel?],
 line|z12-[highway=motorway_link][tunnel?],
 line|z12-[highway=trunk_link][tunnel?],
 {casing-width: 1;casing-linecap: butt;casing-color:@trunk_tunnel_casing;}
-line|z14-[highway=motorway][bridge?]::bridgewhite,
-line|z14-[highway=trunk][bridge?]::bridgewhite,
+line|z13-[highway=motorway][bridge?]::bridgewhite,
+line|z13-[highway=trunk][bridge?]::bridgewhite,
 line|z14-[highway=motorway_link][bridge?]::bridgewhite,
 line|z14-[highway=trunk_link][bridge?]::bridgewhite,
 {casing-linecap: butt;casing-color:@bridge_background;}
-line|z14-[highway=motorway][bridge?]::bridgeblack,
-line|z14-[highway=trunk][bridge?]::bridgeblack,
+line|z13-[highway=motorway][bridge?]::bridgeblack,
+line|z13-[highway=trunk][bridge?]::bridgeblack,
 line|z14-[highway=motorway_link][bridge?]::bridgeblack,
 line|z14-[highway=trunk_link][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;}
@@ -334,7 +329,7 @@ line|z10[highway=motorway]
 {color: @trunk_orange_medium; width: 2.5;}
 line|z11[highway=trunk],
 line|z11[highway=motorway]
-{color: @trunk_orange_medium; width: 3.5;}
+{width: 3.5;}
 line|z12[highway=trunk],
 line|z12[highway=motorway]
 {color: @trunk_orange_medium; width: 4;}
@@ -399,52 +394,54 @@ line|z15-[highway=trunk_link][tunnel?]
 
 /* 3.3 Trunk & Motorway bridge 13-22 ZOOM */
 
-
+line|z13[highway=motorway][bridge?]::bridgewhite,
+line|z13[highway=trunk][bridge?]::bridgewhite
+{casing-width: eval(prop("width")+0.2);}
 line|z14-16[highway=motorway][bridge?]::bridgewhite,
 line|z14-16[highway=trunk][bridge?]::bridgewhite,
 line|z14-16[highway=motorway_link][bridge?]::bridgewhite,
 line|z14-16[highway=trunk_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.025);}
+{casing-width: eval(prop("width"));}
 line|z17[highway=motorway][bridge?]::bridgewhite,
 line|z17[highway=trunk][bridge?]::bridgewhite,
 line|z17[highway=motorway_link][bridge?]::bridgewhite,
 line|z17[highway=trunk_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.05);}
+{casing-width: eval(prop("width")+0.8);}
 line|z18-[highway=motorway][bridge?]::bridgewhite,
 line|z18-[highway=trunk][bridge?]::bridgewhite,
 line|z18-[highway=motorway_link][bridge?]::bridgewhite,
 line|z18-[highway=trunk_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.25);}
+{casing-width: eval(prop("width")+1);}
 
-line|z14-16[highway=motorway][bridge?]::bridgeblack,
-line|z14-16[highway=trunk][bridge?]::bridgeblack
+line|z13-16[highway=motorway][bridge?]::bridgeblack,
+line|z13-16[highway=trunk][bridge?]::bridgeblack
 line|z14-16[highway=motorway_link][bridge?]::bridgeblack,
 line|z14-16[highway=trunk_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.05);}
+{casing-width: eval(prop("width")+0.4);}
 line|z17[highway=motorway][bridge?]::bridgeblack,
 line|z17[highway=trunk][bridge?]::bridgeblack,
 line|z17[highway=motorway_link][bridge?]::bridgeblack,
 line|z17[highway=trunk_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.1);}
+{casing-width: eval(prop("width")+1.6);}
 line|z18-[highway=motorway][bridge?]::bridgeblack,
 line|z18-[highway=trunk][bridge?]::bridgeblack,
 line|z18-[highway=motorway_link][bridge?]::bridgeblack,
 line|z18-[highway=trunk_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.5);}
+{casing-width: eval(prop("width")+2);}
 
 /* 4.PRIMARY 8-22 ZOOM */
 
 line|z8-10[highway=primary],
-{color: @primary_orange;opacity: 1;}
+{color: @primary_orange;opacity: 1;casing-linecap: butt;}
 line|z11-14[highway=primary],
 line|z11-14[highway=primary_link]
 {color: @primary_orange_medium;opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
 line|z15-17[highway=primary],
 line|z15-17[highway=primary_link]
-{color: @primary_orange_light;;opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
+{color: @primary_orange_light;opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
 line|z18-[highway=primary],
 line|z18-[highway=primary_link]
-{color: @primary_orange_light;;opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
+{color: @primary_orange_light;opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
 line|z14-[highway=primary][tunnel?],
 line|z14-[highway=primary_link][tunnel?]
 {casing-width: 1;casing-linecap: butt;casing-color: @primary_tunnel_casing;}
@@ -504,20 +501,20 @@ line|z14-16[highway=primary_link][bridge?]::bridgewhite,
 {casing-width: eval(prop("width"));}
 line|z17[highway=primary][bridge?]::bridgewhite,
 line|z17[highway=primary_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.35);}
+{casing-width: eval(prop("width")+0.8);}
 line|z18-[highway=primary][bridge?]::bridgewhite,
 line|z18-[highway=primary_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.7);}
+{casing-width: eval(prop("width")+1);}
 
 line|z14-16[highway=primary][bridge?]::bridgeblack,
 line|z14-16[highway=primary_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.19);}
+{casing-width: eval(prop("width")+0.4);}
 line|z17[highway=primary][bridge?]::bridgeblack,
 line|z17[highway=primary_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.9);}
+{casing-width: eval(prop("width")+1.6);}
 line|z18-[highway=primary][bridge?]::bridgeblack,
 line|z18-[highway=primary_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+1.15);}
+{casing-width: eval(prop("width")+2);}
 
 /* 5.SECONDARY 10-22 ZOOM */
 
@@ -534,7 +531,6 @@ line|z14-[highway=secondary][bridge?]::bridgeblack,
 line|z14-[highway=secondary_link][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;}
 
-
 /* 5.1 Secondary 10-22 ZOOM */
 
 line|z10[highway=secondary]
@@ -580,52 +576,49 @@ line|z14-16[highway=secondary_link][bridge?]::bridgewhite,
 {casing-width: eval(prop("width"));}
 line|z17[highway=secondary][bridge?]::bridgewhite,
 line|z17[highway=secondary_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.35);}
+{casing-width: eval(prop("width")+0.8);}
 line|z18-[highway=secondary][bridge?]::bridgewhite,
 line|z18-[highway=secondary_link][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.6);}
+{casing-width: eval(prop("width")+1);}
 
 line|z14-16[highway=secondary][bridge?]::bridgeblack,
 line|z14-16[highway=secondary_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.19);}
+{casing-width: eval(prop("width")+0.4);}
 line|z17[highway=secondary][bridge?]::bridgeblack,
 line|z17[highway=secondary_link][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.9);}
+{casing-width: eval(prop("width")+1.6);}
 line|z18-[highway=secondary][bridge?]::bridgeblack,
 line|z18-[highway=secondary_link][bridge?]::bridgeblack
-{casing-width: eval(prop("width")+1.15);}
+{casing-width: eval(prop("width")+2);}
 
 /* 6.RESIDENTAL & TERTIARY 11-22 ZOOM */
 
+line|z11-[highway=residential],
 line|z11-[highway=tertiary],
+line|z15-[highway=residential_link],
 line|z15-[highway=tertiary_link],
 {color: @residential; opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
 line|z16-[highway=tertiary][tunnel?],
-line|z16-[highway=tertiary_link][tunnel?]
-{color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;}
-line|z14-[highway=tertiary][bridge?]::bridgewhite,
-line|z14-[highway=tertiary_link][bridge?]::bridgewhite
-{casing-linecap: butt;casing-color:@bridge_background;}
-line|z14-[highway=tertiary][bridge?]::bridgeblack,
-line|z14-[highway=tertiary_link][bridge?]::bridgeblack
-{casing-linecap: butt;casing-color:@bridge_casing;}
-
-line|z11-[highway=residential],
-line|z15-[highway=residential_link],
-{color: @residential; opacity: 1;casing-linecap: butt; casing-color:@casing_road;}
 line|z16-[highway=residential][tunnel?]
+line|z16-[highway=tertiary_link][tunnel?],
 line|z16-[highway=residential_link][tunnel?],
 {color: @tertiary_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @tertiary_tunnel_casing;}
+line|z14-[highway=tertiary][bridge?]::bridgewhite,
 line|z14-[highway=residential][bridge?]::bridgewhite,
+line|z14-[highway=tertiary_link][bridge?]::bridgewhite
 {casing-linecap: butt;casing-color:@bridge_background;}
+line|z14-[highway=tertiary][bridge?]::bridgeblack,
 line|z14-[highway=residential][bridge?]::bridgeblack,
+line|z14-[highway=tertiary_link][bridge?]::bridgeblack
 {casing-linecap: butt;casing-color:@bridge_casing;}
 
 /* 6.1 Residential & Tertiary 11-22 ZOOM */
 
 line|z11[highway=tertiary]
 {width: 0.9;}
-line|z12-13[highway=tertiary]
+line|z12[highway=tertiary]
+{width: 1.22;}
+line|z13[highway=tertiary]
 {width: 1.85;}
 line|z14[highway=tertiary]
 {width: 3.3;}
@@ -649,8 +642,10 @@ line|z19-[highway=tertiary_link]
 
 line|z11[highway=residential],
 {width: 0.3; opacity: 0;}
-line|z12-13[highway=residential],
-{width: 2;}
+line|z12[highway=residential],
+{width: 0.8;}
+line|z13[highway=residential],
+{width: 1.6;}
 line|z14[highway=residential],
 {width: 2.2;}
 line|z15[highway=residential],
@@ -686,24 +681,24 @@ line|z14-16[highway=residential][bridge?]::bridgewhite,
 line|z17[highway=tertiary][bridge?]::bridgewhite,
 line|z17[highway=tertiary_link][bridge?]::bridgewhite,
 line|z17[highway=residential][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.35);}
+{casing-width: eval(prop("width")+0.8);}
 line|z18-[highway=tertiary][bridge?]::bridgewhite,
 line|z18-[highway=tertiary_link][bridge?]::bridgewhite,
 line|z18-[highway=residential][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")+0.7);}
+{casing-width: eval(prop("width")+1);}
 
 line|z14-16[highway=tertiary][bridge?]::bridgeblack,
 line|z14-16[highway=tertiary_link][bridge?]::bridgeblack,
 line|z14-16[highway=residential][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.19);}
+{casing-width: eval(prop("width")+0.4);}
 line|z17[highway=tertiary][bridge?]::bridgeblack,
 line|z17[highway=tertiary_link][bridge?]::bridgeblack,
 line|z17[highway=residential][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+0.6);}
+{casing-width: eval(prop("width")+1.6);}
 line|z18-[highway=tertiary][bridge?]::bridgeblack,
 line|z18-[highway=tertiary_link][bridge?]::bridgeblack,
 line|z18-[highway=residential][bridge?]::bridgeblack,
-{casing-width: eval(prop("width")+1.1);}
+{casing-width: eval(prop("width")+2);}
 
 /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 12-22 ZOOM */
 
@@ -711,14 +706,14 @@ line|z12-13[highway=unclassified],
 line|z12-13[highway=road],
 line|z12-13[highway=living_street],
 line|z12-13[aeroway=runway],
-{color: @unclassified;opacity: 1;}
+{color: @unclassified;opacity: 1;casing-linecap: butt;}
 line|z14-[aeroway=taxiway],
 line|z14-[highway=unclassified],
 line|z14-[highway=road],
 line|z14-[highway=living_street],
 line|z14-[aeroway=runway],
 line|z14-[highway=service],
-{color: @unclassified; opacity: 1;}
+{color: @unclassified; opacity: 1;casing-linecap: butt;}
 line|z16-[highway=unclassified][tunnel?],
 line|z16-[highway=living_street][tunnel?],
 {color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;}
@@ -728,9 +723,6 @@ line|z14-[highway=unclassified][bridge?]::bridgeblack,
 {casing-linecap: butt;casing-color:@bridge_casing;}
 
 /* 7.1 Road, Street, Unclassified 12-22 ZOOM */
-/*line|z12-[highway=unpaved]
-{color: #B020A4; opacity: 1;width: 3.85;}*/
-
 line|z12[highway=unclassified],
 line|z12[highway=road],
 line|z12[highway=living_street]
@@ -805,7 +797,7 @@ line|z19-[highway=service]
 
 /* 8.OTHERS ROADS 13-22 ZOOM */
 
-line|z14-[highway=pedestrian],
+line|z13-[highway=pedestrian],
 line|z13-[highway=ford]
 {color: @pedestrian;opacity: 1;}
 line|z13-[highway=cycleway]
@@ -813,54 +805,43 @@ line|z13-[highway=cycleway]
 line|z13-[highway=construction],
 line|z13-[highway=proposed]
 {color: @construction;opacity: 1;}
-line|z14-[highway=pedestrian][bridge?]::bridgewhite,
+line|z13-[highway=pedestrian][bridge?]::bridgewhite,
 line|z13-[highway=footway][bridge?]::bridgewhite
 line|z16-[highway=steps][bridge?]::bridgewhite,
 line|z16-[highway=road][bridge?]::bridgewhite,
 line|z16-[highway=service][bridge?]::bridgewhite
 {casing-linecap: butt;casing-color:@bridge_background;}
-line|z14-[highway=pedestrian][bridge?]::bridgeblack,
+line|z13-[highway=pedestrian][bridge?]::bridgeblack,
 line|z13-[highway=footway][bridge?]::bridgeblack,
 line|z16-[highway=steps][bridge?]::bridgeblack,
 line|z16-[highway=road][bridge?]::bridgeblack,
 line|z16-[highway=service][bridge?]::bridgeblack
 {casing-linecap: butt;casing-color:@bridge_casing;}
-/*line|z14-[highway=track]
-line|z14-[highway=raceway],
-line|z14-[leisure=track],
-line|z14-[route=hiking],
-{color: @track;opacity: 1;}
-line|z14-[highway=bridleway]
-{color: @bridleway;opacity: 1;}*/
-/*line|z16-[highway=footway],
-line|z16-[highway=steps]
-{color: @footway;opacity: 1;}
-line|z16-[highway=pedestrian][tunnel?]
-{color: @unclassified_tunnel;casing-width: 1;casing-linecap: butt;casing-color: @unclassified_tunnel_casing;}*/
+
 
 /* 8.1 Pedestrian & ford 13-22 ZOOM */
 
 /*line|z13[highway=pedestrian],
 line|z13[highway=ford]
-{width: 0.8;dashes: 2,1;opacity: 0;}
+{width: 1;dashes: 2,1;}
 line|z14[highway=pedestrian],
 line|z14[highway=ford]
-{width: 0.75;dashes: 2.6,1.3;opacity: 0;}
+{width: 1.6;dashes: 3.6,1.6;}
 line|z15[highway=pedestrian],
 line|z15[highway=ford]
-{width: 1.1;dashes: 3.1,1.7;opacity: 0;}*/
-/*line|z16[highway=pedestrian],
+{width: 2;dashes: 5,2.2;}
+line|z16[highway=pedestrian],
 line|z16[highway=ford]
-{width: 0.5;dashes: 4,2.2;opacity: 1;}
+{width: 2.4;dashes: 5.4,2.7;}
 line|z17[highway=pedestrian],
 line|z17[highway=ford]
-{width: 0.9;dashes: 5,2;opacity: 1;}
+{width: 3;dashes: 5,2;}
 line|z18[highway=pedestrian],
 line|z18[highway=ford]
-{width: 1;dashes: 7,3;opacity: 1;}
+{width: 4;dashes: 7,3;}
 line|z19-[highway=pedestrian],
 line|z19-[highway=ford]
-{width:1.5;dashes: 16.2,8.1;opacity: 1;}*/
+{width: 5;dashes: 16.2,8.1;}*/
 
 /* 8.2 Pedestrian & ford tunnel 16-22 ZOOM */
 
@@ -871,7 +852,7 @@ line|z19-[highway=ford]
 
 /*line|z13[highway=pedestrian][bridge?]::bridgewhite,
 line|z13[highway=footway][bridge?]::bridgewhite,
-{casing-width: eval(prop("width")-0.2);opacity: 0;}
+{casing-width: eval(prop("width")-0.2);}
 line|z14-[highway=pedestrian][bridge?]::bridgewhite,
 line|z14-[highway=footway][bridge?]::bridgewhite,
 line|z16-[highway=steps][bridge?]::bridgewhite,
@@ -954,9 +935,9 @@ line|z17-18[leisure=track]
 line|z19-[highway=track][tracktype=grade1],
 line|z19-[highway=raceway],
 line|z19-[leisure=track]
-{width:4;}*/
+{width:4;}
 
-/*line|z14[highway=track],
+line|z14[highway=track],
 line|z14[highway=path],
 line|z14[route=hiking]
 {width:0.9;dashes: 2.52,1.35;}
@@ -986,15 +967,15 @@ line|z19-[route=hiking]
 /*line|z14[highway=footway]
 {width: 1;dashes: 2.7,1.26;}
 line|z15[highway=footway]
-{width: 1.3;dashes: 2.7,1.26;}*/
-/*line|z16[highway=footway]
-{width: 0.5;dashes: 3.6,1.8;}
+{width: 1.7;dashes: 2.7,1.26;}
+line|z16[highway=footway]
+{width: 2;dashes: 3.6,1.8;}
 line|z17[highway=footway]
-{width: 0.9;dashes: 4.5,1.8;}
+{width: 2.4;dashes: 4.5,1.8;}
 line|z18[highway=footway]
-{width: 1.7;dashes: 7.2,2.7;}
+{width: 3.4;dashes: 7.2,2.7;}
 line|z19-[highway=footway],
-{width: 2.5;dashes: 9,3.6;}*/
+{width: 4;dashes: 9,3.6;}*/
 
 /* 8.8 Footway & Path tunnel 17-22 ZOOM */
 
@@ -1031,13 +1012,13 @@ line|z19-[highway=bridleway]
 /* 8.10 Steps 16-22 ZOOM */
 
 /*line|z16[highway=steps]
-{width: 0.5;dashes: 1.5,1.5;}
+{width: 5;dashes: 1.5,1.5;}
 line|z17[highway=steps]
-{width: 1;dashes: 2.3,2.3;}
+{width: 7;dashes: 2.3,2.3;}
 line|z18[highway=steps]
-{width: 1.5;dashes: 3.2,3.2;}
+{width: 9;dashes: 3.2,3.2;}
 line|z19-[highway=steps]
-{width: 2.5;dashes: 4,4;}*/
+{width: 11;dashes: 4,4;}*/
 
 /* 8.11 Runway 12-22 ZOOM */
 
@@ -1084,7 +1065,7 @@ line|z16-[railway=tram][bridge?]::bridgewhite,
 line|z14-[railway=rail][bridge?]::bridgeblack,
 line|z14-[railway=light_rail][bridge?]::bridgeblack,
 line|z14-[railway=yard][bridge?]::bridgeblack,
-line|z16-[railway=tram][bridge?]::bridgeblack,
+line|z16-[railway=tram][bridge?]::bridgeblack
 {casing-linecap: butt;casing-color:@bridge_casing;}
 
 /* 9.1 RAIL 11-22 ZOOM */
@@ -1197,8 +1178,7 @@ line|z17-[railway=narrow_gauge]
 {width: 2;}
 
 /* 9.5 Tram line 13-22 ZOOM */
-/*line|z15-[railway=tram]::centerline
-{width: 0.75;}*/
+
 line|z16-[railway=tram]::centerline
 {width: 0.85;}
 line|z17-[railway=tram]::centerline
@@ -1208,8 +1188,6 @@ line|z18-[railway=tram]::centerline
 line|z19-[railway=tram]::centerline
 {width: 2;}
 
-/*line|z15-[railway=tram]
-{width: 2;opacity:1; dashes:0.6,9; linecap:butt;}*/
 line|z16-[railway=tram]
 {width: 1.5;opacity:1;dashes:0.8,12; linecap:butt;}
 line|z17-[railway=tram]
@@ -1219,7 +1197,6 @@ line|z18-[railway=tram]
 line|z19-[railway=tram]
 {width: 7; opacity:1; dashes:1.5,19; linecap:butt;}
 
-
 /* 9.6 Funicular 12-22 ZOOM */
 
 /*line|z12[railway=funicular],
diff --git a/data/styles/vehicle/include/Roads_label.mapcss b/data/styles/vehicle/include/Roads_label.mapcss
index e090099312..4ed05e61c0 100644..100755
--- a/data/styles/vehicle/include/Roads_label.mapcss
+++ b/data/styles/vehicle/include/Roads_label.mapcss
@@ -128,7 +128,10 @@ line[railway=tram]
 
 line[highway=cycleway],
 line[highway=steps],
-node[highway=motorway_junction],
+node[highway=motorway_junction]
+{z-index: 1000;}
+
+line|z15-[hwtag=oneway]::arrows
 {z-index: 1000;}
 
 line[aerialway=cable_car]::dash,
@@ -166,13 +169,119 @@ line[piste:lift=rope_tow],
 line[piste:lift=t-bar],
 {z-index: 6888;}
 
-line[hwtag=oneway]::arrows
-{z-index: 10000;}
-
-
 /* 2.SHIELD 10-22 ZOOM */
 
+line|z10-[highway=motorway],
+line|z10-[highway=trunk],
+line|z10-[highway=motorway_link],
+line|z10-[highway=trunk_link],
+line|z10-[highway=primary],
+line|z10-[highway=primary_link],
+line|z12-[highway=secondary],
+line|z12-[highway=residential],
+line|z12-[highway=tertiary]
+{shield-font-size: 9;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;-x-me-icon-priority: 100000;}
 
+line|z10[highway=motorway],
+line|z10[highway=trunk],
+line|z10[highway=motorway_link],
+line|z10[highway=trunk_link],
+line|z10[highway=primary],
+line|z10[highway=primary_link],
+line|z10[highway=secondary],
+line|z10[highway=residential],
+line|z10[highway=tertiary]
+{shield-min-distance: 30;}
+line|z11[highway=motorway],
+line|z11[highway=trunk],
+line|z11[highway=motorway_link],
+line|z11[highway=trunk_link],
+line|z11[highway=primary],
+line|z11[highway=primary_link],
+line|z11[highway=secondary],
+line|z11[highway=residential],
+line|z11[highway=tertiary]
+{shield-min-distance: 60;}
+line|z12[highway=motorway],
+line|z12[highway=trunk],
+line|z12[highway=motorway_link],
+line|z12[highway=trunk_link],
+line|z12[highway=primary],
+line|z12[highway=primary_link],
+line|z12[highway=secondary],
+line|z12[highway=residential],
+line|z12[highway=tertiary]
+{shield-min-distance: 100;}
+line|z13[highway=motorway],
+line|z13[highway=trunk],
+line|z13[highway=motorway_link],
+line|z13[highway=trunk_link],
+line|z13[highway=primary],
+line|z13[highway=primary_link],
+line|z13[highway=secondary],
+line|z13[highway=residential],
+line|z13[highway=tertiary]
+{shield-min-distance: 120;}
+line|z14[highway=motorway],
+line|z14[highway=trunk],
+line|z14[highway=motorway_link],
+line|z14[highway=trunk_link],
+line|z14[highway=primary],
+line|z14[highway=primary_link],
+line|z14[highway=secondary],
+line|z14[highway=residential],
+line|z14[highway=tertiary]
+{shield-min-distance: 175;}
+line|z15[highway=motorway],
+line|z15[highway=trunk],
+line|z15[highway=motorway_link],
+line|z15[highway=trunk_link],
+line|z15[highway=primary],
+line|z15[highway=primary_link],
+line|z15[highway=secondary],
+line|z15[highway=residential],
+line|z15[highway=tertiary]
+{shield-min-distance: 250;}
+line|z16[highway=motorway],
+line|z16[highway=trunk],
+line|z16[highway=motorway_link],
+line|z16[highway=trunk_link],
+line|z16[highway=primary],
+line|z16[highway=primary_link],
+line|z16[highway=secondary],
+line|z16[highway=residential],
+line|z16[highway=tertiary]
+{shield-min-distance: 300;-x-me-icon-priority: 75000;}
+line|z17[highway=motorway],
+line|z17[highway=trunk],
+line|z17[highway=motorway_link],
+line|z17[highway=trunk_link],
+line|z17[highway=primary],
+line|z17[highway=primary_link],
+line|z17[highway=secondary],
+line|z17[highway=residential],
+line|z17[highway=tertiary]
+{shield-font-size: 10;shield-min-distance: 350;}
+line|z18[highway=motorway],
+line|z18[highway=trunk],
+line|z18[highway=motorway_link],
+line|z18[highway=trunk_link],
+line|z18[highway=primary],
+line|z18[highway=primary_link],
+line|z18[highway=secondary],
+line|z18[highway=residential],
+line|z18[highway=tertiary]
+{shield-font-size: 10;shield-min-distance: 350;}
+line|z19[highway=motorway],
+line|z19[highway=trunk],
+line|z19[highway=motorway_link],
+line|z19[highway=trunk_link],
+line|z19[highway=primary],
+line|z19[highway=primary_link],
+line|z19[highway=secondary],
+line|z19[highway=residential],
+line|z19[highway=tertiary]
+{shield-font-size: 11;shield-min-distance: 350;}
 
 /* 3.TRUNK & MOTORWAY 10-22 ZOOM */
 
@@ -186,30 +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: 11.5;text-color: @label_dark;text-halo-opacity: 0.8;text-halo-color: @label_halo_medium;}
+{font-size: 12;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.5;text-halo-color: @label_halo_medium;}
+{font-size: 13;text-halo-color: @label_halo_light;}
 line|z14-15[highway=motorway],
 line|z14-15[highway=trunk],
-{font-size: 14.5;text-color: @label_dark;text-halo-opacity: 0.8;}
+{font-size: 14;text-color: @label_dark;text-halo-opacity: 0.9;}
 line|z14[highway=motorway_link],
 line|z14[highway=trunk_link]
-{font-size: 12;text-halo-color: @label_halo_medium;}
+{font-size: 11.5;text-halo-color: @label_halo_medium;}
 line|z15[highway=motorway_link],
 line|z15[highway=trunk_link]
-{font-size: 12.5;text-halo-color: @label_halo_medium;}
-line|z16-17[highway=trunk],
-line|z16-17[highway=motorway],
-{font-size: 15.5;text-color: @label_dark;text-halo-opacity: 0.8;}
-line|z16-[highway=motorway_link],
-line|z16-[highway=trunk_link]
-{font-size: 14.5;text-halo-opacity: 1;}
+{font-size: 12;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;}
+line|z16[highway=motorway_link],
+line|z16[highway=trunk_link]
+{font-size: 13.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;}
+line|z17[highway=motorway_link],
+line|z17[highway=trunk_link]
+{font-size: 14;text-halo-opacity: 0.99;}
 line|z18-[highway=trunk],
 line|z18-[highway=motorway],
-{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;}
+{font-size: 18.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;}
 
 /* 4.PRIMARY 10-22 ZOOM */
 
@@ -217,22 +335,31 @@ line|z10-[highway=primary],
 line|z10-[highway=primary_link],
 {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_light;}
 
-line|z10-11[highway=primary],
-line|z10-11[highway=primary_link]
-{font-size: 11;text-halo-color: @label_halo_medium;}
+line|z10[highway=primary],
+line|z10[highway=primary_link]
+{font-size: 11.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;}
 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;}
 line|z14-15[highway=primary],
 {font-size: 13.5;text-color: @label_dark;}
 line|z14[highway=primary_link]
-{font-size: 12;text-halo-color: @label_halo_medium;}
+{font-size: 11;text-halo-color: @label_halo_medium;}
 line|z15[highway=primary_link]
-{font-size: 14;text-halo-color: @label_halo_medium;}
-line|z16-[highway=primary],
+{font-size: 11.5;text-halo-color: @label_halo_medium;}
+line|z16[highway=primary],
 {font-size: 15.5;text-color: @label_dark;}
-line|z16-17[highway=primary_link],
-{font-size: 13.25;}
+line|z16[highway=primary_link],
+{font-size: 13;}
+line|z17[highway=primary],
+{font-size: 16.75;text-color: @label_dark;}
+line|z17[highway=primary_link],
+{font-size: 13.5;}
+line|z18-[highway=primary],
+{font-size: 17;text-color: @label_dark;}
 line|z18-[highway=primary_link],
 {font-size: 14.5;text-halo-opacity: 1;}
 
@@ -247,15 +374,18 @@ line|z10-11[highway=secondary]
 line|z12-13[highway=secondary]
 {font-size: 12;text-color: @label_light;text-halo-opacity: 0.9;text-halo-color: @road_label_halo;}
 line|z14[highway=secondary],
-{font-size: 12.5;}
+{font-size: 12.75;}
 line|z15[highway=secondary],
-{font-size: 13;}
-line|z16-17[highway=secondary],
-line|z16-17[highway=secondary_link]
-{font-size: 14;text-color: @label_dark;text-halo-color: @label_halo_light;}
+{font-size: 13.75;}
+line|z16[highway=secondary],
+line|z16[highway=secondary_link]
+{font-size: 15;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;}
 line|z18-[highway=secondary],
 line|z18-[highway=secondary_link]
-{font-size: 14;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 16;text-color: @label_dark;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 6.RESIDENTAL & TERTIARY 12-22 ZOOM */
 
@@ -270,46 +400,54 @@ line|z12-13[highway=tertiary]
 {font-size: 10;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.5;}
+{font-size: 11;}
 line|z15[highway=residential],
 line|z15[highway=tertiary],
 {font-size: 12.5;}
-line|z16-17[highway=residential],
-line|z16-17[highway=tertiary],
-{font-size: 13;text-halo-color: @label_halo_light;}
+line|z16[highway=residential],
+line|z16[highway=tertiary],
+{font-size: 13.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;}
 line|z18-[highway=residential],
 line|z18-[highway=residential_link],
 line|z18-[highway=tertiary],
 line|z18-[highway=tertiary_link]
-{font-size: 13.5;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 15;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 7.ROAD, STREETS, UNCLASSIFIED & SERVICE 14-22 ZOOM */
 
 line|z14-[highway=unclassified],
 line|z14-[highway=road],
 line|z14-[highway=living_street],
+line|z14-[highway=pedestrian],
 line|z16-[highway=service],
 {text: name;text-color: @label_medium;text-halo-opacity: 0.8;text-halo-radius: 1;text-halo-color: @label_halo_medium;}
 
 line|z14[highway=unclassified],
 line|z14[highway=living_street],
+line|z14[highway=pedestrian],
 line|z14[highway=road],
-{font-size: 11;}
+{font-size: 10.5;}
 line|z15[highway=unclassified],
 line|z15[highway=living_street],
+line|z15[highway=pedestrian],
 line|z15[highway=road],
 {font-size: 11.5;}
 line|z16-17[highway=unclassified],
 line|z16-17[highway=living_street],
-{font-size: 12;text-halo-color: @label_halo_light;}
+{font-size: 12.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;text-halo-color: @label_halo_light;}
+{font-size: 12.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: 12.5;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{font-size: 13.75;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
 /* 8.OTHERS ROADS 15-22 ZOOM */
 
@@ -421,7 +559,7 @@ line|z17-[route=ferry_motorcar]
 /* line|z15-[highway=primary][hwtag=oneway]::arrows <-- не работает по типам магистралей */
 
 line|z15[hwtag=oneway]::arrows
-{pattern-offset: 80; pattern-image: arrow-xs.svg;pattern-spacing: 160;}
+{pattern-offset: 80;pattern-image: arrow-xs.svg;pattern-spacing: 160;}
 line|z16[hwtag=oneway]::arrows
 {pattern-offset: 120;pattern-image: arrow-s.svg;pattern-spacing: 160;}
 line|z17[hwtag=oneway]::arrows
@@ -432,112 +570,9 @@ line|z18-[hwtag=oneway]::arrows
 /* 13.JUNCTION  */
 
 node|z15-[highway=motorway_junction]
-{text: name;text-color: #3A302B;text-position: center;}
+{text: name;text-color: @subway_label;text-position: center;}
 
 node|z15[highway=motorway_junction]
 {font-size: 9;}
 node|z16-[highway=motorway_junction]
 {font-size: 10;}
-
-
-line|z10-[highway=motorway],
-line|z10-[highway=trunk],
-line|z10-[highway=motorway_link],
-line|z10-[highway=trunk_link],
-line|z10-[highway=primary],
-line|z10-[highway=primary_link],
-line|z12-[highway=secondary],
-line|z12-[highway=residential],
-line|z12-[highway=tertiary]
-{shield-font-size: 9;shield-text-color: @shield_text;shield-text-halo-radius: 0;shield-text-halo-color: @shield_text_halo;shield-color: @shield;shield-outline-radius: 1;shield-outline-color: @shield_outline;-x-me-icon-priority: 20000;z-index:60000;}
-
-line|z10[highway=motorway],
-line|z10[highway=trunk],
-line|z10[highway=motorway_link],
-line|z10[highway=trunk_link],
-line|z10[highway=primary],
-line|z10[highway=primary_link],
-line|z10[highway=secondary],
-line|z10[highway=residential],
-line|z10[highway=tertiary]
-{shield-min-distance: 85;-x-me-icon-priority: 75000;z-index:60000;}
-line|z11-12[highway=motorway],
-line|z11-12[highway=trunk],
-line|z11-12[highway=motorway_link],
-line|z11-12[highway=trunk_link],
-line|z11-12[highway=primary],
-line|z11-12[highway=primary_link],
-line|z11-12[highway=secondary],
-line|z11-12[highway=residential],
-line|z11-12[highway=tertiary]
-{shield-min-distance: 90;-x-me-icon-priority: 75000;z-index:60000;}
-line|z13[highway=motorway],
-line|z13[highway=trunk],
-line|z13[highway=motorway_link],
-line|z13[highway=trunk_link],
-line|z13[highway=primary],
-line|z13[highway=primary_link],
-line|z13[highway=secondary],
-line|z13[highway=residential],
-line|z13[highway=tertiary]
-{shield-min-distance: 120;-x-me-icon-priority: 75000;z-index:60000;}
-line|z14[highway=motorway],
-line|z14[highway=trunk],
-line|z14[highway=motorway_link],
-line|z14[highway=trunk_link],
-line|z14[highway=primary],
-line|z14[highway=primary_link],
-line|z14[highway=secondary],
-line|z14[highway=residential],
-line|z14[highway=tertiary]
-{shield-min-distance: 175;-x-me-icon-priority: 75000;z-index:60000;}
-line|z15[highway=motorway],
-line|z15[highway=trunk],
-line|z15[highway=motorway_link],
-line|z15[highway=trunk_link],
-line|z15[highway=primary],
-line|z15[highway=primary_link],
-line|z15[highway=secondary],
-line|z15[highway=residential],
-line|z15[highway=tertiary]
-{shield-min-distance: 250;-x-me-icon-priority: 75000;z-index:60000;}
-line|z16[highway=motorway],
-line|z16[highway=trunk],
-line|z16[highway=motorway_link],
-line|z16[highway=trunk_link],
-line|z16[highway=primary],
-line|z16[highway=primary_link],
-line|z16[highway=secondary],
-line|z16[highway=residential],
-line|z16[highway=tertiary]
-{shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;}
-line|z17[highway=motorway],
-line|z17[highway=trunk],
-line|z17[highway=motorway_link],
-line|z17[highway=trunk_link],
-line|z17[highway=primary],
-line|z17[highway=primary_link],
-line|z17[highway=secondary],
-line|z17[highway=residential],
-line|z17[highway=tertiary]
-{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;}
-line|z18[highway=motorway],
-line|z18[highway=trunk],
-line|z18[highway=motorway_link],
-line|z18[highway=trunk_link],
-line|z18[highway=primary],
-line|z18[highway=primary_link],
-line|z18[highway=secondary],
-line|z18[highway=residential],
-line|z18[highway=tertiary]
-{shield-font-size: 10;shield-min-distance: 300;-x-me-icon-priority: 75000;z-index:60000;}
-line|z19[highway=motorway],
-line|z19[highway=trunk],
-line|z19[highway=motorway_link],
-line|z19[highway=trunk_link],
-line|z19[highway=primary],
-line|z19[highway=primary_link],
-line|z19[highway=secondary],
-line|z19[highway=residential],
-line|z19[highway=tertiary]
-{shield-font-size: 11;shield-min-distance: 350;-x-me-icon-priority: 75000;z-index:60000;}
diff --git a/data/styles/vehicle/style-clear/colors.mapcss b/data/styles/vehicle/style-clear/colors.mapcss
index eab4bdf164..7356464a99 100644
--- a/data/styles/vehicle/style-clear/colors.mapcss
+++ b/data/styles/vehicle/style-clear/colors.mapcss
@@ -121,7 +121,7 @@
 
 @unversity: #F8E4BA;
 @hospital: #F8D9D9;/*FADCDB*/
-@industrial: #DED8E0;/*#D5D5DE; #E4E2EB;*/
+@industrial: #E1DCE3;/*#D5D5DE; #E4E2EB;*/
 @sport: #C8DBAD;
 @parking: #F2F2CE;
 @parking_l: #FCFCC2;/*#F0EBC5;DCDCB9; #F2F2CE;*/
diff --git a/data/styles/vehicle/style-night/colors.mapcss b/data/styles/vehicle/style-night/colors.mapcss
index 7f99fb8486..3c55ac6c4a 100644
--- a/data/styles/vehicle/style-night/colors.mapcss
+++ b/data/styles/vehicle/style-night/colors.mapcss
@@ -61,11 +61,11 @@
 @pedestrian_area_light: #262222;
 @university: #261F13;
 @hospital: #261916;
-@industrial: #141014;
+@industrial: #0D0A0D;
 @sport: #070F0A;
-@parking: #332D14;
-@parking_l: #403819;
 @military: #B71C1C;
+@parking: #191509;
+@parking_l: #1F190A;
 
 /*4.2 Aerodrome*/
 
diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss
index d729a0d3c6..da5762a1c3 100755
--- a/data/styles/vehicle/style-night/style.mapcss
+++ b/data/styles/vehicle/style-night/style.mapcss
@@ -26,10 +26,10 @@ colors
   Selection-opacity: 0.64;
   Route-color: #0087FF;
   RouteOutline-color: #055FCD;
-  RouteTrafficG0-color: #9B2300;
-  RouteTrafficG1-color: #F03C0A;
-  RouteTrafficG2-color: #F03C0A;
-  RouteTrafficG3-color: #F5D728;
+  RouteTrafficG0-color: #5E0F0D;
+  RouteTrafficG1-color: #7F1311;
+  RouteTrafficG2-color: #7F1311;
+  RouteTrafficG3-color: #9E8216;
   RouteTrafficG3-opacity: @traffic_arrow_dark;
   RoutePedestrian-color: #FFB94B;
   RoutePedestrian-opacity: 0.7;
@@ -45,25 +45,25 @@ colors
   TrackCarSpeed-color: #FFCA28;
   TrackPlaneSpeed-color: #FFF5A0;
   TrackUnknownDistance-color: #969696;
-  TrafficG0-color: #410F00;
-  TrafficG1-color: #781919;
-  TrafficG2-color: #781919;
-  TrafficG3-color: #8C5A00;
+  TrafficG0-color: #4C120F;
+  TrafficG1-color: #731816;
+  TrafficG2-color: #731816;
+  TrafficG3-color: #8C7012;
   TrafficG3-opacity: @traffic_arrow_dark;
-  TrafficG4-color: #555519;
-  TrafficG5-color: #285032;
+  TrafficG4-color: #376222;
+  TrafficG5-color: #376222;
   TrafficTempBlock-color: #232323;
   TrafficUnknown-color: #000000;
   TrafficArrowLight-color: #AAAAAA;
   TrafficArrowDark-color: #1E1E1E;
-  TrafficOutline-color: #000000;
-  RoadShieldBlackText-color: #000000;
-  RoadShieldWhiteText-color: #FFFFFF;
-  RoadShieldUKYellowText-color: #FFCC66;
-  RoadShieldBlueBackground-color: #2E6FC9;
-  RoadShieldGreenBackground-color: #22723B;
-  RoadShieldRedBackground-color: #CD2828;
-  RoadShieldOrangeBackground-color: #FFBE00;
+  TrafficOutline-color: #383838;
+  RoadShieldBlackText-color: #212121;
+  RoadShieldWhiteText-color: #B7B6B6;
+  RoadShieldUKYellowText-color: #B49E0E;
+  RoadShieldBlueBackground-color: #294C88;
+  RoadShieldGreenBackground-color: #136C30;
+  RoadShieldRedBackground-color: #9F1A17;
+  RoadShieldOrangeBackground-color: #136C30;
   PoiHotelTextOutline-color: #000000;
   PoiHotelTextOutline-opacity: 0.6;
   PoiDeletedMask-color: #FFFFFF;