diff --git a/data/resources-6plus/basic.skn b/data/resources-6plus/basic.skn
new file mode 100644
index 0000000000..cedc66d51f
--- /dev/null
+++ b/data/resources-6plus/basic.skn
@@ -0,0 +1,524 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-6plus/symbols.png b/data/resources-6plus/symbols.png
new file mode 100644
index 0000000000..13e5e6342f
Binary files /dev/null and b/data/resources-6plus/symbols.png differ
diff --git a/data/resources-6plus/symbols.sdf b/data/resources-6plus/symbols.sdf
new file mode 100644
index 0000000000..a15b874ceb
--- /dev/null
+++ b/data/resources-6plus/symbols.sdf
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn
index 56cf439e83..10cc54777f 100644
--- a/data/resources-hdpi/basic.skn
+++ b/data/resources-hdpi/basic.skn
@@ -1,524 +1,524 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png
index 357c2780aa..01b99cc6a0 100644
Binary files a/data/resources-hdpi/symbols.png and b/data/resources-hdpi/symbols.png differ
diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf
index eb0d2b9609..2935b072b1 100644
--- a/data/resources-hdpi/symbols.sdf
+++ b/data/resources-hdpi/symbols.sdf
@@ -1,178 +1,178 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-ldpi/basic.skn b/data/resources-ldpi/basic.skn
index 8727263193..ca79f30fbb 100644
--- a/data/resources-ldpi/basic.skn
+++ b/data/resources-ldpi/basic.skn
@@ -1,524 +1,524 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png
index 8e68250880..0e7a66246b 100644
Binary files a/data/resources-ldpi/symbols.png and b/data/resources-ldpi/symbols.png differ
diff --git a/data/resources-ldpi/symbols.sdf b/data/resources-ldpi/symbols.sdf
index ca19368377..ae01b09703 100644
--- a/data/resources-ldpi/symbols.sdf
+++ b/data/resources-ldpi/symbols.sdf
@@ -1,178 +1,178 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-mdpi/basic.skn b/data/resources-mdpi/basic.skn
index c311be4dab..1c82e3c193 100644
--- a/data/resources-mdpi/basic.skn
+++ b/data/resources-mdpi/basic.skn
@@ -1,524 +1,524 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png
index a06e0f5676..22f72cdf25 100644
Binary files a/data/resources-mdpi/symbols.png and b/data/resources-mdpi/symbols.png differ
diff --git a/data/resources-mdpi/symbols.sdf b/data/resources-mdpi/symbols.sdf
index 2772d710f9..8dbd7476c2 100644
--- a/data/resources-mdpi/symbols.sdf
+++ b/data/resources-mdpi/symbols.sdf
@@ -1,178 +1,178 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xhdpi/basic.skn b/data/resources-xhdpi/basic.skn
index ffbc29803b..1383ac5ac0 100644
--- a/data/resources-xhdpi/basic.skn
+++ b/data/resources-xhdpi/basic.skn
@@ -1,524 +1,524 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png
index 79f71ed171..5dc22e4eea 100644
Binary files a/data/resources-xhdpi/symbols.png and b/data/resources-xhdpi/symbols.png differ
diff --git a/data/resources-xhdpi/symbols.sdf b/data/resources-xhdpi/symbols.sdf
index cd5a1e5a6b..e54e6831f2 100644
--- a/data/resources-xhdpi/symbols.sdf
+++ b/data/resources-xhdpi/symbols.sdf
@@ -1,132 +1,132 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -137,42 +137,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/resources-xxhdpi/basic.skn b/data/resources-xxhdpi/basic.skn
index 00d98cb186..18bf08bf4e 100644
--- a/data/resources-xxhdpi/basic.skn
+++ b/data/resources-xxhdpi/basic.skn
@@ -1,524 +1,524 @@
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png
index cda23227a0..c3eed2c768 100644
Binary files a/data/resources-xxhdpi/symbols.png and b/data/resources-xxhdpi/symbols.png differ
diff --git a/data/resources-xxhdpi/symbols.sdf b/data/resources-xxhdpi/symbols.sdf
index 85e4f1286d..013a320424 100644
--- a/data/resources-xxhdpi/symbols.sdf
+++ b/data/resources-xxhdpi/symbols.sdf
@@ -1,178 +1,178 @@
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/6plus/api-result.png b/data/styles/6plus/api-result.png
new file mode 100644
index 0000000000..0d61a22d18
Binary files /dev/null and b/data/styles/6plus/api-result.png differ
diff --git a/data/styles/6plus/compass-image.png b/data/styles/6plus/compass-image.png
new file mode 100644
index 0000000000..e39aa25dff
Binary files /dev/null and b/data/styles/6plus/compass-image.png differ
diff --git a/data/styles/6plus/current-position-compas.png b/data/styles/6plus/current-position-compas.png
new file mode 100644
index 0000000000..9e69d444ad
Binary files /dev/null and b/data/styles/6plus/current-position-compas.png differ
diff --git a/data/styles/6plus/current-position.png b/data/styles/6plus/current-position.png
new file mode 100644
index 0000000000..1d4ec92ee4
Binary files /dev/null and b/data/styles/6plus/current-position.png differ
diff --git a/data/styles/6plus/current-routing-compas.png b/data/styles/6plus/current-routing-compas.png
new file mode 100644
index 0000000000..260cdd2010
Binary files /dev/null and b/data/styles/6plus/current-routing-compas.png differ
diff --git a/data/styles/6plus/placemark-blue.png b/data/styles/6plus/placemark-blue.png
new file mode 100644
index 0000000000..d03f7f55a2
Binary files /dev/null and b/data/styles/6plus/placemark-blue.png differ
diff --git a/data/styles/6plus/placemark-brown.png b/data/styles/6plus/placemark-brown.png
new file mode 100644
index 0000000000..66e15ae23a
Binary files /dev/null and b/data/styles/6plus/placemark-brown.png differ
diff --git a/data/styles/6plus/placemark-green.png b/data/styles/6plus/placemark-green.png
new file mode 100644
index 0000000000..3500948014
Binary files /dev/null and b/data/styles/6plus/placemark-green.png differ
diff --git a/data/styles/6plus/placemark-orange.png b/data/styles/6plus/placemark-orange.png
new file mode 100644
index 0000000000..7e4d037f7c
Binary files /dev/null and b/data/styles/6plus/placemark-orange.png differ
diff --git a/data/styles/6plus/placemark-pink.png b/data/styles/6plus/placemark-pink.png
new file mode 100644
index 0000000000..9bb217a3ae
Binary files /dev/null and b/data/styles/6plus/placemark-pink.png differ
diff --git a/data/styles/6plus/placemark-purple.png b/data/styles/6plus/placemark-purple.png
new file mode 100644
index 0000000000..2442ee46bf
Binary files /dev/null and b/data/styles/6plus/placemark-purple.png differ
diff --git a/data/styles/6plus/placemark-red.png b/data/styles/6plus/placemark-red.png
new file mode 100644
index 0000000000..a41c790e02
Binary files /dev/null and b/data/styles/6plus/placemark-red.png differ
diff --git a/data/styles/6plus/placemark-yellow.png b/data/styles/6plus/placemark-yellow.png
new file mode 100644
index 0000000000..345fecacde
Binary files /dev/null and b/data/styles/6plus/placemark-yellow.png differ
diff --git a/data/styles/6plus/route_from.png b/data/styles/6plus/route_from.png
new file mode 100644
index 0000000000..76ba771e5a
Binary files /dev/null and b/data/styles/6plus/route_from.png differ
diff --git a/data/styles/6plus/route_to.png b/data/styles/6plus/route_to.png
new file mode 100644
index 0000000000..67b521d018
Binary files /dev/null and b/data/styles/6plus/route_to.png differ
diff --git a/data/styles/6plus/search-result-active.png b/data/styles/6plus/search-result-active.png
new file mode 100644
index 0000000000..9494c238f9
Binary files /dev/null and b/data/styles/6plus/search-result-active.png differ
diff --git a/data/styles/6plus/search-result.png b/data/styles/6plus/search-result.png
new file mode 100644
index 0000000000..a904171743
Binary files /dev/null and b/data/styles/6plus/search-result.png differ
diff --git a/data/styles/hdpi/api-result.png b/data/styles/hdpi/api-result.png
index d116083ae6..1c1d150469 100644
Binary files a/data/styles/hdpi/api-result.png and b/data/styles/hdpi/api-result.png differ
diff --git a/data/styles/hdpi/compass-image.png b/data/styles/hdpi/compass-image.png
index 02406616fd..038324ef8e 100644
Binary files a/data/styles/hdpi/compass-image.png and b/data/styles/hdpi/compass-image.png differ
diff --git a/data/styles/hdpi/current-position-compas.png b/data/styles/hdpi/current-position-compas.png
index 6124459f0a..073435cb54 100644
Binary files a/data/styles/hdpi/current-position-compas.png and b/data/styles/hdpi/current-position-compas.png differ
diff --git a/data/styles/hdpi/current-position.png b/data/styles/hdpi/current-position.png
index 8de453156e..3178dc370a 100644
Binary files a/data/styles/hdpi/current-position.png and b/data/styles/hdpi/current-position.png differ
diff --git a/data/styles/hdpi/current-routing-compas.png b/data/styles/hdpi/current-routing-compas.png
index d8cec189d3..eb486b38ab 100644
Binary files a/data/styles/hdpi/current-routing-compas.png and b/data/styles/hdpi/current-routing-compas.png differ
diff --git a/data/styles/hdpi/placemark-blue.png b/data/styles/hdpi/placemark-blue.png
index aabd8fe967..c304a16125 100644
Binary files a/data/styles/hdpi/placemark-blue.png and b/data/styles/hdpi/placemark-blue.png differ
diff --git a/data/styles/hdpi/placemark-brown.png b/data/styles/hdpi/placemark-brown.png
index 92cce9f943..e02c80f951 100644
Binary files a/data/styles/hdpi/placemark-brown.png and b/data/styles/hdpi/placemark-brown.png differ
diff --git a/data/styles/hdpi/placemark-green.png b/data/styles/hdpi/placemark-green.png
index 69c691c4bf..1f1d00b206 100644
Binary files a/data/styles/hdpi/placemark-green.png and b/data/styles/hdpi/placemark-green.png differ
diff --git a/data/styles/hdpi/placemark-orange.png b/data/styles/hdpi/placemark-orange.png
index 454bac6bc3..95224d857d 100644
Binary files a/data/styles/hdpi/placemark-orange.png and b/data/styles/hdpi/placemark-orange.png differ
diff --git a/data/styles/hdpi/placemark-pink.png b/data/styles/hdpi/placemark-pink.png
index 18bf3af905..28f1605a33 100644
Binary files a/data/styles/hdpi/placemark-pink.png and b/data/styles/hdpi/placemark-pink.png differ
diff --git a/data/styles/hdpi/placemark-purple.png b/data/styles/hdpi/placemark-purple.png
index dd5e129214..f00c5f5e39 100644
Binary files a/data/styles/hdpi/placemark-purple.png and b/data/styles/hdpi/placemark-purple.png differ
diff --git a/data/styles/hdpi/placemark-red.png b/data/styles/hdpi/placemark-red.png
index 2364b1c650..a5e1a0fb8e 100644
Binary files a/data/styles/hdpi/placemark-red.png and b/data/styles/hdpi/placemark-red.png differ
diff --git a/data/styles/hdpi/placemark-yellow.png b/data/styles/hdpi/placemark-yellow.png
index 89651a4280..e9ee880f71 100644
Binary files a/data/styles/hdpi/placemark-yellow.png and b/data/styles/hdpi/placemark-yellow.png differ
diff --git a/data/styles/hdpi/route_from.png b/data/styles/hdpi/route_from.png
index 69f3d9c7da..b457b0f2a5 100644
Binary files a/data/styles/hdpi/route_from.png and b/data/styles/hdpi/route_from.png differ
diff --git a/data/styles/hdpi/route_to.png b/data/styles/hdpi/route_to.png
index 5d4ca26d58..4b0ecaab94 100644
Binary files a/data/styles/hdpi/route_to.png and b/data/styles/hdpi/route_to.png differ
diff --git a/data/styles/hdpi/search-result-active.png b/data/styles/hdpi/search-result-active.png
index ac8fb3cc75..96f8bc89f3 100644
Binary files a/data/styles/hdpi/search-result-active.png and b/data/styles/hdpi/search-result-active.png differ
diff --git a/data/styles/hdpi/search-result.png b/data/styles/hdpi/search-result.png
index 7d4d1fae03..dd62f12f00 100644
Binary files a/data/styles/hdpi/search-result.png and b/data/styles/hdpi/search-result.png differ
diff --git a/data/styles/ldpi/api-result.png b/data/styles/ldpi/api-result.png
index fb680a87bc..3e51253981 100644
Binary files a/data/styles/ldpi/api-result.png and b/data/styles/ldpi/api-result.png differ
diff --git a/data/styles/ldpi/compass-image.png b/data/styles/ldpi/compass-image.png
index 6ed1142eac..70c1320384 100644
Binary files a/data/styles/ldpi/compass-image.png and b/data/styles/ldpi/compass-image.png differ
diff --git a/data/styles/ldpi/current-position-compas.png b/data/styles/ldpi/current-position-compas.png
index ad95e89278..742339c6a5 100644
Binary files a/data/styles/ldpi/current-position-compas.png and b/data/styles/ldpi/current-position-compas.png differ
diff --git a/data/styles/ldpi/current-position.png b/data/styles/ldpi/current-position.png
index 73040ace2b..5138508aac 100644
Binary files a/data/styles/ldpi/current-position.png and b/data/styles/ldpi/current-position.png differ
diff --git a/data/styles/ldpi/current-routing-compas.png b/data/styles/ldpi/current-routing-compas.png
index 9fd728024d..a2c850f6ff 100644
Binary files a/data/styles/ldpi/current-routing-compas.png and b/data/styles/ldpi/current-routing-compas.png differ
diff --git a/data/styles/ldpi/placemark-blue.png b/data/styles/ldpi/placemark-blue.png
index e0fe34835a..76dddf53cb 100644
Binary files a/data/styles/ldpi/placemark-blue.png and b/data/styles/ldpi/placemark-blue.png differ
diff --git a/data/styles/ldpi/placemark-brown.png b/data/styles/ldpi/placemark-brown.png
index aa7f0c1f54..428d29f778 100644
Binary files a/data/styles/ldpi/placemark-brown.png and b/data/styles/ldpi/placemark-brown.png differ
diff --git a/data/styles/ldpi/placemark-green.png b/data/styles/ldpi/placemark-green.png
index 3a4509c58f..1d21f7faa1 100644
Binary files a/data/styles/ldpi/placemark-green.png and b/data/styles/ldpi/placemark-green.png differ
diff --git a/data/styles/ldpi/placemark-orange.png b/data/styles/ldpi/placemark-orange.png
index 2529fb5bdb..7263fc8c31 100644
Binary files a/data/styles/ldpi/placemark-orange.png and b/data/styles/ldpi/placemark-orange.png differ
diff --git a/data/styles/ldpi/placemark-pink.png b/data/styles/ldpi/placemark-pink.png
index 1e3e48b765..7888043c77 100644
Binary files a/data/styles/ldpi/placemark-pink.png and b/data/styles/ldpi/placemark-pink.png differ
diff --git a/data/styles/ldpi/placemark-purple.png b/data/styles/ldpi/placemark-purple.png
index 949369d9ff..771176a0a2 100644
Binary files a/data/styles/ldpi/placemark-purple.png and b/data/styles/ldpi/placemark-purple.png differ
diff --git a/data/styles/ldpi/placemark-red.png b/data/styles/ldpi/placemark-red.png
index a72bc134c2..4d0ffc492d 100644
Binary files a/data/styles/ldpi/placemark-red.png and b/data/styles/ldpi/placemark-red.png differ
diff --git a/data/styles/ldpi/placemark-yellow.png b/data/styles/ldpi/placemark-yellow.png
index 06f20f109a..f2277787e2 100644
Binary files a/data/styles/ldpi/placemark-yellow.png and b/data/styles/ldpi/placemark-yellow.png differ
diff --git a/data/styles/ldpi/route_from.png b/data/styles/ldpi/route_from.png
index 4c77dc6946..e305504f3b 100644
Binary files a/data/styles/ldpi/route_from.png and b/data/styles/ldpi/route_from.png differ
diff --git a/data/styles/ldpi/route_to.png b/data/styles/ldpi/route_to.png
index b8b7b69352..4c87d967b2 100644
Binary files a/data/styles/ldpi/route_to.png and b/data/styles/ldpi/route_to.png differ
diff --git a/data/styles/ldpi/search-result-active.png b/data/styles/ldpi/search-result-active.png
index f79eb65a04..8d53f21bcf 100644
Binary files a/data/styles/ldpi/search-result-active.png and b/data/styles/ldpi/search-result-active.png differ
diff --git a/data/styles/ldpi/search-result.png b/data/styles/ldpi/search-result.png
index 00da1fcb31..97234273fc 100644
Binary files a/data/styles/ldpi/search-result.png and b/data/styles/ldpi/search-result.png differ
diff --git a/data/styles/mdpi/api-result.png b/data/styles/mdpi/api-result.png
index 8f3f27e7a7..088abf16de 100644
Binary files a/data/styles/mdpi/api-result.png and b/data/styles/mdpi/api-result.png differ
diff --git a/data/styles/mdpi/compass-image.png b/data/styles/mdpi/compass-image.png
index 3cb750cdf4..cbf3089d2a 100644
Binary files a/data/styles/mdpi/compass-image.png and b/data/styles/mdpi/compass-image.png differ
diff --git a/data/styles/mdpi/current-position-compas.png b/data/styles/mdpi/current-position-compas.png
index c79efad2b2..fc6f0c3111 100644
Binary files a/data/styles/mdpi/current-position-compas.png and b/data/styles/mdpi/current-position-compas.png differ
diff --git a/data/styles/mdpi/current-position.png b/data/styles/mdpi/current-position.png
index 584c7d4f05..9c5482003d 100644
Binary files a/data/styles/mdpi/current-position.png and b/data/styles/mdpi/current-position.png differ
diff --git a/data/styles/mdpi/current-routing-compas.png b/data/styles/mdpi/current-routing-compas.png
index 6ee3b649cd..ee583b3e97 100644
Binary files a/data/styles/mdpi/current-routing-compas.png and b/data/styles/mdpi/current-routing-compas.png differ
diff --git a/data/styles/mdpi/placemark-blue.png b/data/styles/mdpi/placemark-blue.png
index c2b686de90..f6035b5e68 100644
Binary files a/data/styles/mdpi/placemark-blue.png and b/data/styles/mdpi/placemark-blue.png differ
diff --git a/data/styles/mdpi/placemark-brown.png b/data/styles/mdpi/placemark-brown.png
index f638920852..f31f9e0f1e 100644
Binary files a/data/styles/mdpi/placemark-brown.png and b/data/styles/mdpi/placemark-brown.png differ
diff --git a/data/styles/mdpi/placemark-green.png b/data/styles/mdpi/placemark-green.png
index 44b8857ff1..18bf41ae0a 100644
Binary files a/data/styles/mdpi/placemark-green.png and b/data/styles/mdpi/placemark-green.png differ
diff --git a/data/styles/mdpi/placemark-orange.png b/data/styles/mdpi/placemark-orange.png
index 326ab640c4..1dd7243d47 100644
Binary files a/data/styles/mdpi/placemark-orange.png and b/data/styles/mdpi/placemark-orange.png differ
diff --git a/data/styles/mdpi/placemark-pink.png b/data/styles/mdpi/placemark-pink.png
index 8553c98345..0252e99a87 100644
Binary files a/data/styles/mdpi/placemark-pink.png and b/data/styles/mdpi/placemark-pink.png differ
diff --git a/data/styles/mdpi/placemark-purple.png b/data/styles/mdpi/placemark-purple.png
index 878fbef6ac..3d02194015 100644
Binary files a/data/styles/mdpi/placemark-purple.png and b/data/styles/mdpi/placemark-purple.png differ
diff --git a/data/styles/mdpi/placemark-red.png b/data/styles/mdpi/placemark-red.png
index 33b159be2c..7c1fff6861 100644
Binary files a/data/styles/mdpi/placemark-red.png and b/data/styles/mdpi/placemark-red.png differ
diff --git a/data/styles/mdpi/placemark-yellow.png b/data/styles/mdpi/placemark-yellow.png
index 55a61176ec..bb0710e5a3 100644
Binary files a/data/styles/mdpi/placemark-yellow.png and b/data/styles/mdpi/placemark-yellow.png differ
diff --git a/data/styles/mdpi/route_from.png b/data/styles/mdpi/route_from.png
index 6469d3a2b1..c3d31ff777 100644
Binary files a/data/styles/mdpi/route_from.png and b/data/styles/mdpi/route_from.png differ
diff --git a/data/styles/mdpi/route_to.png b/data/styles/mdpi/route_to.png
index b7e2d64f66..47d548989f 100644
Binary files a/data/styles/mdpi/route_to.png and b/data/styles/mdpi/route_to.png differ
diff --git a/data/styles/mdpi/search-result-active.png b/data/styles/mdpi/search-result-active.png
index 942dfa2c3a..0981ef9448 100644
Binary files a/data/styles/mdpi/search-result-active.png and b/data/styles/mdpi/search-result-active.png differ
diff --git a/data/styles/mdpi/search-result.png b/data/styles/mdpi/search-result.png
index 667090c5ee..3abda4fbbb 100644
Binary files a/data/styles/mdpi/search-result.png and b/data/styles/mdpi/search-result.png differ
diff --git a/data/styles/xhdpi/api-result.png b/data/styles/xhdpi/api-result.png
index e634f541fd..9e05de31c7 100644
Binary files a/data/styles/xhdpi/api-result.png and b/data/styles/xhdpi/api-result.png differ
diff --git a/data/styles/xhdpi/compass-image.png b/data/styles/xhdpi/compass-image.png
index 715073e659..19a8d7677c 100644
Binary files a/data/styles/xhdpi/compass-image.png and b/data/styles/xhdpi/compass-image.png differ
diff --git a/data/styles/xhdpi/current-position-compas.png b/data/styles/xhdpi/current-position-compas.png
index cecc084ca4..60f95a28f0 100644
Binary files a/data/styles/xhdpi/current-position-compas.png and b/data/styles/xhdpi/current-position-compas.png differ
diff --git a/data/styles/xhdpi/current-position.png b/data/styles/xhdpi/current-position.png
index 62253b2257..72b70dc261 100644
Binary files a/data/styles/xhdpi/current-position.png and b/data/styles/xhdpi/current-position.png differ
diff --git a/data/styles/xhdpi/current-routing-compas.png b/data/styles/xhdpi/current-routing-compas.png
index f4e31157dd..cb6d23aac4 100644
Binary files a/data/styles/xhdpi/current-routing-compas.png and b/data/styles/xhdpi/current-routing-compas.png differ
diff --git a/data/styles/xhdpi/placemark-blue.png b/data/styles/xhdpi/placemark-blue.png
index 82af15fd0e..859cd49206 100644
Binary files a/data/styles/xhdpi/placemark-blue.png and b/data/styles/xhdpi/placemark-blue.png differ
diff --git a/data/styles/xhdpi/placemark-brown.png b/data/styles/xhdpi/placemark-brown.png
index 7846e60866..4d519bc33e 100644
Binary files a/data/styles/xhdpi/placemark-brown.png and b/data/styles/xhdpi/placemark-brown.png differ
diff --git a/data/styles/xhdpi/placemark-green.png b/data/styles/xhdpi/placemark-green.png
index 8e404c5b89..f8e37096c5 100644
Binary files a/data/styles/xhdpi/placemark-green.png and b/data/styles/xhdpi/placemark-green.png differ
diff --git a/data/styles/xhdpi/placemark-orange.png b/data/styles/xhdpi/placemark-orange.png
index 2b9a22eca2..6c465b92bf 100644
Binary files a/data/styles/xhdpi/placemark-orange.png and b/data/styles/xhdpi/placemark-orange.png differ
diff --git a/data/styles/xhdpi/placemark-pink.png b/data/styles/xhdpi/placemark-pink.png
index 44eb1ee5a1..7960e4aeef 100644
Binary files a/data/styles/xhdpi/placemark-pink.png and b/data/styles/xhdpi/placemark-pink.png differ
diff --git a/data/styles/xhdpi/placemark-purple.png b/data/styles/xhdpi/placemark-purple.png
index e1621add75..6ea0ae5620 100644
Binary files a/data/styles/xhdpi/placemark-purple.png and b/data/styles/xhdpi/placemark-purple.png differ
diff --git a/data/styles/xhdpi/placemark-red.png b/data/styles/xhdpi/placemark-red.png
index 822a1360e3..a0b5fa79db 100644
Binary files a/data/styles/xhdpi/placemark-red.png and b/data/styles/xhdpi/placemark-red.png differ
diff --git a/data/styles/xhdpi/placemark-yellow.png b/data/styles/xhdpi/placemark-yellow.png
index 1b11a56c63..8cc93b0523 100644
Binary files a/data/styles/xhdpi/placemark-yellow.png and b/data/styles/xhdpi/placemark-yellow.png differ
diff --git a/data/styles/xhdpi/route_from.png b/data/styles/xhdpi/route_from.png
index b75db1e3cd..3e2de72ae2 100644
Binary files a/data/styles/xhdpi/route_from.png and b/data/styles/xhdpi/route_from.png differ
diff --git a/data/styles/xhdpi/route_to.png b/data/styles/xhdpi/route_to.png
index 34172432d4..71ac6ff4ec 100644
Binary files a/data/styles/xhdpi/route_to.png and b/data/styles/xhdpi/route_to.png differ
diff --git a/data/styles/xhdpi/search-result-active.png b/data/styles/xhdpi/search-result-active.png
index 517b2666f1..38cb8a8fb7 100644
Binary files a/data/styles/xhdpi/search-result-active.png and b/data/styles/xhdpi/search-result-active.png differ
diff --git a/data/styles/xhdpi/search-result.png b/data/styles/xhdpi/search-result.png
index d9c1742536..190fbb6992 100644
Binary files a/data/styles/xhdpi/search-result.png and b/data/styles/xhdpi/search-result.png differ
diff --git a/data/styles/xxhdpi/api-result.png b/data/styles/xxhdpi/api-result.png
index 7ff6d193ee..6f33ed8066 100644
Binary files a/data/styles/xxhdpi/api-result.png and b/data/styles/xxhdpi/api-result.png differ
diff --git a/data/styles/xxhdpi/compass-image.png b/data/styles/xxhdpi/compass-image.png
index 78bfbd61f8..f64892876b 100644
Binary files a/data/styles/xxhdpi/compass-image.png and b/data/styles/xxhdpi/compass-image.png differ
diff --git a/data/styles/xxhdpi/current-position-compas.png b/data/styles/xxhdpi/current-position-compas.png
index 8d1e0874b4..1855baa68c 100644
Binary files a/data/styles/xxhdpi/current-position-compas.png and b/data/styles/xxhdpi/current-position-compas.png differ
diff --git a/data/styles/xxhdpi/current-position.png b/data/styles/xxhdpi/current-position.png
index 696bc8e5e0..c8773cab39 100644
Binary files a/data/styles/xxhdpi/current-position.png and b/data/styles/xxhdpi/current-position.png differ
diff --git a/data/styles/xxhdpi/current-routing-compas.png b/data/styles/xxhdpi/current-routing-compas.png
index a01171768f..c841d09583 100644
Binary files a/data/styles/xxhdpi/current-routing-compas.png and b/data/styles/xxhdpi/current-routing-compas.png differ
diff --git a/data/styles/xxhdpi/placemark-blue.png b/data/styles/xxhdpi/placemark-blue.png
index 3c51b07ca4..ea84dc76d6 100644
Binary files a/data/styles/xxhdpi/placemark-blue.png and b/data/styles/xxhdpi/placemark-blue.png differ
diff --git a/data/styles/xxhdpi/placemark-brown.png b/data/styles/xxhdpi/placemark-brown.png
index db8cccb8e9..295ddf108e 100644
Binary files a/data/styles/xxhdpi/placemark-brown.png and b/data/styles/xxhdpi/placemark-brown.png differ
diff --git a/data/styles/xxhdpi/placemark-green.png b/data/styles/xxhdpi/placemark-green.png
index 0022ee7880..9629ac0be1 100644
Binary files a/data/styles/xxhdpi/placemark-green.png and b/data/styles/xxhdpi/placemark-green.png differ
diff --git a/data/styles/xxhdpi/placemark-orange.png b/data/styles/xxhdpi/placemark-orange.png
index 8395a06e03..ae08d5ac1a 100644
Binary files a/data/styles/xxhdpi/placemark-orange.png and b/data/styles/xxhdpi/placemark-orange.png differ
diff --git a/data/styles/xxhdpi/placemark-pink.png b/data/styles/xxhdpi/placemark-pink.png
index 6f8b7636bb..17a0773b07 100644
Binary files a/data/styles/xxhdpi/placemark-pink.png and b/data/styles/xxhdpi/placemark-pink.png differ
diff --git a/data/styles/xxhdpi/placemark-purple.png b/data/styles/xxhdpi/placemark-purple.png
index 23872fe718..318a91733b 100644
Binary files a/data/styles/xxhdpi/placemark-purple.png and b/data/styles/xxhdpi/placemark-purple.png differ
diff --git a/data/styles/xxhdpi/placemark-red.png b/data/styles/xxhdpi/placemark-red.png
index 644bf46b5d..0f4253ea6e 100644
Binary files a/data/styles/xxhdpi/placemark-red.png and b/data/styles/xxhdpi/placemark-red.png differ
diff --git a/data/styles/xxhdpi/placemark-yellow.png b/data/styles/xxhdpi/placemark-yellow.png
index 5f8201748d..699caedd63 100644
Binary files a/data/styles/xxhdpi/placemark-yellow.png and b/data/styles/xxhdpi/placemark-yellow.png differ
diff --git a/data/styles/xxhdpi/route_from.png b/data/styles/xxhdpi/route_from.png
index 1f681d580e..3464497403 100644
Binary files a/data/styles/xxhdpi/route_from.png and b/data/styles/xxhdpi/route_from.png differ
diff --git a/data/styles/xxhdpi/route_to.png b/data/styles/xxhdpi/route_to.png
index 7863f6736f..449b7be1b7 100644
Binary files a/data/styles/xxhdpi/route_to.png and b/data/styles/xxhdpi/route_to.png differ
diff --git a/data/styles/xxhdpi/search-result-active.png b/data/styles/xxhdpi/search-result-active.png
index 838292d2ab..ae0742c19f 100644
Binary files a/data/styles/xxhdpi/search-result-active.png and b/data/styles/xxhdpi/search-result-active.png differ
diff --git a/data/styles/xxhdpi/search-result.png b/data/styles/xxhdpi/search-result.png
index a945d7c205..7d290ae012 100644
Binary files a/data/styles/xxhdpi/search-result.png and b/data/styles/xxhdpi/search-result.png differ
diff --git a/drape_frontend/visual_params.cpp b/drape_frontend/visual_params.cpp
index 4b9a98ebef..85e747833f 100644
--- a/drape_frontend/visual_params.cpp
+++ b/drape_frontend/visual_params.cpp
@@ -71,7 +71,8 @@ string const & VisualParams::GetResourcePostfix() const
make_pair("mdpi", 1.0),
make_pair("hdpi", 1.5),
make_pair("xhdpi", 2.0),
- make_pair("xxhdpi", 3.0)
+ make_pair("xxhdpi", 3.0),
+ make_pair("6plus", 2.4),
};
static string specifixPostfixes[] =
diff --git a/graphics/defines.cpp b/graphics/defines.cpp
index 46c89617fb..153222518e 100644
--- a/graphics/defines.cpp
+++ b/graphics/defines.cpp
@@ -64,7 +64,7 @@ namespace graphics
{EDensityHDPI, "hdpi"},
{EDensityXHDPI, "xhdpi"},
{EDensityXXHDPI, "xxhdpi"},
- {EDensityIPhone6Plus, "xhdpi"}
+ {EDensityIPhone6Plus, "6plus"}
};
char const * convert(EDensity density)
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 6a41f87e77..0a9a536cf1 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
288765080DF74369002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765070DF74369002DB57D /* CoreGraphics.framework */; };
28AD73880D9D96C1002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD73870D9D96C1002E5188 /* MainWindow.xib */; };
+ 45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */ = {isa = PBXBuildFile; fileRef = 45159BF81B0CA2D5009BFA85 /* resources-6plus */; };
46F26C7310F61FD600ECCA39 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26C7210F61FD600ECCA39 /* OpenGLES.framework */; };
46F26CD810F623BA00ECCA39 /* EAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46F26CD710F623BA00ECCA39 /* EAGLView.mm */; };
46F26D1F10F626CB00ECCA39 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46F26D1E10F626CB00ECCA39 /* QuartzCore.framework */; };
@@ -206,6 +207,7 @@
28AD73870D9D96C1002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = SOURCE_ROOT; };
29B97316FDCFA39411CA2CEA /* main.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.mm; sourceTree = ""; };
3D443C9C19E421EE0025C2FC /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; };
+ 45159BF81B0CA2D5009BFA85 /* resources-6plus */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus"; path = "../../data/resources-6plus"; sourceTree = ""; };
46F26C7210F61FD600ECCA39 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
46F26CD610F623BA00ECCA39 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 11; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = EAGLView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
46F26CD710F623BA00ECCA39 /* EAGLView.mm */ = {isa = PBXFileReference; fileEncoding = 11; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = EAGLView.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -952,6 +954,7 @@
FA065FC61286143F00FEA989 /* External Resources */ = {
isa = PBXGroup;
children = (
+ 45159BF81B0CA2D5009BFA85 /* resources-6plus */,
4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */,
97A5967E19B9CD47007A963F /* copyright.html */,
978D4A30199A11E600D72CA7 /* faq.html */,
@@ -1259,6 +1262,7 @@
F7E7BA3A1672328F00B4492E /* tourism.png in Resources */,
F7E7BA3B1672328F00B4492E /* tourism@2x.png in Resources */,
F7E7BA3C1672328F00B4492E /* transport.png in Resources */,
+ 45159BF91B0CA2D5009BFA85 /* resources-6plus in Resources */,
F7E7BA3D1672328F00B4492E /* transport@2x.png in Resources */,
F7E7BA4016723CD200B4492E /* hotel.png in Resources */,
F7E7BA4116723CD200B4492E /* hotel@2x.png in Resources */,
diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh
index f785b80ee0..e2852bcd67 100755
--- a/tools/unix/generate_symbols.sh
+++ b/tools/unix/generate_symbols.sh
@@ -50,3 +50,10 @@ ln -s "$STYLES_PATH/xxhdpi" $PNG_PATH
--skinName "$DATA_PATH/resources-xxhdpi/basic" --skinSuffix=""
rm -r $PNG_PATH || true
+ln -s "$STYLES_PATH/6plus" $PNG_PATH
+
+"$BINARY_PATH" --symbolWidth 38 --symbolHeight 38 \
+ --symbolsDir "$DATA_PATH/styles/symbols" \
+ --skinName "$DATA_PATH/resources-6plus/basic" --skinSuffix=""
+
+rm -r $PNG_PATH || true