diff --git a/android-app-core/res/drawable-hdpi/ab_clock.png b/android-app-core/res/drawable-hdpi/ab_clock.png
new file mode 100644
index 00000000..56b3de88
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/ab_clock.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_disk.png b/android-app-core/res/drawable-hdpi/ab_disk.png
index d46a649d..57f121db 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_disk.png and b/android-app-core/res/drawable-hdpi/ab_disk.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_expand.png b/android-app-core/res/drawable-hdpi/ab_expand.png
index 856073da..14604dd3 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_expand.png and b/android-app-core/res/drawable-hdpi/ab_expand.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_icon.png b/android-app-core/res/drawable-hdpi/ab_icon.png
index 00f310dd..45d7f971 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_icon.png and b/android-app-core/res/drawable-hdpi/ab_icon.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_menu.png b/android-app-core/res/drawable-hdpi/ab_menu.png
index fc4e83f5..9c260776 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_menu.png and b/android-app-core/res/drawable-hdpi/ab_menu.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_plus.png b/android-app-core/res/drawable-hdpi/ab_plus.png
new file mode 100644
index 00000000..bd3d08d8
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/ab_plus.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_range.png b/android-app-core/res/drawable-hdpi/ab_range.png
new file mode 100644
index 00000000..61ac52c3
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/ab_range.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_remove.png b/android-app-core/res/drawable-hdpi/ab_remove.png
new file mode 100644
index 00000000..8c54b880
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/ab_remove.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_settings.png b/android-app-core/res/drawable-hdpi/ab_settings.png
index 99975155..0737addc 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_settings.png and b/android-app-core/res/drawable-hdpi/ab_settings.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_stats.png b/android-app-core/res/drawable-hdpi/ab_stats.png
index 774bc1e4..3ccf7c6b 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_stats.png and b/android-app-core/res/drawable-hdpi/ab_stats.png differ
diff --git a/android-app-core/res/drawable-hdpi/ab_stats_3d.png b/android-app-core/res/drawable-hdpi/ab_stats_3d.png
index 90ead82a..2393e644 100644
Binary files a/android-app-core/res/drawable-hdpi/ab_stats_3d.png and b/android-app-core/res/drawable-hdpi/ab_stats_3d.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_clock.png b/android-app-core/res/drawable-hdpi/kb_clock.png
deleted file mode 100644
index a802feb8..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_clock.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/kb_contract.png b/android-app-core/res/drawable-hdpi/kb_contract.png
deleted file mode 100644
index 408eb720..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_contract.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/kb_plus.png b/android-app-core/res/drawable-hdpi/kb_plus.png
deleted file mode 100644
index e9279924..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_plus.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/kb_range.png b/android-app-core/res/drawable-hdpi/kb_range.png
deleted file mode 100644
index e2342e06..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_range.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/kb_remove.png b/android-app-core/res/drawable-hdpi/kb_remove.png
deleted file mode 100644
index c9d75410..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_remove.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_clock.png b/android-app-core/res/drawable-mdpi/ab_clock.png
new file mode 100644
index 00000000..3cd2bf6c
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/ab_clock.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_disk.png b/android-app-core/res/drawable-mdpi/ab_disk.png
index a0737c09..b0f716a3 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_disk.png and b/android-app-core/res/drawable-mdpi/ab_disk.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_expand.png b/android-app-core/res/drawable-mdpi/ab_expand.png
index b29e29d3..e7352765 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_expand.png and b/android-app-core/res/drawable-mdpi/ab_expand.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_icon.png b/android-app-core/res/drawable-mdpi/ab_icon.png
index 7fecfd4e..fb23a287 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_icon.png and b/android-app-core/res/drawable-mdpi/ab_icon.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_menu.png b/android-app-core/res/drawable-mdpi/ab_menu.png
index 33eabf6c..58d83706 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_menu.png and b/android-app-core/res/drawable-mdpi/ab_menu.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_plus.png b/android-app-core/res/drawable-mdpi/ab_plus.png
new file mode 100644
index 00000000..3ecc73fc
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/ab_plus.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_range.png b/android-app-core/res/drawable-mdpi/ab_range.png
new file mode 100644
index 00000000..4ea31ee2
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/ab_range.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_remove.png b/android-app-core/res/drawable-mdpi/ab_remove.png
new file mode 100644
index 00000000..e8823cbc
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/ab_remove.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_settings.png b/android-app-core/res/drawable-mdpi/ab_settings.png
index 40024062..e47b74d0 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_settings.png and b/android-app-core/res/drawable-mdpi/ab_settings.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_stats.png b/android-app-core/res/drawable-mdpi/ab_stats.png
index d7869943..1049acbf 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_stats.png and b/android-app-core/res/drawable-mdpi/ab_stats.png differ
diff --git a/android-app-core/res/drawable-mdpi/ab_stats_3d.png b/android-app-core/res/drawable-mdpi/ab_stats_3d.png
index 6a051a44..d2adcd3d 100644
Binary files a/android-app-core/res/drawable-mdpi/ab_stats_3d.png and b/android-app-core/res/drawable-mdpi/ab_stats_3d.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_clock.png b/android-app-core/res/drawable-mdpi/kb_clock.png
deleted file mode 100644
index fe58f41a..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_clock.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_contract.png b/android-app-core/res/drawable-mdpi/kb_contract.png
deleted file mode 100644
index 27db258d..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_contract.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_plus.png b/android-app-core/res/drawable-mdpi/kb_plus.png
deleted file mode 100644
index a519ed62..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_plus.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_range.png b/android-app-core/res/drawable-mdpi/kb_range.png
deleted file mode 100644
index a43e43d8..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_range.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_remove.png b/android-app-core/res/drawable-mdpi/kb_remove.png
deleted file mode 100644
index 655beee3..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_remove.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_clock.png b/android-app-core/res/drawable-xhdpi/ab_clock.png
new file mode 100644
index 00000000..4a7a4a10
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/ab_clock.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_disk.png b/android-app-core/res/drawable-xhdpi/ab_disk.png
index 6334571e..4e36434b 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_disk.png and b/android-app-core/res/drawable-xhdpi/ab_disk.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_expand.png b/android-app-core/res/drawable-xhdpi/ab_expand.png
index 0d81804d..e37e8170 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_expand.png and b/android-app-core/res/drawable-xhdpi/ab_expand.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_icon.png b/android-app-core/res/drawable-xhdpi/ab_icon.png
index 825368df..e9883fd9 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_icon.png and b/android-app-core/res/drawable-xhdpi/ab_icon.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_menu.png b/android-app-core/res/drawable-xhdpi/ab_menu.png
index f6cef723..251bb104 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_menu.png and b/android-app-core/res/drawable-xhdpi/ab_menu.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_plus.png b/android-app-core/res/drawable-xhdpi/ab_plus.png
new file mode 100644
index 00000000..1e4f1ee5
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/ab_plus.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_range.png b/android-app-core/res/drawable-xhdpi/ab_range.png
new file mode 100644
index 00000000..0271c2ec
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/ab_range.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_remove.png b/android-app-core/res/drawable-xhdpi/ab_remove.png
new file mode 100644
index 00000000..1c346d88
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/ab_remove.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_settings.png b/android-app-core/res/drawable-xhdpi/ab_settings.png
index a743a6c4..15585966 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_settings.png and b/android-app-core/res/drawable-xhdpi/ab_settings.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_stats.png b/android-app-core/res/drawable-xhdpi/ab_stats.png
index c22cc3fb..449f6052 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_stats.png and b/android-app-core/res/drawable-xhdpi/ab_stats.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_stats_3d.png b/android-app-core/res/drawable-xhdpi/ab_stats_3d.png
index b0a08489..43b11957 100644
Binary files a/android-app-core/res/drawable-xhdpi/ab_stats_3d.png and b/android-app-core/res/drawable-xhdpi/ab_stats_3d.png differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_clock.png b/android-app-core/res/drawable-xhdpi/kb_clock.png
deleted file mode 100644
index 9e933e68..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_clock.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_contract.png b/android-app-core/res/drawable-xhdpi/kb_contract.png
deleted file mode 100644
index c23707ed..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_contract.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_plus.png b/android-app-core/res/drawable-xhdpi/kb_plus.png
deleted file mode 100644
index f216fd5f..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_plus.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_range.png b/android-app-core/res/drawable-xhdpi/kb_range.png
deleted file mode 100644
index f03ac303..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_range.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_remove.png b/android-app-core/res/drawable-xhdpi/kb_remove.png
deleted file mode 100644
index 15c28f51..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_remove.png and /dev/null differ
diff --git a/android-app/res/menu/functions_menu.xml b/android-app/res/menu/functions_menu.xml
index 369c2013..83ae3d2b 100644
--- a/android-app/res/menu/functions_menu.xml
+++ b/android-app/res/menu/functions_menu.xml
@@ -27,6 +27,6 @@