diff --git a/data/styles/clear/style-clear/6plus/route-point-1.png b/data/styles/clear/style-clear/6plus/route-point-1.png
new file mode 100644
index 0000000000..7885fcd21c
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-1.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-10.png b/data/styles/clear/style-clear/6plus/route-point-10.png
new file mode 100644
index 0000000000..c2fe109874
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-10.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-11.png b/data/styles/clear/style-clear/6plus/route-point-11.png
new file mode 100644
index 0000000000..a3715ff959
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-11.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-12.png b/data/styles/clear/style-clear/6plus/route-point-12.png
new file mode 100644
index 0000000000..32e733f325
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-12.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-13.png b/data/styles/clear/style-clear/6plus/route-point-13.png
new file mode 100644
index 0000000000..10e84bbc77
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-13.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-14.png b/data/styles/clear/style-clear/6plus/route-point-14.png
new file mode 100644
index 0000000000..de38b1e8ea
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-14.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-15.png b/data/styles/clear/style-clear/6plus/route-point-15.png
new file mode 100644
index 0000000000..84dd24fd91
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-15.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-16.png b/data/styles/clear/style-clear/6plus/route-point-16.png
new file mode 100644
index 0000000000..b30da230d8
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-16.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-17.png b/data/styles/clear/style-clear/6plus/route-point-17.png
new file mode 100644
index 0000000000..5387eba68e
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-17.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-18.png b/data/styles/clear/style-clear/6plus/route-point-18.png
new file mode 100644
index 0000000000..761ecabb70
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-18.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-19.png b/data/styles/clear/style-clear/6plus/route-point-19.png
new file mode 100644
index 0000000000..9e6f3062f6
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-19.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-2.png b/data/styles/clear/style-clear/6plus/route-point-2.png
new file mode 100644
index 0000000000..6579c201b2
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-2.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-20.png b/data/styles/clear/style-clear/6plus/route-point-20.png
new file mode 100644
index 0000000000..147d625b29
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-20.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-3.png b/data/styles/clear/style-clear/6plus/route-point-3.png
new file mode 100644
index 0000000000..8e1ac57451
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-3.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-4.png b/data/styles/clear/style-clear/6plus/route-point-4.png
new file mode 100644
index 0000000000..f9f6ff138a
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-4.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-5.png b/data/styles/clear/style-clear/6plus/route-point-5.png
new file mode 100644
index 0000000000..cdee6b3c7a
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-5.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-6.png b/data/styles/clear/style-clear/6plus/route-point-6.png
new file mode 100644
index 0000000000..e7a2d1996a
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-6.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-7.png b/data/styles/clear/style-clear/6plus/route-point-7.png
new file mode 100644
index 0000000000..3ef3a369e1
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-7.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-8.png b/data/styles/clear/style-clear/6plus/route-point-8.png
new file mode 100644
index 0000000000..9718ad7160
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-8.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-9.png b/data/styles/clear/style-clear/6plus/route-point-9.png
new file mode 100644
index 0000000000..33bc928f44
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/route-point-9.png differ
diff --git a/data/styles/clear/style-clear/6plus/route-point-a.png b/data/styles/clear/style-clear/6plus/route-point-a.png
deleted file mode 100644
index dea3febeb7..0000000000
Binary files a/data/styles/clear/style-clear/6plus/route-point-a.png and /dev/null 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
deleted file mode 100644
index cc16826036..0000000000
Binary files a/data/styles/clear/style-clear/6plus/route-point-b.png and /dev/null 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
deleted file mode 100644
index b92107585b..0000000000
Binary files a/data/styles/clear/style-clear/6plus/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-1.png b/data/styles/clear/style-clear/hdpi/route-point-1.png
new file mode 100644
index 0000000000..c9044b93f1
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-10.png b/data/styles/clear/style-clear/hdpi/route-point-10.png
new file mode 100644
index 0000000000..758c7f1ebb
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-11.png b/data/styles/clear/style-clear/hdpi/route-point-11.png
new file mode 100644
index 0000000000..86ac14f4cc
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-12.png b/data/styles/clear/style-clear/hdpi/route-point-12.png
new file mode 100644
index 0000000000..a0aaf7318c
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-13.png b/data/styles/clear/style-clear/hdpi/route-point-13.png
new file mode 100644
index 0000000000..f24faf445b
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-14.png b/data/styles/clear/style-clear/hdpi/route-point-14.png
new file mode 100644
index 0000000000..2eafcc1cee
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-15.png b/data/styles/clear/style-clear/hdpi/route-point-15.png
new file mode 100644
index 0000000000..ed6f24ee79
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-16.png b/data/styles/clear/style-clear/hdpi/route-point-16.png
new file mode 100644
index 0000000000..168f7c4b6b
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-17.png b/data/styles/clear/style-clear/hdpi/route-point-17.png
new file mode 100644
index 0000000000..e940fdd90a
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-18.png b/data/styles/clear/style-clear/hdpi/route-point-18.png
new file mode 100644
index 0000000000..5a44d9646e
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-19.png b/data/styles/clear/style-clear/hdpi/route-point-19.png
new file mode 100644
index 0000000000..80a1353d7d
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-2.png b/data/styles/clear/style-clear/hdpi/route-point-2.png
new file mode 100644
index 0000000000..2500291aef
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-20.png b/data/styles/clear/style-clear/hdpi/route-point-20.png
new file mode 100644
index 0000000000..37b2eea09b
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-3.png b/data/styles/clear/style-clear/hdpi/route-point-3.png
new file mode 100644
index 0000000000..2142a9bda3
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-4.png b/data/styles/clear/style-clear/hdpi/route-point-4.png
new file mode 100644
index 0000000000..2386223ff8
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-5.png b/data/styles/clear/style-clear/hdpi/route-point-5.png
new file mode 100644
index 0000000000..f4922683c8
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-6.png b/data/styles/clear/style-clear/hdpi/route-point-6.png
new file mode 100644
index 0000000000..4532754710
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-7.png b/data/styles/clear/style-clear/hdpi/route-point-7.png
new file mode 100644
index 0000000000..9b1763f9f1
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-8.png b/data/styles/clear/style-clear/hdpi/route-point-8.png
new file mode 100644
index 0000000000..c1751a488e
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-clear/hdpi/route-point-9.png b/data/styles/clear/style-clear/hdpi/route-point-9.png
new file mode 100644
index 0000000000..611505231c
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/route-point-9.png 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
deleted file mode 100644
index e55e60791d..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index 7c7d911320..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index f1bd72d13b..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-1.png b/data/styles/clear/style-clear/mdpi/route-point-1.png
new file mode 100644
index 0000000000..35b68946f7
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-10.png b/data/styles/clear/style-clear/mdpi/route-point-10.png
new file mode 100644
index 0000000000..fac5e5777b
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-11.png b/data/styles/clear/style-clear/mdpi/route-point-11.png
new file mode 100644
index 0000000000..f5c02b6cda
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-12.png b/data/styles/clear/style-clear/mdpi/route-point-12.png
new file mode 100644
index 0000000000..7a02e1f8bd
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-13.png b/data/styles/clear/style-clear/mdpi/route-point-13.png
new file mode 100644
index 0000000000..13422fedac
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-14.png b/data/styles/clear/style-clear/mdpi/route-point-14.png
new file mode 100644
index 0000000000..1e029fe786
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-15.png b/data/styles/clear/style-clear/mdpi/route-point-15.png
new file mode 100644
index 0000000000..e6563c0878
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-16.png b/data/styles/clear/style-clear/mdpi/route-point-16.png
new file mode 100644
index 0000000000..7f5807a833
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-17.png b/data/styles/clear/style-clear/mdpi/route-point-17.png
new file mode 100644
index 0000000000..795d98db7c
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-18.png b/data/styles/clear/style-clear/mdpi/route-point-18.png
new file mode 100644
index 0000000000..e04d3640d1
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-19.png b/data/styles/clear/style-clear/mdpi/route-point-19.png
new file mode 100644
index 0000000000..44836a0aae
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-2.png b/data/styles/clear/style-clear/mdpi/route-point-2.png
new file mode 100644
index 0000000000..8d353a67cc
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-20.png b/data/styles/clear/style-clear/mdpi/route-point-20.png
new file mode 100644
index 0000000000..b68d5d903d
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-3.png b/data/styles/clear/style-clear/mdpi/route-point-3.png
new file mode 100644
index 0000000000..4619cd6f32
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-4.png b/data/styles/clear/style-clear/mdpi/route-point-4.png
new file mode 100644
index 0000000000..f846d2731f
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-5.png b/data/styles/clear/style-clear/mdpi/route-point-5.png
new file mode 100644
index 0000000000..cb7c51f132
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-6.png b/data/styles/clear/style-clear/mdpi/route-point-6.png
new file mode 100644
index 0000000000..e121b0cb22
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-7.png b/data/styles/clear/style-clear/mdpi/route-point-7.png
new file mode 100644
index 0000000000..5f24083abe
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-8.png b/data/styles/clear/style-clear/mdpi/route-point-8.png
new file mode 100644
index 0000000000..a696a3bb74
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-clear/mdpi/route-point-9.png b/data/styles/clear/style-clear/mdpi/route-point-9.png
new file mode 100644
index 0000000000..d55183bb00
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/route-point-9.png 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
deleted file mode 100644
index 52f216a055..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index 7ffd4a33a4..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index 830d7a2f9b..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-1.png b/data/styles/clear/style-clear/xhdpi/route-point-1.png
new file mode 100644
index 0000000000..19ae0146f3
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-10.png b/data/styles/clear/style-clear/xhdpi/route-point-10.png
new file mode 100644
index 0000000000..cd2a7e5194
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-11.png b/data/styles/clear/style-clear/xhdpi/route-point-11.png
new file mode 100644
index 0000000000..6bdab1a2df
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-12.png b/data/styles/clear/style-clear/xhdpi/route-point-12.png
new file mode 100644
index 0000000000..b55607e5b4
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-13.png b/data/styles/clear/style-clear/xhdpi/route-point-13.png
new file mode 100644
index 0000000000..50d477caaa
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-14.png b/data/styles/clear/style-clear/xhdpi/route-point-14.png
new file mode 100644
index 0000000000..04f23e7a41
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-15.png b/data/styles/clear/style-clear/xhdpi/route-point-15.png
new file mode 100644
index 0000000000..ea67a5124d
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-16.png b/data/styles/clear/style-clear/xhdpi/route-point-16.png
new file mode 100644
index 0000000000..a73f8dd47b
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-17.png b/data/styles/clear/style-clear/xhdpi/route-point-17.png
new file mode 100644
index 0000000000..dbde143539
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-18.png b/data/styles/clear/style-clear/xhdpi/route-point-18.png
new file mode 100644
index 0000000000..1863a45aba
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-19.png b/data/styles/clear/style-clear/xhdpi/route-point-19.png
new file mode 100644
index 0000000000..5c2c64bbce
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-2.png b/data/styles/clear/style-clear/xhdpi/route-point-2.png
new file mode 100644
index 0000000000..6fedeb241b
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-20.png b/data/styles/clear/style-clear/xhdpi/route-point-20.png
new file mode 100644
index 0000000000..6bb7e51053
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-3.png b/data/styles/clear/style-clear/xhdpi/route-point-3.png
new file mode 100644
index 0000000000..ff108dc44d
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-4.png b/data/styles/clear/style-clear/xhdpi/route-point-4.png
new file mode 100644
index 0000000000..ed6ff9f3b3
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-5.png b/data/styles/clear/style-clear/xhdpi/route-point-5.png
new file mode 100644
index 0000000000..050c0e6e00
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-6.png b/data/styles/clear/style-clear/xhdpi/route-point-6.png
new file mode 100644
index 0000000000..d761f20000
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-7.png b/data/styles/clear/style-clear/xhdpi/route-point-7.png
new file mode 100644
index 0000000000..c4da664231
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-8.png b/data/styles/clear/style-clear/xhdpi/route-point-8.png
new file mode 100644
index 0000000000..358331c33b
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/route-point-9.png b/data/styles/clear/style-clear/xhdpi/route-point-9.png
new file mode 100644
index 0000000000..174c61ea3c
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/route-point-9.png 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
deleted file mode 100644
index 40f5c86f06..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index cd09400739..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index b2b51ce5a7..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-1.png b/data/styles/clear/style-clear/xxhdpi/route-point-1.png
new file mode 100644
index 0000000000..a85b90b082
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-10.png b/data/styles/clear/style-clear/xxhdpi/route-point-10.png
new file mode 100644
index 0000000000..3190c827a1
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-11.png b/data/styles/clear/style-clear/xxhdpi/route-point-11.png
new file mode 100644
index 0000000000..d06e33c9a1
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-12.png b/data/styles/clear/style-clear/xxhdpi/route-point-12.png
new file mode 100644
index 0000000000..3bd8a4b7c9
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-13.png b/data/styles/clear/style-clear/xxhdpi/route-point-13.png
new file mode 100644
index 0000000000..2c9bf87aa1
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-14.png b/data/styles/clear/style-clear/xxhdpi/route-point-14.png
new file mode 100644
index 0000000000..17f63152cf
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-15.png b/data/styles/clear/style-clear/xxhdpi/route-point-15.png
new file mode 100644
index 0000000000..a0d25b2f7c
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-16.png b/data/styles/clear/style-clear/xxhdpi/route-point-16.png
new file mode 100644
index 0000000000..08a6258153
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-17.png b/data/styles/clear/style-clear/xxhdpi/route-point-17.png
new file mode 100644
index 0000000000..4b29295628
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-18.png b/data/styles/clear/style-clear/xxhdpi/route-point-18.png
new file mode 100644
index 0000000000..66248d9dc1
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-19.png b/data/styles/clear/style-clear/xxhdpi/route-point-19.png
new file mode 100644
index 0000000000..326e1ea75b
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-2.png b/data/styles/clear/style-clear/xxhdpi/route-point-2.png
new file mode 100644
index 0000000000..327d044102
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-20.png b/data/styles/clear/style-clear/xxhdpi/route-point-20.png
new file mode 100644
index 0000000000..7b7ca9d1e5
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-3.png b/data/styles/clear/style-clear/xxhdpi/route-point-3.png
new file mode 100644
index 0000000000..63ed5a4d12
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-4.png b/data/styles/clear/style-clear/xxhdpi/route-point-4.png
new file mode 100644
index 0000000000..6a0dad4b52
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-5.png b/data/styles/clear/style-clear/xxhdpi/route-point-5.png
new file mode 100644
index 0000000000..c2cfc0fa9e
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-6.png b/data/styles/clear/style-clear/xxhdpi/route-point-6.png
new file mode 100644
index 0000000000..fb5869b69c
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-7.png b/data/styles/clear/style-clear/xxhdpi/route-point-7.png
new file mode 100644
index 0000000000..3aa2b02b1e
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-8.png b/data/styles/clear/style-clear/xxhdpi/route-point-8.png
new file mode 100644
index 0000000000..3b2c962b8a
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/route-point-9.png b/data/styles/clear/style-clear/xxhdpi/route-point-9.png
new file mode 100644
index 0000000000..d392577389
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/route-point-9.png 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
deleted file mode 100644
index c515293d2b..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index 86637e1192..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index 8086959194..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-1.png b/data/styles/clear/style-clear/xxxhdpi/route-point-1.png
new file mode 100644
index 0000000000..ee40c709c4
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-10.png b/data/styles/clear/style-clear/xxxhdpi/route-point-10.png
new file mode 100644
index 0000000000..f82766b6f4
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-11.png b/data/styles/clear/style-clear/xxxhdpi/route-point-11.png
new file mode 100644
index 0000000000..d8f6135807
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-12.png b/data/styles/clear/style-clear/xxxhdpi/route-point-12.png
new file mode 100644
index 0000000000..16af05c81b
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-13.png b/data/styles/clear/style-clear/xxxhdpi/route-point-13.png
new file mode 100644
index 0000000000..570d7a5b26
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-14.png b/data/styles/clear/style-clear/xxxhdpi/route-point-14.png
new file mode 100644
index 0000000000..e57357e152
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-15.png b/data/styles/clear/style-clear/xxxhdpi/route-point-15.png
new file mode 100644
index 0000000000..d47d129ab0
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-16.png b/data/styles/clear/style-clear/xxxhdpi/route-point-16.png
new file mode 100644
index 0000000000..8b239ef532
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-17.png b/data/styles/clear/style-clear/xxxhdpi/route-point-17.png
new file mode 100644
index 0000000000..44f34baf09
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-18.png b/data/styles/clear/style-clear/xxxhdpi/route-point-18.png
new file mode 100644
index 0000000000..14156b4ee9
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-19.png b/data/styles/clear/style-clear/xxxhdpi/route-point-19.png
new file mode 100644
index 0000000000..980566efa8
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-2.png b/data/styles/clear/style-clear/xxxhdpi/route-point-2.png
new file mode 100644
index 0000000000..a363b29f7d
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-20.png b/data/styles/clear/style-clear/xxxhdpi/route-point-20.png
new file mode 100644
index 0000000000..226bf1e059
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-3.png b/data/styles/clear/style-clear/xxxhdpi/route-point-3.png
new file mode 100644
index 0000000000..bc99f7c51a
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-4.png b/data/styles/clear/style-clear/xxxhdpi/route-point-4.png
new file mode 100644
index 0000000000..1e7d15c77b
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-5.png b/data/styles/clear/style-clear/xxxhdpi/route-point-5.png
new file mode 100644
index 0000000000..f1eb4fc4d1
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-6.png b/data/styles/clear/style-clear/xxxhdpi/route-point-6.png
new file mode 100644
index 0000000000..d486aa625f
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-7.png b/data/styles/clear/style-clear/xxxhdpi/route-point-7.png
new file mode 100644
index 0000000000..488662bf62
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-8.png b/data/styles/clear/style-clear/xxxhdpi/route-point-8.png
new file mode 100644
index 0000000000..96c1faa015
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-9.png b/data/styles/clear/style-clear/xxxhdpi/route-point-9.png
new file mode 100644
index 0000000000..32a601d971
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-9.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-a.png b/data/styles/clear/style-clear/xxxhdpi/route-point-a.png
deleted file mode 100644
index ff672c3e69..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/route-point-a.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-b.png b/data/styles/clear/style-clear/xxxhdpi/route-point-b.png
deleted file mode 100644
index 153a2623e7..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/route-point-b.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-c.png b/data/styles/clear/style-clear/xxxhdpi/route-point-c.png
deleted file mode 100644
index 974f676146..0000000000
Binary files a/data/styles/clear/style-clear/xxxhdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/route-point-1.png b/data/styles/clear/style-night/6plus/route-point-1.png
new file mode 100644
index 0000000000..7885fcd21c
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-1.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-10.png b/data/styles/clear/style-night/6plus/route-point-10.png
new file mode 100644
index 0000000000..c2fe109874
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-10.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-11.png b/data/styles/clear/style-night/6plus/route-point-11.png
new file mode 100644
index 0000000000..a3715ff959
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-11.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-12.png b/data/styles/clear/style-night/6plus/route-point-12.png
new file mode 100644
index 0000000000..32e733f325
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-12.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-13.png b/data/styles/clear/style-night/6plus/route-point-13.png
new file mode 100644
index 0000000000..10e84bbc77
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-13.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-14.png b/data/styles/clear/style-night/6plus/route-point-14.png
new file mode 100644
index 0000000000..de38b1e8ea
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-14.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-15.png b/data/styles/clear/style-night/6plus/route-point-15.png
new file mode 100644
index 0000000000..84dd24fd91
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-15.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-16.png b/data/styles/clear/style-night/6plus/route-point-16.png
new file mode 100644
index 0000000000..b30da230d8
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-16.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-17.png b/data/styles/clear/style-night/6plus/route-point-17.png
new file mode 100644
index 0000000000..5387eba68e
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-17.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-18.png b/data/styles/clear/style-night/6plus/route-point-18.png
new file mode 100644
index 0000000000..761ecabb70
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-18.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-19.png b/data/styles/clear/style-night/6plus/route-point-19.png
new file mode 100644
index 0000000000..9e6f3062f6
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-19.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-2.png b/data/styles/clear/style-night/6plus/route-point-2.png
new file mode 100644
index 0000000000..6579c201b2
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-2.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-20.png b/data/styles/clear/style-night/6plus/route-point-20.png
new file mode 100644
index 0000000000..147d625b29
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-20.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-3.png b/data/styles/clear/style-night/6plus/route-point-3.png
new file mode 100644
index 0000000000..8e1ac57451
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-3.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-4.png b/data/styles/clear/style-night/6plus/route-point-4.png
new file mode 100644
index 0000000000..f9f6ff138a
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-4.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-5.png b/data/styles/clear/style-night/6plus/route-point-5.png
new file mode 100644
index 0000000000..cdee6b3c7a
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-5.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-6.png b/data/styles/clear/style-night/6plus/route-point-6.png
new file mode 100644
index 0000000000..e7a2d1996a
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-6.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-7.png b/data/styles/clear/style-night/6plus/route-point-7.png
new file mode 100644
index 0000000000..3ef3a369e1
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-7.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-8.png b/data/styles/clear/style-night/6plus/route-point-8.png
new file mode 100644
index 0000000000..9718ad7160
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-8.png differ
diff --git a/data/styles/clear/style-night/6plus/route-point-9.png b/data/styles/clear/style-night/6plus/route-point-9.png
new file mode 100644
index 0000000000..33bc928f44
Binary files /dev/null and b/data/styles/clear/style-night/6plus/route-point-9.png 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
deleted file mode 100644
index dea3febeb7..0000000000
Binary files a/data/styles/clear/style-night/6plus/route-point-a.png and /dev/null 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
deleted file mode 100644
index cc16826036..0000000000
Binary files a/data/styles/clear/style-night/6plus/route-point-b.png and /dev/null 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
deleted file mode 100644
index b92107585b..0000000000
Binary files a/data/styles/clear/style-night/6plus/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-1.png b/data/styles/clear/style-night/hdpi/route-point-1.png
new file mode 100644
index 0000000000..c9044b93f1
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-10.png b/data/styles/clear/style-night/hdpi/route-point-10.png
new file mode 100644
index 0000000000..758c7f1ebb
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-11.png b/data/styles/clear/style-night/hdpi/route-point-11.png
new file mode 100644
index 0000000000..86ac14f4cc
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-12.png b/data/styles/clear/style-night/hdpi/route-point-12.png
new file mode 100644
index 0000000000..a0aaf7318c
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-13.png b/data/styles/clear/style-night/hdpi/route-point-13.png
new file mode 100644
index 0000000000..f24faf445b
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-14.png b/data/styles/clear/style-night/hdpi/route-point-14.png
new file mode 100644
index 0000000000..2eafcc1cee
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-15.png b/data/styles/clear/style-night/hdpi/route-point-15.png
new file mode 100644
index 0000000000..ed6f24ee79
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-16.png b/data/styles/clear/style-night/hdpi/route-point-16.png
new file mode 100644
index 0000000000..168f7c4b6b
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-17.png b/data/styles/clear/style-night/hdpi/route-point-17.png
new file mode 100644
index 0000000000..e940fdd90a
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-18.png b/data/styles/clear/style-night/hdpi/route-point-18.png
new file mode 100644
index 0000000000..5a44d9646e
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-19.png b/data/styles/clear/style-night/hdpi/route-point-19.png
new file mode 100644
index 0000000000..80a1353d7d
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-2.png b/data/styles/clear/style-night/hdpi/route-point-2.png
new file mode 100644
index 0000000000..2500291aef
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-20.png b/data/styles/clear/style-night/hdpi/route-point-20.png
new file mode 100644
index 0000000000..37b2eea09b
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-3.png b/data/styles/clear/style-night/hdpi/route-point-3.png
new file mode 100644
index 0000000000..2142a9bda3
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-4.png b/data/styles/clear/style-night/hdpi/route-point-4.png
new file mode 100644
index 0000000000..2386223ff8
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-5.png b/data/styles/clear/style-night/hdpi/route-point-5.png
new file mode 100644
index 0000000000..f4922683c8
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-6.png b/data/styles/clear/style-night/hdpi/route-point-6.png
new file mode 100644
index 0000000000..4532754710
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-7.png b/data/styles/clear/style-night/hdpi/route-point-7.png
new file mode 100644
index 0000000000..9b1763f9f1
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-8.png b/data/styles/clear/style-night/hdpi/route-point-8.png
new file mode 100644
index 0000000000..c1751a488e
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-night/hdpi/route-point-9.png b/data/styles/clear/style-night/hdpi/route-point-9.png
new file mode 100644
index 0000000000..611505231c
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/route-point-9.png 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
deleted file mode 100644
index e55e60791d..0000000000
Binary files a/data/styles/clear/style-night/hdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index 7c7d911320..0000000000
Binary files a/data/styles/clear/style-night/hdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index f1bd72d13b..0000000000
Binary files a/data/styles/clear/style-night/hdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-1.png b/data/styles/clear/style-night/mdpi/route-point-1.png
new file mode 100644
index 0000000000..35b68946f7
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-10.png b/data/styles/clear/style-night/mdpi/route-point-10.png
new file mode 100644
index 0000000000..fac5e5777b
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-11.png b/data/styles/clear/style-night/mdpi/route-point-11.png
new file mode 100644
index 0000000000..f5c02b6cda
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-12.png b/data/styles/clear/style-night/mdpi/route-point-12.png
new file mode 100644
index 0000000000..7a02e1f8bd
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-13.png b/data/styles/clear/style-night/mdpi/route-point-13.png
new file mode 100644
index 0000000000..13422fedac
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-14.png b/data/styles/clear/style-night/mdpi/route-point-14.png
new file mode 100644
index 0000000000..1e029fe786
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-15.png b/data/styles/clear/style-night/mdpi/route-point-15.png
new file mode 100644
index 0000000000..e6563c0878
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-16.png b/data/styles/clear/style-night/mdpi/route-point-16.png
new file mode 100644
index 0000000000..7f5807a833
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-17.png b/data/styles/clear/style-night/mdpi/route-point-17.png
new file mode 100644
index 0000000000..795d98db7c
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-18.png b/data/styles/clear/style-night/mdpi/route-point-18.png
new file mode 100644
index 0000000000..e04d3640d1
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-19.png b/data/styles/clear/style-night/mdpi/route-point-19.png
new file mode 100644
index 0000000000..44836a0aae
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-2.png b/data/styles/clear/style-night/mdpi/route-point-2.png
new file mode 100644
index 0000000000..8d353a67cc
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-20.png b/data/styles/clear/style-night/mdpi/route-point-20.png
new file mode 100644
index 0000000000..b68d5d903d
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-3.png b/data/styles/clear/style-night/mdpi/route-point-3.png
new file mode 100644
index 0000000000..4619cd6f32
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-4.png b/data/styles/clear/style-night/mdpi/route-point-4.png
new file mode 100644
index 0000000000..f846d2731f
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-5.png b/data/styles/clear/style-night/mdpi/route-point-5.png
new file mode 100644
index 0000000000..cb7c51f132
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-6.png b/data/styles/clear/style-night/mdpi/route-point-6.png
new file mode 100644
index 0000000000..e121b0cb22
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-7.png b/data/styles/clear/style-night/mdpi/route-point-7.png
new file mode 100644
index 0000000000..5f24083abe
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-8.png b/data/styles/clear/style-night/mdpi/route-point-8.png
new file mode 100644
index 0000000000..a696a3bb74
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-night/mdpi/route-point-9.png b/data/styles/clear/style-night/mdpi/route-point-9.png
new file mode 100644
index 0000000000..d55183bb00
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/route-point-9.png 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
deleted file mode 100644
index 52f216a055..0000000000
Binary files a/data/styles/clear/style-night/mdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index 7ffd4a33a4..0000000000
Binary files a/data/styles/clear/style-night/mdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index 830d7a2f9b..0000000000
Binary files a/data/styles/clear/style-night/mdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-1.png b/data/styles/clear/style-night/xhdpi/route-point-1.png
new file mode 100644
index 0000000000..19ae0146f3
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-10.png b/data/styles/clear/style-night/xhdpi/route-point-10.png
new file mode 100644
index 0000000000..cd2a7e5194
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-11.png b/data/styles/clear/style-night/xhdpi/route-point-11.png
new file mode 100644
index 0000000000..6bdab1a2df
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-12.png b/data/styles/clear/style-night/xhdpi/route-point-12.png
new file mode 100644
index 0000000000..b55607e5b4
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-13.png b/data/styles/clear/style-night/xhdpi/route-point-13.png
new file mode 100644
index 0000000000..50d477caaa
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-14.png b/data/styles/clear/style-night/xhdpi/route-point-14.png
new file mode 100644
index 0000000000..04f23e7a41
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-15.png b/data/styles/clear/style-night/xhdpi/route-point-15.png
new file mode 100644
index 0000000000..ea67a5124d
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-16.png b/data/styles/clear/style-night/xhdpi/route-point-16.png
new file mode 100644
index 0000000000..a73f8dd47b
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-17.png b/data/styles/clear/style-night/xhdpi/route-point-17.png
new file mode 100644
index 0000000000..dbde143539
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-18.png b/data/styles/clear/style-night/xhdpi/route-point-18.png
new file mode 100644
index 0000000000..1863a45aba
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-19.png b/data/styles/clear/style-night/xhdpi/route-point-19.png
new file mode 100644
index 0000000000..5c2c64bbce
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-2.png b/data/styles/clear/style-night/xhdpi/route-point-2.png
new file mode 100644
index 0000000000..6fedeb241b
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-20.png b/data/styles/clear/style-night/xhdpi/route-point-20.png
new file mode 100644
index 0000000000..6bb7e51053
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-3.png b/data/styles/clear/style-night/xhdpi/route-point-3.png
new file mode 100644
index 0000000000..ff108dc44d
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-4.png b/data/styles/clear/style-night/xhdpi/route-point-4.png
new file mode 100644
index 0000000000..ed6ff9f3b3
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-5.png b/data/styles/clear/style-night/xhdpi/route-point-5.png
new file mode 100644
index 0000000000..050c0e6e00
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-6.png b/data/styles/clear/style-night/xhdpi/route-point-6.png
new file mode 100644
index 0000000000..d761f20000
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-7.png b/data/styles/clear/style-night/xhdpi/route-point-7.png
new file mode 100644
index 0000000000..c4da664231
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-8.png b/data/styles/clear/style-night/xhdpi/route-point-8.png
new file mode 100644
index 0000000000..358331c33b
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-night/xhdpi/route-point-9.png b/data/styles/clear/style-night/xhdpi/route-point-9.png
new file mode 100644
index 0000000000..174c61ea3c
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/route-point-9.png 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
deleted file mode 100644
index 40f5c86f06..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index cd09400739..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index b2b51ce5a7..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-1.png b/data/styles/clear/style-night/xxhdpi/route-point-1.png
new file mode 100644
index 0000000000..a85b90b082
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-10.png b/data/styles/clear/style-night/xxhdpi/route-point-10.png
new file mode 100644
index 0000000000..3190c827a1
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-11.png b/data/styles/clear/style-night/xxhdpi/route-point-11.png
new file mode 100644
index 0000000000..d06e33c9a1
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-12.png b/data/styles/clear/style-night/xxhdpi/route-point-12.png
new file mode 100644
index 0000000000..3bd8a4b7c9
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-13.png b/data/styles/clear/style-night/xxhdpi/route-point-13.png
new file mode 100644
index 0000000000..2c9bf87aa1
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-14.png b/data/styles/clear/style-night/xxhdpi/route-point-14.png
new file mode 100644
index 0000000000..17f63152cf
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-15.png b/data/styles/clear/style-night/xxhdpi/route-point-15.png
new file mode 100644
index 0000000000..a0d25b2f7c
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-16.png b/data/styles/clear/style-night/xxhdpi/route-point-16.png
new file mode 100644
index 0000000000..08a6258153
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-17.png b/data/styles/clear/style-night/xxhdpi/route-point-17.png
new file mode 100644
index 0000000000..4b29295628
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-18.png b/data/styles/clear/style-night/xxhdpi/route-point-18.png
new file mode 100644
index 0000000000..66248d9dc1
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-19.png b/data/styles/clear/style-night/xxhdpi/route-point-19.png
new file mode 100644
index 0000000000..326e1ea75b
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-2.png b/data/styles/clear/style-night/xxhdpi/route-point-2.png
new file mode 100644
index 0000000000..327d044102
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-20.png b/data/styles/clear/style-night/xxhdpi/route-point-20.png
new file mode 100644
index 0000000000..7b7ca9d1e5
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-3.png b/data/styles/clear/style-night/xxhdpi/route-point-3.png
new file mode 100644
index 0000000000..63ed5a4d12
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-4.png b/data/styles/clear/style-night/xxhdpi/route-point-4.png
new file mode 100644
index 0000000000..6a0dad4b52
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-5.png b/data/styles/clear/style-night/xxhdpi/route-point-5.png
new file mode 100644
index 0000000000..c2cfc0fa9e
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-6.png b/data/styles/clear/style-night/xxhdpi/route-point-6.png
new file mode 100644
index 0000000000..fb5869b69c
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-7.png b/data/styles/clear/style-night/xxhdpi/route-point-7.png
new file mode 100644
index 0000000000..3aa2b02b1e
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-8.png b/data/styles/clear/style-night/xxhdpi/route-point-8.png
new file mode 100644
index 0000000000..3b2c962b8a
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/route-point-9.png b/data/styles/clear/style-night/xxhdpi/route-point-9.png
new file mode 100644
index 0000000000..d392577389
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/route-point-9.png 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
deleted file mode 100644
index c515293d2b..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/route-point-a.png and /dev/null 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
deleted file mode 100644
index 86637e1192..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/route-point-b.png and /dev/null 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
deleted file mode 100644
index 8086959194..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/route-point-c.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-1.png b/data/styles/clear/style-night/xxxhdpi/route-point-1.png
new file mode 100644
index 0000000000..ee40c709c4
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-1.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-10.png b/data/styles/clear/style-night/xxxhdpi/route-point-10.png
new file mode 100644
index 0000000000..f82766b6f4
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-10.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-11.png b/data/styles/clear/style-night/xxxhdpi/route-point-11.png
new file mode 100644
index 0000000000..d8f6135807
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-11.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-12.png b/data/styles/clear/style-night/xxxhdpi/route-point-12.png
new file mode 100644
index 0000000000..16af05c81b
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-12.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-13.png b/data/styles/clear/style-night/xxxhdpi/route-point-13.png
new file mode 100644
index 0000000000..570d7a5b26
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-13.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-14.png b/data/styles/clear/style-night/xxxhdpi/route-point-14.png
new file mode 100644
index 0000000000..e57357e152
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-14.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-15.png b/data/styles/clear/style-night/xxxhdpi/route-point-15.png
new file mode 100644
index 0000000000..d47d129ab0
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-15.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-16.png b/data/styles/clear/style-night/xxxhdpi/route-point-16.png
new file mode 100644
index 0000000000..8b239ef532
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-16.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-17.png b/data/styles/clear/style-night/xxxhdpi/route-point-17.png
new file mode 100644
index 0000000000..44f34baf09
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-17.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-18.png b/data/styles/clear/style-night/xxxhdpi/route-point-18.png
new file mode 100644
index 0000000000..14156b4ee9
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-18.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-19.png b/data/styles/clear/style-night/xxxhdpi/route-point-19.png
new file mode 100644
index 0000000000..980566efa8
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-19.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-2.png b/data/styles/clear/style-night/xxxhdpi/route-point-2.png
new file mode 100644
index 0000000000..a363b29f7d
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-2.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-20.png b/data/styles/clear/style-night/xxxhdpi/route-point-20.png
new file mode 100644
index 0000000000..226bf1e059
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-20.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-3.png b/data/styles/clear/style-night/xxxhdpi/route-point-3.png
new file mode 100644
index 0000000000..bc99f7c51a
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-3.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-4.png b/data/styles/clear/style-night/xxxhdpi/route-point-4.png
new file mode 100644
index 0000000000..1e7d15c77b
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-4.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-5.png b/data/styles/clear/style-night/xxxhdpi/route-point-5.png
new file mode 100644
index 0000000000..f1eb4fc4d1
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-5.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-6.png b/data/styles/clear/style-night/xxxhdpi/route-point-6.png
new file mode 100644
index 0000000000..d486aa625f
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-6.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-7.png b/data/styles/clear/style-night/xxxhdpi/route-point-7.png
new file mode 100644
index 0000000000..488662bf62
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-7.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-8.png b/data/styles/clear/style-night/xxxhdpi/route-point-8.png
new file mode 100644
index 0000000000..96c1faa015
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-8.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-9.png b/data/styles/clear/style-night/xxxhdpi/route-point-9.png
new file mode 100644
index 0000000000..32a601d971
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-9.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-a.png b/data/styles/clear/style-night/xxxhdpi/route-point-a.png
deleted file mode 100644
index ff672c3e69..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/route-point-a.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-b.png b/data/styles/clear/style-night/xxxhdpi/route-point-b.png
deleted file mode 100644
index 153a2623e7..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/route-point-b.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-c.png b/data/styles/clear/style-night/xxxhdpi/route-point-c.png
deleted file mode 100644
index 974f676146..0000000000
Binary files a/data/styles/clear/style-night/xxxhdpi/route-point-c.png and /dev/null differ
diff --git a/map/routing_mark.cpp b/map/routing_mark.cpp
index 29261c51c8..0697bccad1 100644
--- a/map/routing_mark.cpp
+++ b/map/routing_mark.cpp
@@ -187,15 +187,11 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> RouteMarkPoint::GetSymbolNames(
     case RouteMarkType::Finish: name = "route-point-finish"; break;
     case RouteMarkType::Intermediate:
     {
-      switch (m_markData.m_intermediateIndex)
-      {
-      case 0: name = "route-point-a"; break;
-      case 1: name = "route-point-b"; break;
-      case 2: name = "route-point-c"; break;
-      // TODO: Properly add icons for other letters/numbers after C.
-      default: name = "route-point-c"; break;
-      }
-      break;
+      // TODO: Properly add icons for other letters/numbers after 20.
+      if (m_markData.m_intermediateIndex >= 0 && m_markData.m_intermediateIndex < 19)
+        name = "route-point-" + std::to_string(m_markData.m_intermediateIndex + 1);
+      else
+        name = "route-point-20";
     }
   }
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();