diff --git a/data/styles/default/dark/6plus/ferry.png b/data/styles/default/dark/6plus/ferry.png
deleted file mode 100644
index 738810fb4..000000000
Binary files a/data/styles/default/dark/6plus/ferry.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/paid_road.png b/data/styles/default/dark/6plus/paid_road.png
deleted file mode 100644
index 969dcd3d7..000000000
Binary files a/data/styles/default/dark/6plus/paid_road.png and /dev/null differ
diff --git a/data/styles/default/dark/6plus/unpaved_road.png b/data/styles/default/dark/6plus/unpaved_road.png
deleted file mode 100644
index 08f9c6002..000000000
Binary files a/data/styles/default/dark/6plus/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/ferry.png b/data/styles/default/dark/hdpi/ferry.png
deleted file mode 100644
index aae71123c..000000000
Binary files a/data/styles/default/dark/hdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/paid_road.png b/data/styles/default/dark/hdpi/paid_road.png
deleted file mode 100644
index 3579f3452..000000000
Binary files a/data/styles/default/dark/hdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/dark/hdpi/unpaved_road.png b/data/styles/default/dark/hdpi/unpaved_road.png
deleted file mode 100644
index 4f78bf609..000000000
Binary files a/data/styles/default/dark/hdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/ferry.png b/data/styles/default/dark/mdpi/ferry.png
deleted file mode 100644
index 12e32a33a..000000000
Binary files a/data/styles/default/dark/mdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/paid_road.png b/data/styles/default/dark/mdpi/paid_road.png
deleted file mode 100644
index 46e65da50..000000000
Binary files a/data/styles/default/dark/mdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/dark/mdpi/unpaved_road.png b/data/styles/default/dark/mdpi/unpaved_road.png
deleted file mode 100644
index 70e7aad05..000000000
Binary files a/data/styles/default/dark/mdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/dark/symbols/warning-ferry.svg b/data/styles/default/dark/symbols/warning-ferry.svg
new file mode 100644
index 000000000..6dc6ef60a
--- /dev/null
+++ b/data/styles/default/dark/symbols/warning-ferry.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m7.678 7.9092h3.3009v1.4338h-3.3009zm-1.827 3.3765v-1.2257h7.5392l0.85568 1.2257zm-0.99443 0.90193h16.073l-1.457 4.6253h-13.043z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/warning-paid_road.svg b/data/styles/default/dark/symbols/warning-paid_road.svg
new file mode 100644
index 000000000..0a468cbca
--- /dev/null
+++ b/data/styles/default/dark/symbols/warning-paid_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m12.158 17.427q-1.1685-0.08059-2.1357-0.69846l0.64474-1.5648q1.0343 0.72533 2.0349 0.72533 1.5379 0 1.5379-1.0611 0-0.53056-0.39625-0.994-0.38953-0.47012-1.491-1.0208-1.0947-0.55071-1.491-0.91337-0.39625-0.36266-0.61116-0.86636-0.20819-0.5037-0.20819-1.1215 0-0.91337 0.57086-1.6119 0.57757-0.69846 1.5447-0.93352v-1.2156h1.5379l-0.0068 1.1485q1.2357 0.12089 1.8402 0.60444l-0.53052 1.5044q-0.92009-0.65816-1.9409-0.65816-0.60444 0-0.94024 0.32908-0.32908 0.32236-0.32908 0.81935 0 0.84621 1.8738 1.7596 0.98724 0.48355 1.4238 0.89322 0.43654 0.40296 0.66488 0.94695 0.22834 0.53728 0.22834 1.2021 0 0.94024-0.60444 1.6455-0.60444 0.69846-1.679 0.9604v1.5447h-1.5379z" fill="#fff" aria-label="$" data-font-family="Trebuchet MS Bold"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/warning-unpaved_road.svg b/data/styles/default/dark/symbols/warning-unpaved_road.svg
new file mode 100644
index 000000000..8d68c0740
--- /dev/null
+++ b/data/styles/default/dark/symbols/warning-unpaved_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m11.91 13.481-0.31705-4.7458q-0.08917-1.3871-0.08917-1.9915 0-0.82234 0.42603-1.2781 0.43594-0.46566 1.1394-0.46566 0.85206 0 1.1394 0.59446 0.28732 0.58456 0.28732 1.6942 0 0.65391-0.06935 1.3276l-0.42603 4.8845q-0.06935 0.87188-0.29723 1.3375-0.22788 0.46566-0.75299 0.46566-0.53502 0-0.74308-0.44585-0.20806-0.45576-0.29724-1.3772zm1.0998 6.5193q-0.60437 0-1.0601-0.3864-0.44585-0.39631-0.44585-1.0998 0-0.61428 0.42603-1.0403 0.43594-0.43594 1.0601-0.43594t1.0601 0.43594q0.44585 0.42603 0.44585 1.0403 0 0.69354-0.44585 1.0898-0.44585 0.39631-1.0403 0.39631z" fill="#fff" aria-label="!" data-font-family="Arial Rounded MT Bold"/>
+</svg>
diff --git a/data/styles/default/dark/xhdpi/ferry.png b/data/styles/default/dark/xhdpi/ferry.png
deleted file mode 100644
index e425ac69a..000000000
Binary files a/data/styles/default/dark/xhdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/paid_road.png b/data/styles/default/dark/xhdpi/paid_road.png
deleted file mode 100644
index fc85827d9..000000000
Binary files a/data/styles/default/dark/xhdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/dark/xhdpi/unpaved_road.png b/data/styles/default/dark/xhdpi/unpaved_road.png
deleted file mode 100644
index 17bc13ed7..000000000
Binary files a/data/styles/default/dark/xhdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/ferry.png b/data/styles/default/dark/xxhdpi/ferry.png
deleted file mode 100644
index 608d87687..000000000
Binary files a/data/styles/default/dark/xxhdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/paid_road.png b/data/styles/default/dark/xxhdpi/paid_road.png
deleted file mode 100644
index 9f50fe386..000000000
Binary files a/data/styles/default/dark/xxhdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/dark/xxhdpi/unpaved_road.png b/data/styles/default/dark/xxhdpi/unpaved_road.png
deleted file mode 100644
index 6a41a413a..000000000
Binary files a/data/styles/default/dark/xxhdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/ferry.png b/data/styles/default/dark/xxxhdpi/ferry.png
deleted file mode 100644
index 45ac2a454..000000000
Binary files a/data/styles/default/dark/xxxhdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/paid_road.png b/data/styles/default/dark/xxxhdpi/paid_road.png
deleted file mode 100644
index 5500fd17f..000000000
Binary files a/data/styles/default/dark/xxxhdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/dark/xxxhdpi/unpaved_road.png b/data/styles/default/dark/xxxhdpi/unpaved_road.png
deleted file mode 100644
index 749df071a..000000000
Binary files a/data/styles/default/dark/xxxhdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/ferry.png b/data/styles/default/light/6plus/ferry.png
deleted file mode 100644
index 41e6ea7e9..000000000
Binary files a/data/styles/default/light/6plus/ferry.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/paid_road.png b/data/styles/default/light/6plus/paid_road.png
deleted file mode 100644
index 326950f0b..000000000
Binary files a/data/styles/default/light/6plus/paid_road.png and /dev/null differ
diff --git a/data/styles/default/light/6plus/unpaved_road.png b/data/styles/default/light/6plus/unpaved_road.png
deleted file mode 100644
index 5aec4c69b..000000000
Binary files a/data/styles/default/light/6plus/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/ferry.png b/data/styles/default/light/hdpi/ferry.png
deleted file mode 100644
index 30d718592..000000000
Binary files a/data/styles/default/light/hdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/paid_road.png b/data/styles/default/light/hdpi/paid_road.png
deleted file mode 100644
index 1fb9f9755..000000000
Binary files a/data/styles/default/light/hdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/light/hdpi/unpaved_road.png b/data/styles/default/light/hdpi/unpaved_road.png
deleted file mode 100644
index 197f839f7..000000000
Binary files a/data/styles/default/light/hdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/ferry.png b/data/styles/default/light/mdpi/ferry.png
deleted file mode 100644
index 2dd0769d7..000000000
Binary files a/data/styles/default/light/mdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/paid_road.png b/data/styles/default/light/mdpi/paid_road.png
deleted file mode 100644
index 0de80df49..000000000
Binary files a/data/styles/default/light/mdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/light/mdpi/unpaved_road.png b/data/styles/default/light/mdpi/unpaved_road.png
deleted file mode 100644
index d64c41d2e..000000000
Binary files a/data/styles/default/light/mdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/light/symbols/warning-ferry.svg b/data/styles/default/light/symbols/warning-ferry.svg
new file mode 100644
index 000000000..6dc6ef60a
--- /dev/null
+++ b/data/styles/default/light/symbols/warning-ferry.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m7.678 7.9092h3.3009v1.4338h-3.3009zm-1.827 3.3765v-1.2257h7.5392l0.85568 1.2257zm-0.99443 0.90193h16.073l-1.457 4.6253h-13.043z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/warning-paid_road.svg b/data/styles/default/light/symbols/warning-paid_road.svg
new file mode 100644
index 000000000..0a468cbca
--- /dev/null
+++ b/data/styles/default/light/symbols/warning-paid_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m12.158 17.427q-1.1685-0.08059-2.1357-0.69846l0.64474-1.5648q1.0343 0.72533 2.0349 0.72533 1.5379 0 1.5379-1.0611 0-0.53056-0.39625-0.994-0.38953-0.47012-1.491-1.0208-1.0947-0.55071-1.491-0.91337-0.39625-0.36266-0.61116-0.86636-0.20819-0.5037-0.20819-1.1215 0-0.91337 0.57086-1.6119 0.57757-0.69846 1.5447-0.93352v-1.2156h1.5379l-0.0068 1.1485q1.2357 0.12089 1.8402 0.60444l-0.53052 1.5044q-0.92009-0.65816-1.9409-0.65816-0.60444 0-0.94024 0.32908-0.32908 0.32236-0.32908 0.81935 0 0.84621 1.8738 1.7596 0.98724 0.48355 1.4238 0.89322 0.43654 0.40296 0.66488 0.94695 0.22834 0.53728 0.22834 1.2021 0 0.94024-0.60444 1.6455-0.60444 0.69846-1.679 0.9604v1.5447h-1.5379z" fill="#fff" aria-label="$" data-font-family="Trebuchet MS Bold"/>
+</svg>
diff --git a/data/styles/default/light/symbols/warning-unpaved_road.svg b/data/styles/default/light/symbols/warning-unpaved_road.svg
new file mode 100644
index 000000000..8d68c0740
--- /dev/null
+++ b/data/styles/default/light/symbols/warning-unpaved_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m11.91 13.481-0.31705-4.7458q-0.08917-1.3871-0.08917-1.9915 0-0.82234 0.42603-1.2781 0.43594-0.46566 1.1394-0.46566 0.85206 0 1.1394 0.59446 0.28732 0.58456 0.28732 1.6942 0 0.65391-0.06935 1.3276l-0.42603 4.8845q-0.06935 0.87188-0.29723 1.3375-0.22788 0.46566-0.75299 0.46566-0.53502 0-0.74308-0.44585-0.20806-0.45576-0.29724-1.3772zm1.0998 6.5193q-0.60437 0-1.0601-0.3864-0.44585-0.39631-0.44585-1.0998 0-0.61428 0.42603-1.0403 0.43594-0.43594 1.0601-0.43594t1.0601 0.43594q0.44585 0.42603 0.44585 1.0403 0 0.69354-0.44585 1.0898-0.44585 0.39631-1.0403 0.39631z" fill="#fff" aria-label="!" data-font-family="Arial Rounded MT Bold"/>
+</svg>
diff --git a/data/styles/default/light/xhdpi/ferry.png b/data/styles/default/light/xhdpi/ferry.png
deleted file mode 100644
index 2b92d5f71..000000000
Binary files a/data/styles/default/light/xhdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/paid_road.png b/data/styles/default/light/xhdpi/paid_road.png
deleted file mode 100644
index 891803f6a..000000000
Binary files a/data/styles/default/light/xhdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/light/xhdpi/unpaved_road.png b/data/styles/default/light/xhdpi/unpaved_road.png
deleted file mode 100644
index cce18e7c2..000000000
Binary files a/data/styles/default/light/xhdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/ferry.png b/data/styles/default/light/xxhdpi/ferry.png
deleted file mode 100644
index c037300cf..000000000
Binary files a/data/styles/default/light/xxhdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/paid_road.png b/data/styles/default/light/xxhdpi/paid_road.png
deleted file mode 100644
index ff0de2e61..000000000
Binary files a/data/styles/default/light/xxhdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/light/xxhdpi/unpaved_road.png b/data/styles/default/light/xxhdpi/unpaved_road.png
deleted file mode 100644
index 440df9a6b..000000000
Binary files a/data/styles/default/light/xxhdpi/unpaved_road.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/ferry.png b/data/styles/default/light/xxxhdpi/ferry.png
deleted file mode 100644
index 211ae2727..000000000
Binary files a/data/styles/default/light/xxxhdpi/ferry.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/paid_road.png b/data/styles/default/light/xxxhdpi/paid_road.png
deleted file mode 100644
index ae5d554db..000000000
Binary files a/data/styles/default/light/xxxhdpi/paid_road.png and /dev/null differ
diff --git a/data/styles/default/light/xxxhdpi/unpaved_road.png b/data/styles/default/light/xxxhdpi/unpaved_road.png
deleted file mode 100644
index b1f5ec93b..000000000
Binary files a/data/styles/default/light/xxxhdpi/unpaved_road.png and /dev/null differ
diff --git a/libs/map/routing_mark.cpp b/libs/map/routing_mark.cpp
index 95a50b0f1..1e1f62baf 100644
--- a/libs/map/routing_mark.cpp
+++ b/libs/map/routing_mark.cpp
@@ -667,9 +667,9 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> RoadWarningMark::GetSymbolNames
   switch (m_type)
   {
     using enum RoadWarningMarkType;
-  case Toll: symbolName = "paid_road"; break;
-  case Ferry: symbolName = "ferry"; break;
-  case Dirty: symbolName = "unpaved_road"; break;
+  case Toll: symbolName = "warning-paid_road"; break;
+  case Ferry: symbolName = "warning-ferry"; break;
+  case Dirty: symbolName = "warning-unpaved_road"; break;
   case Count: CHECK(false, ()); break;
   }
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();