Updated styles

17 files changed, 32 insertions, 121 deletions

diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 9e9d084dd8..6efacbaf32 100755
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -191,7 +191,6 @@ node[amenity=shelter],
 area[amenity=shelter],
 node[highway=rest_area],
 area[highway=rest_area],
-node[highway=speed_camera],
 node[amenity=school],
 area[amenity=school],
 node[amenity=bicycle_rental],
@@ -2680,11 +2679,6 @@ node|z18-[amenity=charging_station],
 area|z18-[amenity=charging_station]
 {icon-image: charging-station-l.svg;font-size: 11;}
 
-node|z16[highway=speed_camera]
-{icon-image: speedcam-m.svg;}
-node|z17-[highway=speed_camera]
-{icon-image: speedcam-l.svg;}
-
 node|z17[amenity=car_wash],
 area|z17[amenity=car_wash]
 {icon-image: car-wash-l.svg;font-size: 11;icon-min-distance: 24;}
diff --git a/data/styles/clear/style-clear/symbols/speedcam-l.svg b/data/styles/clear/style-clear/symbols/speedcam-l.svg
index 5f02c75dae..459d01d3cc 100644
--- a/data/styles/clear/style-clear/symbols/speedcam-l.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam-l.svg
@@ -1,7 +1,7 @@
 <svg width="24" height="24" viewBox="0 0 24 24">
   <g fill="none" fill-rule="evenodd">
-    <rect width="24" height="24" fill="#FFF" opacity=".6" rx="3.5"/>
-    <rect width="22" height="22" x="1" y="1" fill="#F8E81C" rx="3"/>
-    <path fill="#4A4A4A" d="M17.4180495,11.125 L17.4180495,10.4375 C17.4180495,10.058 17.0984067,9.75 16.7037638,9.75 L15.9894781,9.75 L15.9894781,14.5625 L15,14.5625 L15,8.71875 C15,7.7693125 14.2007143,7 13.2142857,7 L6.78571429,7 C5.79928571,7 5,7.7693125 5,8.71875 L5,16.28125 C5,17.2306875 5.79928571,18 6.78571429,18 L13.2142857,18 C14.2007143,18 15,17.2306875 15,16.28125 L15,15.9375 L16.7037638,15.9375 C17.0984067,15.9375 17.4180495,15.6298438 17.4180495,15.25 L17.4180495,14.5625 L18.7037638,14.5625 C18.9012638,14.5625 19.0609067,14.4088437 19,14.21875 L19,11.46875 C19.0609067,11.2786563 18.9012638,11.125 18.7037638,11.125 L17.4180495,11.125 Z M8.5,16.5 C7.395,16.5 6.5,15.6047413 6.5,14.5001667 C6.5,13.395592 7.395,12.5 8.5,12.5 C9.60466667,12.5 10.5,13.395592 10.5,14.5001667 C10.5,15.6047413 9.60466667,16.5 8.5,16.5 L8.5,16.5 Z M12.8932321,9.875 C12.4788571,9.875 12.1428571,9.539375 12.1428571,9.125375 C12.1428571,8.711 12.4788571,8.375 12.8932321,8.375 C13.3072321,8.375 13.6428571,8.711 13.6428571,9.125375 C13.6428571,9.539375 13.3072321,9.875 12.8932321,9.875 L12.8932321,9.875 Z"/>
+    <rect width="24" height="24" fill="#FFF" opacity=".6" rx="3"/>
+    <path fill="#000" d="M3,1 L21,1 L21,1 C22.1045695,1 23,1.8954305 23,3 L23,21 L23,21 C23,22.1045695 22.1045695,23 21,23 L3,23 L3,23 C1.8954305,23 1,22.1045695 1,21 L1,3 L1,3 C1,1.8954305 1.8954305,1 3,1 Z"/>
+    <path fill="#FFF" d="M17,13 L17,15 C17,16.1045695 16.1045695,17 15,17 L9,17 C7.8954305,17 7,16.1045695 7,15 L7,13 L5,13 L5,9 C5,6.790861 6.790861,5 9,5 L15,5 C17.209139,5 19,6.790861 19,9 L19,13 L17,13 L17,13 Z M17,13 L17,9 C17,7.8954305 16.1045695,7 15,7 L9,7 C7.8954305,7 7,7.8954305 7,9 L7,13 L6,13 L6,9 C6,7.34314575 7.34314575,6 9,6 L15,6 C16.6568542,6 18,7.34314575 18,9 L18,13 L17,13 L17,13 Z M12,9.50013642 C10.6193635,9.50013642 9.50013642,10.6193635 9.50013642,12 C9.50013642,13.3806365 10.6193635,14.4998636 12,14.4998636 L12.0001364,14.4998636 C13.380773,14.4998636 14.5,13.3806365 14.5,12 C14.5,10.6193635 13.380773,9.50013642 12.0001364,9.50013642 L12,9.50013642 Z M8.75,14.5 C8.33578644,14.5 8,14.8357864 8,15.25 C8,15.6642136 8.33578644,16 8.75,16 C9.16421356,16 9.5,15.6642136 9.5,15.25 C9.5,14.8357864 9.16421356,14.5 8.75,14.5 Z M11,18 L13,18 L13,20 L11,20 L11,18 Z"/>
   </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 2f6ced59b2..3358ae09c1 100644
--- a/data/styles/clear/style-clear/symbols/speedcam-m.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam-m.svg
@@ -1,7 +1,7 @@
 <svg width="20" height="20" viewBox="0 0 20 20">
   <g fill="none" fill-rule="evenodd">
-    <rect width="20" height="20" fill="#FFF" opacity=".6" rx="2.5"/>
-    <rect width="18" height="18" x="1" y="1" fill="#F8E81C" rx="2"/>
-    <path fill="#4A4A4A" d="M14.6457063,8.53626696 L14.6457063,7.94688914 C14.6457063,7.62155258 14.3716838,7.35751131 14.0333657,7.35751131 L13.4210251,7.35751131 L13.4210251,11.4831561 L12.5727684,11.4831561 L12.5727684,6.47344457 C12.5727684,5.65951379 11.8875593,5 11.0419169,5 L6.5308515,5 C5.68520913,5 5,5.65951379 5,6.47344457 L5,12.9566007 C5,13.7705314 5.68520913,14.4300452 6.5308515,14.4300452 L11.0419169,14.4300452 C11.8875593,14.4300452 12.5727684,13.7705314 12.5727684,12.9566007 L12.5727684,12.6619118 L14.0333657,12.6619118 C14.3716838,12.6619118 14.6457063,12.3981652 14.6457063,12.0725339 L14.6457063,11.4831561 L15.7479194,11.4831561 C15.9172315,11.4831561 16.0540896,11.3514302 16.0018758,11.1884672 L16.0018758,8.83095588 C16.0540896,8.66799291 15.9172315,8.53626696 15.7479194,8.53626696 L14.6457063,8.53626696 Z M6,11.7151476 C6,10.8867166 6.67125,10.2150226 7.5,10.2150226 C8.3285,10.2150226 9,10.8867166 9,11.7151476 C9,12.5435786 8.3285,13.2150226 7.5,13.2150226 C6.67125,13.2150226 6,12.5435786 6,11.7151476 Z M10.7666851,7.46467091 C10.411451,7.46467091 10.123406,7.17694737 10.123406,6.82203476 C10.123406,6.46680067 10.411451,6.17875565 10.7666851,6.17875565 C11.1215977,6.17875565 11.4093213,6.46680067 11.4093213,6.82203476 C11.4093213,7.17694737 11.1215977,7.46467091 10.7666851,7.46467091 L10.7666851,7.46467091 Z"/>
+    <rect width="20" height="20" fill="#FFF" opacity=".6" rx="3"/>
+    <rect width="18" height="18" x="1" y="1" fill="#000" rx="2"/>
+    <path fill="#FFF" d="M14,10 L14,12 C14,13.1045695 13.1045695,14 12,14 L8,14 C6.8954305,14 6,13.1045695 6,12 L6,10 L4,10 L4,8 C4,5.790861 5.790861,4 8,4 L12,4 C14.209139,4 16,5.790861 16,8 L16,10 L14,10 L14,10 Z M14,10 L15,10 L15,8 C15,6.34314575 13.6568542,5 12,5 L8,5 C6.34314575,5 5,6.34314575 5,8 L5,10 L6,10 L6,8 C6,6.8954305 6.8954305,6 8,6 L12,6 C13.1045695,6 14,6.8954305 14,8 L14,10 L14,10 Z M10,8.00010914 C8.89549078,8.00010914 8.00010914,8.89549077 8.00010914,10 C8.00010914,11.1045092 8.89549078,11.9998909 10,11.9998909 L10.0001091,11.9998909 C11.1046184,11.9998909 12,11.1045092 12,10 C12,8.89549077 11.1046184,8.00010914 10.0001091,8.00010914 L10,8.00010914 L10,8.00010914 Z M7.5,12 C7.22385763,12 7,12.2238576 7,12.5 C7,12.7761424 7.22385763,13 7.5,13 C7.77614237,13 8,12.7761424 8,12.5 C8,12.2238576 7.77614237,12 7.5,12 Z M9,14 L11,14 L11,16 L9,16 L9,14 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam-s.svg b/data/styles/clear/style-clear/symbols/speedcam-s.svg
index 3d6997b202..b870597f3b 100644
--- a/data/styles/clear/style-clear/symbols/speedcam-s.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam-s.svg
@@ -1,7 +1,7 @@
 <svg width="12" height="12" viewBox="0 0 12 12">
   <g fill="none" fill-rule="evenodd">
-    <rect width="12" height="12" fill="#FFF" opacity=".6" rx="1.5"/>
-    <rect width="10" height="10" x="1" y="1" fill="#F8E81C" rx="1"/>
-    <path fill="#4A4A4A" d="M2,3.50292933 C2,2.94902676 2.44371665,2.5 2.99980749,2.5 L6.00019251,2.5 C6.55237094,2.5 7,2.93788135 7,3.50292933 L7,8.49707067 C7,9.05097324 6.55628335,9.5 6.00019251,9.5 L2.99980749,9.5 C2.44762906,9.5 2,9.06211865 2,8.49707067 L2,3.50292933 Z M3.875,8.86363636 C4.56535594,8.86363636 5.125,8.29381695 5.125,7.59090909 C5.125,6.88800123 4.56535594,6.31818182 3.875,6.31818182 C3.18464406,6.31818182 2.625,6.88800123 2.625,7.59090909 C2.625,8.29381695 3.18464406,8.86363636 3.875,8.86363636 Z M5.4375,5.20454545 C6.04156145,5.20454545 6.53125,4.70595347 6.53125,4.09090909 C6.53125,3.47586471 6.04156145,2.97727273 5.4375,2.97727273 C4.83343855,2.97727273 4.34375,3.47586471 4.34375,4.09090909 C4.34375,4.70595347 4.83343855,5.20454545 5.4375,5.20454545 Z M8,3.5 L9,3.5 L9,8.5 L8,8.5 L8,3.5 Z M5.4375,4.72727273 C5.09232203,4.72727273 4.8125,4.44236302 4.8125,4.09090909 C4.8125,3.73945516 5.09232203,3.45454545 5.4375,3.45454545 C5.78267797,3.45454545 6.0625,3.73945516 6.0625,4.09090909 C6.0625,4.44236302 5.78267797,4.72727273 5.4375,4.72727273 Z M3.875,8.22727273 C3.52982203,8.22727273 3.25,7.94236302 3.25,7.59090909 C3.25,7.23945516 3.52982203,6.95454545 3.875,6.95454545 C4.22017797,6.95454545 4.5,7.23945516 4.5,7.59090909 C4.5,7.94236302 4.22017797,8.22727273 3.875,8.22727273 Z M9,4.5 L10,4.5 L10,7.5 L9,7.5 L9,4.5 Z"/>
+    <rect width="12" height="12" fill="#FFF" opacity=".6" rx="3"/>
+    <rect width="10" height="10" x="1" y="1" fill="#000" rx="2"/>
+    <path fill="#FFF" d="M5,3 L7,3 L7,3 C8.1045695,3 9,3.8954305 9,5 L9,7 C9,8.1045695 8.1045695,9 7,9 L5,9 C3.8954305,9 3,8.1045695 3,7 L3,5 L3,5 C3,3.8954305 3.8954305,3 5,3 L5,3 Z M6,4.5 C5.17157288,4.5 4.5,5.17157288 4.5,6 C4.5,6.82842712 5.17157288,7.5 6,7.5 C6.82842712,7.5 7.5,6.82842712 7.5,6 L7.5,6 C7.5,5.17157288 6.82842712,4.5 6,4.5 Z M5.5,9 L6.5,9 L6.5,10 L5.5,10 L5.5,9 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam-xl.svg b/data/styles/clear/style-clear/symbols/speedcam-xl.svg
index edac2684cf..a75aec6af2 100644
--- a/data/styles/clear/style-clear/symbols/speedcam-xl.svg
+++ b/data/styles/clear/style-clear/symbols/speedcam-xl.svg
@@ -1,16 +1,7 @@
-<?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 width="28" height="28" viewBox="0 0 28 28">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#FFF" d="M3,2.22033763e-15 L25,2.22033763e-15 L25,2.22044605e-15 C26.6568542,1.91608339e-15 28,1.34314575 28,3 L28,25 L28,25 C28,26.6568542 26.6568542,28 25,28 L3,28 L3,28 C1.34314575,28 6.33922569e-16,26.6568542 -1.77635684e-15,25 L0,3 L4.4408921e-16,3 C2.41183085e-16,1.34314575 1.34314575,2.5248087e-15 3,2.22044605e-15 Z" opacity=".6"/>
+    <rect width="26" height="26" x="1" y="1" fill="#000" rx="2"/>
+    <path fill="#FFF" d="M20,14 L20,11 C20,9.34314575 18.6568542,8 17,8 L11,8 C9.34314575,8 8,9.34314575 8,11 L8,14 L7,14 L7,11 C7,8.790861 8.790861,7 11,7 L17,7 C19.209139,7 21,8.790861 21,11 L21,14 L20,14 L20,17 C20,18.6568542 18.6568542,20 17,20 L11,20 C9.34314575,20 8,18.6568542 8,17 L8,14 L6,14 L6,11 C6,8.23857625 8.23857625,6 11,6 L17,6 C19.7614237,6 22,8.23857625 22,11 L22,14 L20,14 Z M14,11 C12.3431458,11 11,12.3431458 11,14 C11,15.6568542 12.3431458,17 14,17 C15.6568542,17 17,15.6568542 17,14 C17,12.3431458 15.6568542,11 14,11 Z M10,17 C9.44771525,17 9,17.4477153 9,18 C9,18.5522847 9.44771525,19 10,19 C10.5522847,19 11,18.5522847 11,18 C11,17.4477153 10.5522847,17 10,17 Z M12.5,21 L15.5,21 L15.5,23 L12.5,23 L12.5,21 Z"/>
+  </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/speedcam1-xl.svg b/data/styles/clear/style-clear/symbols/speedcam1-xl.svg
deleted file mode 100644
index aa030b761d..0000000000
--- a/data/styles/clear/style-clear/symbols/speedcam1-xl.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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-night/6plus/current-position.png b/data/styles/clear/style-night/6plus/current-position.png
index bb4c1fa4a1..311070516b 100644
--- a/data/styles/clear/style-night/6plus/current-position.png
+++ b/data/styles/clear/style-night/6plus/current-position.png
diff --git a/data/styles/clear/style-night/hdpi/current-position.png b/data/styles/clear/style-night/hdpi/current-position.png
index 73b2e659d6..3118aa0a66 100644
--- a/data/styles/clear/style-night/hdpi/current-position.png
+++ b/data/styles/clear/style-night/hdpi/current-position.png
diff --git a/data/styles/clear/style-night/mdpi/current-position.png b/data/styles/clear/style-night/mdpi/current-position.png
index 398b6a44f4..c37dfd53a4 100644
--- a/data/styles/clear/style-night/mdpi/current-position.png
+++ b/data/styles/clear/style-night/mdpi/current-position.png
diff --git a/data/styles/clear/style-night/symbols/speedcam-l.svg b/data/styles/clear/style-night/symbols/speedcam-l.svg
index 7412ed003f..a8a1348d6a 100644
--- a/data/styles/clear/style-night/symbols/speedcam-l.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-l.svg
@@ -1,7 +1,7 @@
 <svg width="24" height="24" viewBox="0 0 24 24">
   <g fill="none" fill-rule="evenodd">
-    <rect width="24" height="24" fill="#FFF" opacity=".4" rx="3.5"/>
-    <rect width="22" height="22" x="1" y="1" fill="#B3A813" rx="3"/>
-    <path fill="#4A4A4A" d="M17.4180495,11.125 L17.4180495,10.4375 C17.4180495,10.058 17.0984067,9.75 16.7037638,9.75 L15.9894781,9.75 L15.9894781,14.5625 L15,14.5625 L15,8.71875 C15,7.7693125 14.2007143,7 13.2142857,7 L6.78571429,7 C5.79928571,7 5,7.7693125 5,8.71875 L5,16.28125 C5,17.2306875 5.79928571,18 6.78571429,18 L13.2142857,18 C14.2007143,18 15,17.2306875 15,16.28125 L15,15.9375 L16.7037638,15.9375 C17.0984067,15.9375 17.4180495,15.6298438 17.4180495,15.25 L17.4180495,14.5625 L18.7037638,14.5625 C18.9012638,14.5625 19.0609067,14.4088437 19,14.21875 L19,11.46875 C19.0609067,11.2786563 18.9012638,11.125 18.7037638,11.125 L17.4180495,11.125 Z M8.5,16.5 C7.395,16.5 6.5,15.6047413 6.5,14.5001667 C6.5,13.395592 7.395,12.5 8.5,12.5 C9.60466667,12.5 10.5,13.395592 10.5,14.5001667 C10.5,15.6047413 9.60466667,16.5 8.5,16.5 L8.5,16.5 Z M12.8932321,9.875 C12.4788571,9.875 12.1428571,9.539375 12.1428571,9.125375 C12.1428571,8.711 12.4788571,8.375 12.8932321,8.375 C13.3072321,8.375 13.6428571,8.711 13.6428571,9.125375 C13.6428571,9.539375 13.3072321,9.875 12.8932321,9.875 L12.8932321,9.875 Z"/>
+    <rect width="24" height="24" fill="#FFF" opacity=".4" rx="3"/>
+    <path fill="#B1B1AE" d="M3,1 L21,1 L21,1 C22.1045695,1 23,1.8954305 23,3 L23,21 L23,21 C23,22.1045695 22.1045695,23 21,23 L3,23 L3,23 C1.8954305,23 1,22.1045695 1,21 L1,3 L1,3 C1,1.8954305 1.8954305,1 3,1 Z"/>
+    <path fill="#000" d="M17,13 L17,15 C17,16.1045695 16.1045695,17 15,17 L9,17 C7.8954305,17 7,16.1045695 7,15 L7,13 L5,13 L5,9 C5,6.790861 6.790861,5 9,5 L15,5 C17.209139,5 19,6.790861 19,9 L19,13 L17,13 Z M17,13 L17,9 C17,7.8954305 16.1045695,7 15,7 L9,7 C7.8954305,7 7,7.8954305 7,9 L7,13 L6,13 L6,9 C6,7.34314575 7.34314575,6 9,6 L15,6 C16.6568542,6 18,7.34314575 18,9 L18,13 L17,13 L17,13 Z M12,9.50013642 C10.6193635,9.50013642 9.50013642,10.6193635 9.50013642,12 C9.50013642,13.3806365 10.6193635,14.4998636 12,14.4998636 L12.0001364,14.4998636 C13.380773,14.4998636 14.5,13.3806365 14.5,12 C14.5,10.6193635 13.380773,9.50013642 12.0001364,9.50013642 L12,9.50013642 Z M8.75,14.5 C8.33578644,14.5 8,14.8357864 8,15.25 C8,15.6642136 8.33578644,16 8.75,16 C9.16421356,16 9.5,15.6642136 9.5,15.25 C9.5,14.8357864 9.16421356,14.5 8.75,14.5 Z M11,18 L13,18 L13,20 L11,20 L11,18 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam-m.svg b/data/styles/clear/style-night/symbols/speedcam-m.svg
index e0ff517e65..27130d235c 100644
--- a/data/styles/clear/style-night/symbols/speedcam-m.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-m.svg
@@ -1,7 +1,7 @@
 <svg width="20" height="20" viewBox="0 0 20 20">
   <g fill="none" fill-rule="evenodd">
-    <rect width="20" height="20" fill="#FFF" opacity=".4" rx="2.5"/>
-    <rect width="18" height="18" x="1" y="1" fill="#B3A813" rx="2"/>
-    <path fill="#4A4A4A" d="M14.6457063,8.53626696 L14.6457063,7.94688914 C14.6457063,7.62155258 14.3716838,7.35751131 14.0333657,7.35751131 L13.4210251,7.35751131 L13.4210251,11.4831561 L12.5727684,11.4831561 L12.5727684,6.47344457 C12.5727684,5.65951379 11.8875593,5 11.0419169,5 L6.5308515,5 C5.68520913,5 5,5.65951379 5,6.47344457 L5,12.9566007 C5,13.7705314 5.68520913,14.4300452 6.5308515,14.4300452 L11.0419169,14.4300452 C11.8875593,14.4300452 12.5727684,13.7705314 12.5727684,12.9566007 L12.5727684,12.6619118 L14.0333657,12.6619118 C14.3716838,12.6619118 14.6457063,12.3981652 14.6457063,12.0725339 L14.6457063,11.4831561 L15.7479194,11.4831561 C15.9172315,11.4831561 16.0540896,11.3514302 16.0018758,11.1884672 L16.0018758,8.83095588 C16.0540896,8.66799291 15.9172315,8.53626696 15.7479194,8.53626696 L14.6457063,8.53626696 Z M6,11.7151476 C6,10.8867166 6.67125,10.2150226 7.5,10.2150226 C8.3285,10.2150226 9,10.8867166 9,11.7151476 C9,12.5435786 8.3285,13.2150226 7.5,13.2150226 C6.67125,13.2150226 6,12.5435786 6,11.7151476 Z M10.7666851,7.46467091 C10.411451,7.46467091 10.123406,7.17694737 10.123406,6.82203476 C10.123406,6.46680067 10.411451,6.17875565 10.7666851,6.17875565 C11.1215977,6.17875565 11.4093213,6.46680067 11.4093213,6.82203476 C11.4093213,7.17694737 11.1215977,7.46467091 10.7666851,7.46467091 L10.7666851,7.46467091 Z"/>
+    <rect width="20" height="20" fill="#FFF" opacity=".4" rx="3"/>
+    <rect width="18" height="18" x="1" y="1" fill="#B1B1AE" rx="2"/>
+    <path fill="#000" d="M14,10 L14,12 C14,13.1045695 13.1045695,14 12,14 L8,14 C6.8954305,14 6,13.1045695 6,12 L6,10 L4,10 L4,8 C4,5.790861 5.790861,4 8,4 L12,4 C14.209139,4 16,5.790861 16,8 L16,10 L14,10 L14,10 Z M14,10 L15,10 L15,8 C15,6.34314575 13.6568542,5 12,5 L8,5 C6.34314575,5 5,6.34314575 5,8 L5,10 L6,10 L6,8 C6,6.8954305 6.8954305,6 8,6 L12,6 C13.1045695,6 14,6.8954305 14,8 L14,10 L14,10 Z M10,8.00010914 C8.89549078,8.00010914 8.00010914,8.89549077 8.00010914,10 C8.00010914,11.1045092 8.89549078,11.9998909 10,11.9998909 L10.0001091,11.9998909 C11.1046184,11.9998909 12,11.1045092 12,10 C12,8.89549077 11.1046184,8.00010914 10.0001091,8.00010914 L10,8.00010914 L10,8.00010914 Z M7.5,12 C7.22385763,12 7,12.2238576 7,12.5 C7,12.7761424 7.22385763,13 7.5,13 C7.77614237,13 8,12.7761424 8,12.5 C8,12.2238576 7.77614237,12 7.5,12 Z M9,14 L11,14 L11,16 L9,16 L9,14 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam-s.svg b/data/styles/clear/style-night/symbols/speedcam-s.svg
index ea8f20497d..5ebd503e93 100644
--- a/data/styles/clear/style-night/symbols/speedcam-s.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-s.svg
@@ -1,7 +1,7 @@
 <svg width="12" height="12" viewBox="0 0 12 12">
   <g fill="none" fill-rule="evenodd">
-    <rect width="12" height="12" fill="#FFF" opacity=".4" rx="1.5"/>
-    <rect width="10" height="10" x="1" y="1" fill="#B3A813" rx="1"/>
-    <path fill="#4A4A4A" d="M2,3.50292933 C2,2.94902676 2.44371665,2.5 2.99980749,2.5 L6.00019251,2.5 C6.55237094,2.5 7,2.93788135 7,3.50292933 L7,8.49707067 C7,9.05097324 6.55628335,9.5 6.00019251,9.5 L2.99980749,9.5 C2.44762906,9.5 2,9.06211865 2,8.49707067 L2,3.50292933 Z M3.875,8.86363636 C4.56535594,8.86363636 5.125,8.29381695 5.125,7.59090909 C5.125,6.88800123 4.56535594,6.31818182 3.875,6.31818182 C3.18464406,6.31818182 2.625,6.88800123 2.625,7.59090909 C2.625,8.29381695 3.18464406,8.86363636 3.875,8.86363636 Z M5.4375,5.20454545 C6.04156145,5.20454545 6.53125,4.70595347 6.53125,4.09090909 C6.53125,3.47586471 6.04156145,2.97727273 5.4375,2.97727273 C4.83343855,2.97727273 4.34375,3.47586471 4.34375,4.09090909 C4.34375,4.70595347 4.83343855,5.20454545 5.4375,5.20454545 Z M8,3.5 L9,3.5 L9,8.5 L8,8.5 L8,3.5 Z M5.4375,4.72727273 C5.09232203,4.72727273 4.8125,4.44236302 4.8125,4.09090909 C4.8125,3.73945516 5.09232203,3.45454545 5.4375,3.45454545 C5.78267797,3.45454545 6.0625,3.73945516 6.0625,4.09090909 C6.0625,4.44236302 5.78267797,4.72727273 5.4375,4.72727273 Z M3.875,8.22727273 C3.52982203,8.22727273 3.25,7.94236302 3.25,7.59090909 C3.25,7.23945516 3.52982203,6.95454545 3.875,6.95454545 C4.22017797,6.95454545 4.5,7.23945516 4.5,7.59090909 C4.5,7.94236302 4.22017797,8.22727273 3.875,8.22727273 Z M9,4.5 L10,4.5 L10,7.5 L9,7.5 L9,4.5 Z"/>
+    <rect width="12" height="12" fill="#FFF" opacity=".4" rx="3"/>
+    <rect width="10" height="10" x="1" y="1" fill="#B1B1AE" rx="2"/>
+    <path fill="#000" d="M5,3 L7,3 L7,3 C8.1045695,3 9,3.8954305 9,5 L9,7 C9,8.1045695 8.1045695,9 7,9 L5,9 C3.8954305,9 3,8.1045695 3,7 L3,5 L3,5 C3,3.8954305 3.8954305,3 5,3 L5,3 Z M6,4.5 C5.17157288,4.5 4.5,5.17157288 4.5,6 C4.5,6.82842712 5.17157288,7.5 6,7.5 C6.82842712,7.5 7.5,6.82842712 7.5,6 L7.5,6 C7.5,5.17157288 6.82842712,4.5 6,4.5 Z M5.5,9 L6.5,9 L6.5,10 L5.5,10 L5.5,9 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam-xl.svg b/data/styles/clear/style-night/symbols/speedcam-xl.svg
index 08ebd53fde..5616399024 100644
--- a/data/styles/clear/style-night/symbols/speedcam-xl.svg
+++ b/data/styles/clear/style-night/symbols/speedcam-xl.svg
@@ -1,15 +1,7 @@
-<?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 width="28" height="28" viewBox="0 0 28 28">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#FFF" d="M3,2.22033763e-15 L25,2.22033763e-15 L25,2.22044605e-15 C26.6568542,1.91608339e-15 28,1.34314575 28,3 L28,25 L28,25 C28,26.6568542 26.6568542,28 25,28 L3,28 L3,28 C1.34314575,28 6.33922569e-16,26.6568542 -1.77635684e-15,25 L0,3 L4.4408921e-16,3 C2.41183085e-16,1.34314575 1.34314575,2.5248087e-15 3,2.22044605e-15 Z" opacity=".4"/>
+    <rect width="26" height="26" x="1" y="1" fill="#B1B1AE" rx="2"/>
+    <path fill="#000" d="M20,14 L20,11 C20,9.34314575 18.6568542,8 17,8 L11,8 C9.34314575,8 8,9.34314575 8,11 L8,14 L7,14 L7,11 C7,8.790861 8.790861,7 11,7 L17,7 C19.209139,7 21,8.790861 21,11 L21,14 L20,14 L20,17 C20,18.6568542 18.6568542,20 17,20 L11,20 C9.34314575,20 8,18.6568542 8,17 L8,14 L6,14 L6,11 C6,8.23857625 8.23857625,6 11,6 L17,6 C19.7614237,6 22,8.23857625 22,11 L22,14 L20,14 Z M14,11 C12.3431458,11 11,12.3431458 11,14 C11,15.6568542 12.3431458,17 14,17 C15.6568542,17 17,15.6568542 17,14 C17,12.3431458 15.6568542,11 14,11 Z M10,17 C9.44771525,17 9,17.4477153 9,18 C9,18.5522847 9.44771525,19 10,19 C10.5522847,19 11,18.5522847 11,18 C11,17.4477153 10.5522847,17 10,17 Z M12.5,21 L15.5,21 L15.5,23 L12.5,23 L12.5,21 Z"/>
+  </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/speedcam1-xl.svg b/data/styles/clear/style-night/symbols/speedcam1-xl.svg
deleted file mode 100644
index cea4700abc..0000000000
--- a/data/styles/clear/style-night/symbols/speedcam1-xl.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/xhdpi/current-position.png b/data/styles/clear/style-night/xhdpi/current-position.png
index 5d8565d9fe..40cdd6a880 100644
--- a/data/styles/clear/style-night/xhdpi/current-position.png
+++ b/data/styles/clear/style-night/xhdpi/current-position.png
diff --git a/data/styles/clear/style-night/xxhdpi/current-position.png b/data/styles/clear/style-night/xxhdpi/current-position.png
index 93faebf360..b6249457a6 100644
--- a/data/styles/clear/style-night/xxhdpi/current-position.png
+++ b/data/styles/clear/style-night/xxhdpi/current-position.png
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index bed855b04b..5ce1e2195e 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -943,9 +943,9 @@ area|z18-[amenity=charging_station]
 {icon-image: charging-station-xl.svg;font-size: 14.75;}
 
 node|z13[highway=speed_camera]
-{icon-image: speedcam-l.svg; z-index: 75000;}
+{icon-image: speedcam-s.svg; z-index: 75000;}
 node|z14[highway=speed_camera]
-{icon-image: speedcam-l.svg; z-index: 75000;}
+{icon-image: speedcam-m.svg; z-index: 75000;}
 node|z15[highway=speed_camera]
 {icon-image: speedcam-l.svg; z-index: 75000;}
 node|z16-[highway=speed_camera]