diff --git a/data/styles/clear/style-clear/6plus/route-point-a.png b/data/styles/clear/style-clear/6plus/route-point-a.png
new file mode 100644
index 0000000000..48969d06e7
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-a.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-b.png b/data/styles/clear/style-clear/6plus/route-point-b.png
new file mode 100644
index 0000000000..f84b339995
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-b.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-c.png b/data/styles/clear/style-clear/6plus/route-point-c.png
new file mode 100644
index 0000000000..85d4513713
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-c.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-finish.png b/data/styles/clear/style-clear/6plus/route-point-finish.png
new file mode 100644
index 0000000000..0422a7d79e
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-finish.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-start.png b/data/styles/clear/style-clear/6plus/route-point-start.png
new file mode 100644
index 0000000000..4f87ee3f91
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-start.png differ
diff --git a/data/styles/clear/style-clear/6plus/route_from.png b/data/styles/clear/style-clear/6plus/route_from.png
deleted file mode 100644
index 3261b50a46..0000000000
Binary files a/data/styles/clear/style-clear/6plus/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/6plus/route_to.png b/data/styles/clear/style-clear/6plus/route_to.png
deleted file mode 100644
index cb3e86cb7b..0000000000
Binary files a/data/styles/clear/style-clear/6plus/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-a.png b/data/styles/clear/style-clear/hdpi/route-point-a.png
new file mode 100644
index 0000000000..ac8691a38c
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-b.png b/data/styles/clear/style-clear/hdpi/route-point-b.png
new file mode 100644
index 0000000000..36e800ad0a
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-c.png b/data/styles/clear/style-clear/hdpi/route-point-c.png
new file mode 100644
index 0000000000..0c16ef5f17
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-finish.png b/data/styles/clear/style-clear/hdpi/route-point-finish.png
new file mode 100644
index 0000000000..9c61634ee8
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-start.png b/data/styles/clear/style-clear/hdpi/route-point-start.png
new file mode 100644
index 0000000000..d8abec42fb
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route_from.png b/data/styles/clear/style-clear/hdpi/route_from.png
deleted file mode 100644
index 384afd154a..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/route_to.png b/data/styles/clear/style-clear/hdpi/route_to.png
deleted file mode 100644
index f10322bbeb..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-a.png b/data/styles/clear/style-clear/mdpi/route-point-a.png
new file mode 100644
index 0000000000..e7f1061b11
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-b.png b/data/styles/clear/style-clear/mdpi/route-point-b.png
new file mode 100644
index 0000000000..d0c2e640c2
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-c.png b/data/styles/clear/style-clear/mdpi/route-point-c.png
new file mode 100644
index 0000000000..4578b112e6
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-finish.png b/data/styles/clear/style-clear/mdpi/route-point-finish.png
new file mode 100644
index 0000000000..a92d19816b
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-start.png b/data/styles/clear/style-clear/mdpi/route-point-start.png
new file mode 100644
index 0000000000..df6ed9be1f
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route_from.png b/data/styles/clear/style-clear/mdpi/route_from.png
deleted file mode 100644
index d6b01b2560..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/route_to.png b/data/styles/clear/style-clear/mdpi/route_to.png
deleted file mode 100644
index 9c2e96acf6..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-a.png b/data/styles/clear/style-clear/xhdpi/route-point-a.png
new file mode 100644
index 0000000000..cf68f9a953
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-b.png b/data/styles/clear/style-clear/xhdpi/route-point-b.png
new file mode 100644
index 0000000000..fcf0f30cf5
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-c.png b/data/styles/clear/style-clear/xhdpi/route-point-c.png
new file mode 100644
index 0000000000..716c23a748
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-finish.png b/data/styles/clear/style-clear/xhdpi/route-point-finish.png
new file mode 100644
index 0000000000..7b0a808ae7
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-start.png b/data/styles/clear/style-clear/xhdpi/route-point-start.png
new file mode 100644
index 0000000000..c4963f0546
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route_from.png b/data/styles/clear/style-clear/xhdpi/route_from.png
deleted file mode 100644
index 968181a6dc..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/route_to.png b/data/styles/clear/style-clear/xhdpi/route_to.png
deleted file mode 100644
index a05b1b2663..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-a.png b/data/styles/clear/style-clear/xxhdpi/route-point-a.png
new file mode 100644
index 0000000000..68193c9327
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-b.png b/data/styles/clear/style-clear/xxhdpi/route-point-b.png
new file mode 100644
index 0000000000..3c09bdbb7d
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-c.png b/data/styles/clear/style-clear/xxhdpi/route-point-c.png
new file mode 100644
index 0000000000..467c9631ec
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-finish.png b/data/styles/clear/style-clear/xxhdpi/route-point-finish.png
new file mode 100644
index 0000000000..c30443bff0
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-start.png b/data/styles/clear/style-clear/xxhdpi/route-point-start.png
new file mode 100644
index 0000000000..385969bf16
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route_from.png b/data/styles/clear/style-clear/xxhdpi/route_from.png
deleted file mode 100644
index a9c316e9f8..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route_to.png b/data/styles/clear/style-clear/xxhdpi/route_to.png
deleted file mode 100644
index 1f24a4fffa..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/route-point-a.png b/data/styles/clear/style-night/6plus/route-point-a.png
new file mode 100644
index 0000000000..48969d06e7
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-a.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-b.png b/data/styles/clear/style-night/6plus/route-point-b.png
new file mode 100644
index 0000000000..f84b339995
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-b.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-c.png b/data/styles/clear/style-night/6plus/route-point-c.png
new file mode 100644
index 0000000000..85d4513713
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-c.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-finish.png b/data/styles/clear/style-night/6plus/route-point-finish.png
new file mode 100644
index 0000000000..0422a7d79e
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-finish.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-start.png b/data/styles/clear/style-night/6plus/route-point-start.png
new file mode 100644
index 0000000000..4f87ee3f91
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-start.png differ
diff --git a/data/styles/clear/style-night/6plus/route_from.png b/data/styles/clear/style-night/6plus/route_from.png
deleted file mode 100644
index 470787da73..0000000000
Binary files a/data/styles/clear/style-night/6plus/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/route_to.png b/data/styles/clear/style-night/6plus/route_to.png
deleted file mode 100644
index 240f58710c..0000000000
Binary files a/data/styles/clear/style-night/6plus/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-a.png b/data/styles/clear/style-night/hdpi/route-point-a.png
new file mode 100644
index 0000000000..ac8691a38c
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-b.png b/data/styles/clear/style-night/hdpi/route-point-b.png
new file mode 100644
index 0000000000..36e800ad0a
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-c.png b/data/styles/clear/style-night/hdpi/route-point-c.png
new file mode 100644
index 0000000000..0c16ef5f17
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-finish.png b/data/styles/clear/style-night/hdpi/route-point-finish.png
new file mode 100644
index 0000000000..9c61634ee8
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-start.png b/data/styles/clear/style-night/hdpi/route-point-start.png
new file mode 100644
index 0000000000..d8abec42fb
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-night/hdpi/route_from.png b/data/styles/clear/style-night/hdpi/route_from.png
deleted file mode 100644
index e0b64f375a..0000000000
Binary files a/data/styles/clear/style-night/hdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/route_to.png b/data/styles/clear/style-night/hdpi/route_to.png
deleted file mode 100644
index 1db1a78189..0000000000
Binary files a/data/styles/clear/style-night/hdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-a.png b/data/styles/clear/style-night/mdpi/route-point-a.png
new file mode 100644
index 0000000000..e7f1061b11
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-b.png b/data/styles/clear/style-night/mdpi/route-point-b.png
new file mode 100644
index 0000000000..d0c2e640c2
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-c.png b/data/styles/clear/style-night/mdpi/route-point-c.png
new file mode 100644
index 0000000000..4578b112e6
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-finish.png b/data/styles/clear/style-night/mdpi/route-point-finish.png
new file mode 100644
index 0000000000..a92d19816b
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-start.png b/data/styles/clear/style-night/mdpi/route-point-start.png
new file mode 100644
index 0000000000..df6ed9be1f
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-night/mdpi/route_from.png b/data/styles/clear/style-night/mdpi/route_from.png
deleted file mode 100644
index ec9ecdc5db..0000000000
Binary files a/data/styles/clear/style-night/mdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/route_to.png b/data/styles/clear/style-night/mdpi/route_to.png
deleted file mode 100644
index 645d1f9011..0000000000
Binary files a/data/styles/clear/style-night/mdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-a.png b/data/styles/clear/style-night/xhdpi/route-point-a.png
new file mode 100644
index 0000000000..cf68f9a953
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-b.png b/data/styles/clear/style-night/xhdpi/route-point-b.png
new file mode 100644
index 0000000000..fcf0f30cf5
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-c.png b/data/styles/clear/style-night/xhdpi/route-point-c.png
new file mode 100644
index 0000000000..716c23a748
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-finish.png b/data/styles/clear/style-night/xhdpi/route-point-finish.png
new file mode 100644
index 0000000000..7b0a808ae7
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-start.png b/data/styles/clear/style-night/xhdpi/route-point-start.png
new file mode 100644
index 0000000000..c4963f0546
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route_from.png b/data/styles/clear/style-night/xhdpi/route_from.png
deleted file mode 100644
index f4a3264dc4..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/route_to.png b/data/styles/clear/style-night/xhdpi/route_to.png
deleted file mode 100644
index 0d60d70e7c..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/route_to.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-a.png b/data/styles/clear/style-night/xxhdpi/route-point-a.png
new file mode 100644
index 0000000000..68193c9327
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-b.png b/data/styles/clear/style-night/xxhdpi/route-point-b.png
new file mode 100644
index 0000000000..3c09bdbb7d
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-c.png b/data/styles/clear/style-night/xxhdpi/route-point-c.png
new file mode 100644
index 0000000000..467c9631ec
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-finish.png b/data/styles/clear/style-night/xxhdpi/route-point-finish.png
new file mode 100644
index 0000000000..c30443bff0
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-start.png b/data/styles/clear/style-night/xxhdpi/route-point-start.png
new file mode 100644
index 0000000000..385969bf16
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route_from.png b/data/styles/clear/style-night/xxhdpi/route_from.png
deleted file mode 100644
index a15b4d0ed8..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/route_from.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/route_to.png b/data/styles/clear/style-night/xxhdpi/route_to.png
deleted file mode 100644
index 2c5281fed2..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/route_to.png and /dev/null differ