diff --git a/android-app-core/res/drawable-hdpi/ab_add.png b/android-app-core/res/drawable-hdpi/ab_add.png
deleted file mode 100644
index 444e8a5e..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_camera.png b/android-app-core/res/drawable-hdpi/ab_camera.png
deleted file mode 100644
index 4936d150..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_camera.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_list.png b/android-app-core/res/drawable-hdpi/ab_list.png
deleted file mode 100644
index e11fad63..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_list.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_plot_2d.png b/android-app-core/res/drawable-hdpi/ab_plot_2d.png
deleted file mode 100644
index 3862c7d7..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_plot_2d.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_plot_3d.png b/android-app-core/res/drawable-hdpi/ab_plot_3d.png
deleted file mode 100644
index d660288b..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_plot_3d.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_plot_range.png b/android-app-core/res/drawable-hdpi/ab_plot_range.png
deleted file mode 100644
index 4c87abed..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_plot_range.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/ab_settings.png b/android-app-core/res/drawable-hdpi/ab_settings.png
deleted file mode 100644
index 5321f828..00000000
Binary files a/android-app-core/res/drawable-hdpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/contract.png b/android-app-core/res/drawable-hdpi/contract.png
new file mode 100644
index 00000000..57597aa1
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/contract.png differ
diff --git a/android-app-core/res/drawable-hdpi/disk.png b/android-app-core/res/drawable-hdpi/disk.png
new file mode 100644
index 00000000..561e414b
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/disk.png differ
diff --git a/android-app-core/res/drawable-hdpi/expand.png b/android-app-core/res/drawable-hdpi/expand.png
new file mode 100644
index 00000000..a3039d43
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/expand.png differ
diff --git a/android-app-core/res/drawable-hdpi/kb_heart.png b/android-app-core/res/drawable-hdpi/kb_heart.png
deleted file mode 100644
index 829b6596..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_heart.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/kb_settings.png b/android-app-core/res/drawable-hdpi/kb_settings.png
deleted file mode 100644
index 9bd4471f..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-hdpi/menu2.png b/android-app-core/res/drawable-hdpi/menu2.png
new file mode 100644
index 00000000..6816df89
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/menu2.png differ
diff --git a/android-app-core/res/drawable-hdpi/plus.png b/android-app-core/res/drawable-hdpi/plus.png
new file mode 100644
index 00000000..218ee8ac
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/plus.png differ
diff --git a/android-app-core/res/drawable-hdpi/settings.png b/android-app-core/res/drawable-hdpi/settings.png
new file mode 100644
index 00000000..44d799f5
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/settings.png differ
diff --git a/android-app-core/res/drawable-hdpi/share.png b/android-app-core/res/drawable-hdpi/share.png
new file mode 100644
index 00000000..44180aa7
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/share.png differ
diff --git a/android-app-core/res/drawable-hdpi/stats.png b/android-app-core/res/drawable-hdpi/stats.png
new file mode 100644
index 00000000..53be11dc
Binary files /dev/null and b/android-app-core/res/drawable-hdpi/stats.png differ
diff --git a/android-app-core/res/drawable-ldpi/ab_add.png b/android-app-core/res/drawable-ldpi/ab_add.png
deleted file mode 100644
index 89620af8..00000000
Binary files a/android-app-core/res/drawable-ldpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-ldpi/ab_camera.png b/android-app-core/res/drawable-ldpi/ab_camera.png
deleted file mode 100644
index 4d3a6a5d..00000000
Binary files a/android-app-core/res/drawable-ldpi/ab_camera.png and /dev/null differ
diff --git a/android-app-core/res/drawable-ldpi/ab_settings.png b/android-app-core/res/drawable-ldpi/ab_settings.png
deleted file mode 100644
index efc2f3e4..00000000
Binary files a/android-app-core/res/drawable-ldpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-ldpi/kb_heart.png b/android-app-core/res/drawable-ldpi/kb_heart.png
deleted file mode 100644
index b937a283..00000000
Binary files a/android-app-core/res/drawable-ldpi/kb_heart.png and /dev/null differ
diff --git a/android-app-core/res/drawable-ldpi/kb_settings.png b/android-app-core/res/drawable-ldpi/kb_settings.png
deleted file mode 100644
index 5d53f1f3..00000000
Binary files a/android-app-core/res/drawable-ldpi/kb_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_add.png b/android-app-core/res/drawable-mdpi/ab_add.png
deleted file mode 100644
index 361c7c46..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_camera.png b/android-app-core/res/drawable-mdpi/ab_camera.png
deleted file mode 100644
index f8cf93c7..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_camera.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/ab_settings.png b/android-app-core/res/drawable-mdpi/ab_settings.png
deleted file mode 100644
index ccc50e66..00000000
Binary files a/android-app-core/res/drawable-mdpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/contract.png b/android-app-core/res/drawable-mdpi/contract.png
new file mode 100644
index 00000000..41488640
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/contract.png differ
diff --git a/android-app-core/res/drawable-mdpi/disk.png b/android-app-core/res/drawable-mdpi/disk.png
new file mode 100644
index 00000000..3961ee47
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/disk.png differ
diff --git a/android-app-core/res/drawable-mdpi/expand.png b/android-app-core/res/drawable-mdpi/expand.png
new file mode 100644
index 00000000..4786d402
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/expand.png differ
diff --git a/android-app-core/res/drawable-mdpi/kb_heart.png b/android-app-core/res/drawable-mdpi/kb_heart.png
deleted file mode 100644
index c907e2e2..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_heart.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/kb_settings.png b/android-app-core/res/drawable-mdpi/kb_settings.png
deleted file mode 100644
index e5fdb1c4..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/menu2.png b/android-app-core/res/drawable-mdpi/menu2.png
new file mode 100644
index 00000000..f19442d1
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/menu2.png differ
diff --git a/android-app-core/res/drawable-mdpi/plus.png b/android-app-core/res/drawable-mdpi/plus.png
new file mode 100644
index 00000000..c6ae5f52
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/plus.png differ
diff --git a/android-app-core/res/drawable-mdpi/settings.png b/android-app-core/res/drawable-mdpi/settings.png
new file mode 100644
index 00000000..931141d1
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/settings.png differ
diff --git a/android-app-core/res/drawable-mdpi/share.png b/android-app-core/res/drawable-mdpi/share.png
new file mode 100644
index 00000000..61773f5d
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/share.png differ
diff --git a/android-app-core/res/drawable-mdpi/stats.png b/android-app-core/res/drawable-mdpi/stats.png
new file mode 100644
index 00000000..d82f9f7a
Binary files /dev/null and b/android-app-core/res/drawable-mdpi/stats.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_add.png b/android-app-core/res/drawable-xhdpi/ab_add.png
deleted file mode 100644
index 7d498a96..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_add.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_camera.png b/android-app-core/res/drawable-xhdpi/ab_camera.png
deleted file mode 100644
index 7875aa3f..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_camera.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_list.png b/android-app-core/res/drawable-xhdpi/ab_list.png
deleted file mode 100644
index 7f1e4c73..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_list.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_plot_2d.png b/android-app-core/res/drawable-xhdpi/ab_plot_2d.png
deleted file mode 100644
index bcd07cce..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_plot_2d.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_plot_3d.png b/android-app-core/res/drawable-xhdpi/ab_plot_3d.png
deleted file mode 100644
index c32831ba..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_plot_3d.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_plot_range.png b/android-app-core/res/drawable-xhdpi/ab_plot_range.png
deleted file mode 100644
index 13eb46fe..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_plot_range.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/ab_settings.png b/android-app-core/res/drawable-xhdpi/ab_settings.png
deleted file mode 100644
index 02cfbad0..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ab_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/contract.png b/android-app-core/res/drawable-xhdpi/contract.png
new file mode 100644
index 00000000..7e9b43cf
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/contract.png differ
diff --git a/android-app-core/res/drawable-xhdpi/disk.png b/android-app-core/res/drawable-xhdpi/disk.png
new file mode 100644
index 00000000..5d31a9e5
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/disk.png differ
diff --git a/android-app-core/res/drawable-xhdpi/expand.png b/android-app-core/res/drawable-xhdpi/expand.png
new file mode 100644
index 00000000..04d7851a
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/expand.png differ
diff --git a/android-app-core/res/drawable-xhdpi/ic_menu_preferences.png b/android-app-core/res/drawable-xhdpi/ic_menu_preferences.png
deleted file mode 100644
index 057d8628..00000000
Binary files a/android-app-core/res/drawable-xhdpi/ic_menu_preferences.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_heart.png b/android-app-core/res/drawable-xhdpi/kb_heart.png
deleted file mode 100644
index 97139f4b..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_heart.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/kb_settings.png b/android-app-core/res/drawable-xhdpi/kb_settings.png
deleted file mode 100644
index 3e73705c..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_settings.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/menu2.png b/android-app-core/res/drawable-xhdpi/menu2.png
new file mode 100644
index 00000000..f9308c61
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/menu2.png differ
diff --git a/android-app-core/res/drawable-xhdpi/plus.png b/android-app-core/res/drawable-xhdpi/plus.png
new file mode 100644
index 00000000..b0b581ae
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/plus.png differ
diff --git a/android-app-core/res/drawable-xhdpi/settings.png b/android-app-core/res/drawable-xhdpi/settings.png
new file mode 100644
index 00000000..39cbd6d9
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/settings.png differ
diff --git a/android-app-core/res/drawable-xhdpi/share.png b/android-app-core/res/drawable-xhdpi/share.png
new file mode 100644
index 00000000..baacbdef
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/share.png differ
diff --git a/android-app-core/res/drawable-xhdpi/stats.png b/android-app-core/res/drawable-xhdpi/stats.png
new file mode 100644
index 00000000..13ed3f30
Binary files /dev/null and b/android-app-core/res/drawable-xhdpi/stats.png differ
diff --git a/android-app-core/res/drawable-xlarge-hdpi/kb_heart.png b/android-app-core/res/drawable-xlarge-hdpi/kb_heart.png
deleted file mode 100644
index 97139f4b..00000000
Binary files a/android-app-core/res/drawable-xlarge-hdpi/kb_heart.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xlarge-hdpi/kb_settings.png b/android-app-core/res/drawable-xlarge-hdpi/kb_settings.png
deleted file mode 100644
index 3e73705c..00000000
Binary files a/android-app-core/res/drawable-xlarge-hdpi/kb_settings.png and /dev/null differ
diff --git a/android-app-core/res/layout/cpp_simple_button_settings.xml b/android-app-core/res/layout/cpp_simple_button_settings.xml
index 14ca0b27..caf66fc5 100644
--- a/android-app-core/res/layout/cpp_simple_button_settings.xml
+++ b/android-app-core/res/layout/cpp_simple_button_settings.xml
@@ -8,6 +8,6 @@
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_plot_function_list_item.xml b/android-app/res/layout/cpp_plot_function_list_item.xml
index fc950162..d688501a 100644
--- a/android-app/res/layout/cpp_plot_function_list_item.xml
+++ b/android-app/res/layout/cpp_plot_function_list_item.xml
@@ -28,6 +28,9 @@
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
- a:src="@drawable/ab_settings" />
+ a:paddingTop="0dp"
+ a:paddingBottom="0dp"
+ a:scaleType="centerInside"
+ a:src="@drawable/settings" />
\ No newline at end of file
diff --git a/android-app/res/menu/functions_menu.xml b/android-app/res/menu/functions_menu.xml
index b56037f9..9de835f7 100644
--- a/android-app/res/menu/functions_menu.xml
+++ b/android-app/res/menu/functions_menu.xml
@@ -11,6 +11,6 @@