diff --git a/android-app-core/res/drawable-hdpi/plus.png b/android-app-core/res/drawable-hdpi/ab_add.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/plus.png
rename to android-app-core/res/drawable-hdpi/ab_add.png
diff --git a/android-app-core/res/drawable-hdpi/copy.png b/android-app-core/res/drawable-hdpi/ab_copy.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/copy.png
rename to android-app-core/res/drawable-hdpi/ab_copy.png
diff --git a/android-app-core/res/drawable-hdpi/ic_input_delete.png b/android-app-core/res/drawable-hdpi/ab_erase.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/ic_input_delete.png
rename to android-app-core/res/drawable-hdpi/ab_erase.png
diff --git a/android-app-core/res/drawable-hdpi/expand.png b/android-app-core/res/drawable-hdpi/ab_expand.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/expand.png
rename to android-app-core/res/drawable-hdpi/ab_expand.png
diff --git a/android-app-core/res/drawable-hdpi/stats.png b/android-app-core/res/drawable-hdpi/ab_graph.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/stats.png
rename to android-app-core/res/drawable-hdpi/ab_graph.png
diff --git a/android-app-core/res/drawable-hdpi/menu2.png b/android-app-core/res/drawable-hdpi/ab_menu.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/menu2.png
rename to android-app-core/res/drawable-hdpi/ab_menu.png
diff --git a/android-app-core/res/drawable-hdpi/paste.png b/android-app-core/res/drawable-hdpi/ab_paste.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/paste.png
rename to android-app-core/res/drawable-hdpi/ab_paste.png
diff --git a/android-app-core/res/drawable-hdpi/disk.png b/android-app-core/res/drawable-hdpi/ab_save.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/disk.png
rename to android-app-core/res/drawable-hdpi/ab_save.png
diff --git a/android-app-core/res/drawable-hdpi/settings.png b/android-app-core/res/drawable-hdpi/ab_settings.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/settings.png
rename to android-app-core/res/drawable-hdpi/ab_settings.png
diff --git a/android-app-core/res/drawable-hdpi/share.png b/android-app-core/res/drawable-hdpi/ab_share.png
similarity index 100%
rename from android-app-core/res/drawable-hdpi/share.png
rename to android-app-core/res/drawable-hdpi/ab_share.png
diff --git a/android-app-core/res/drawable-hdpi/kb_delete.png b/android-app-core/res/drawable-hdpi/kb_delete.png
deleted file mode 100644
index f02cef88..00000000
Binary files a/android-app-core/res/drawable-hdpi/kb_delete.png and /dev/null differ
diff --git a/android-app-core/res/drawable-ldpi/kb_delete.png b/android-app-core/res/drawable-ldpi/kb_delete.png
deleted file mode 100644
index 2403bbbd..00000000
Binary files a/android-app-core/res/drawable-ldpi/kb_delete.png and /dev/null differ
diff --git a/android-app-core/res/drawable-mdpi/plus.png b/android-app-core/res/drawable-mdpi/ab_add.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/plus.png
rename to android-app-core/res/drawable-mdpi/ab_add.png
diff --git a/android-app-core/res/drawable-mdpi/copy.png b/android-app-core/res/drawable-mdpi/ab_copy.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/copy.png
rename to android-app-core/res/drawable-mdpi/ab_copy.png
diff --git a/android-app-core/res/drawable-mdpi/ic_input_delete.png b/android-app-core/res/drawable-mdpi/ab_erase.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/ic_input_delete.png
rename to android-app-core/res/drawable-mdpi/ab_erase.png
diff --git a/android-app-core/res/drawable-mdpi/expand.png b/android-app-core/res/drawable-mdpi/ab_expand.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/expand.png
rename to android-app-core/res/drawable-mdpi/ab_expand.png
diff --git a/android-app-core/res/drawable-mdpi/stats.png b/android-app-core/res/drawable-mdpi/ab_graph.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/stats.png
rename to android-app-core/res/drawable-mdpi/ab_graph.png
diff --git a/android-app-core/res/drawable-mdpi/menu2.png b/android-app-core/res/drawable-mdpi/ab_menu.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/menu2.png
rename to android-app-core/res/drawable-mdpi/ab_menu.png
diff --git a/android-app-core/res/drawable-mdpi/paste.png b/android-app-core/res/drawable-mdpi/ab_paste.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/paste.png
rename to android-app-core/res/drawable-mdpi/ab_paste.png
diff --git a/android-app-core/res/drawable-mdpi/disk.png b/android-app-core/res/drawable-mdpi/ab_save.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/disk.png
rename to android-app-core/res/drawable-mdpi/ab_save.png
diff --git a/android-app-core/res/drawable-mdpi/settings.png b/android-app-core/res/drawable-mdpi/ab_settings.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/settings.png
rename to android-app-core/res/drawable-mdpi/ab_settings.png
diff --git a/android-app-core/res/drawable-mdpi/share.png b/android-app-core/res/drawable-mdpi/ab_share.png
similarity index 100%
rename from android-app-core/res/drawable-mdpi/share.png
rename to android-app-core/res/drawable-mdpi/ab_share.png
diff --git a/android-app-core/res/drawable-mdpi/kb_delete.png b/android-app-core/res/drawable-mdpi/kb_delete.png
deleted file mode 100644
index b6643eec..00000000
Binary files a/android-app-core/res/drawable-mdpi/kb_delete.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xhdpi/plus.png b/android-app-core/res/drawable-xhdpi/ab_add.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/plus.png
rename to android-app-core/res/drawable-xhdpi/ab_add.png
diff --git a/android-app-core/res/drawable-xhdpi/copy.png b/android-app-core/res/drawable-xhdpi/ab_copy.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/copy.png
rename to android-app-core/res/drawable-xhdpi/ab_copy.png
diff --git a/android-app-core/res/drawable-xhdpi/ic_input_delete.png b/android-app-core/res/drawable-xhdpi/ab_erase.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/ic_input_delete.png
rename to android-app-core/res/drawable-xhdpi/ab_erase.png
diff --git a/android-app-core/res/drawable-xhdpi/expand.png b/android-app-core/res/drawable-xhdpi/ab_expand.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/expand.png
rename to android-app-core/res/drawable-xhdpi/ab_expand.png
diff --git a/android-app-core/res/drawable-xhdpi/stats.png b/android-app-core/res/drawable-xhdpi/ab_graph.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/stats.png
rename to android-app-core/res/drawable-xhdpi/ab_graph.png
diff --git a/android-app-core/res/drawable-xhdpi/menu2.png b/android-app-core/res/drawable-xhdpi/ab_menu.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/menu2.png
rename to android-app-core/res/drawable-xhdpi/ab_menu.png
diff --git a/android-app-core/res/drawable-xhdpi/paste.png b/android-app-core/res/drawable-xhdpi/ab_paste.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/paste.png
rename to android-app-core/res/drawable-xhdpi/ab_paste.png
diff --git a/android-app-core/res/drawable-xhdpi/disk.png b/android-app-core/res/drawable-xhdpi/ab_save.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/disk.png
rename to android-app-core/res/drawable-xhdpi/ab_save.png
diff --git a/android-app-core/res/drawable-xhdpi/settings.png b/android-app-core/res/drawable-xhdpi/ab_settings.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/settings.png
rename to android-app-core/res/drawable-xhdpi/ab_settings.png
diff --git a/android-app-core/res/drawable-xhdpi/share.png b/android-app-core/res/drawable-xhdpi/ab_share.png
similarity index 100%
rename from android-app-core/res/drawable-xhdpi/share.png
rename to android-app-core/res/drawable-xhdpi/ab_share.png
diff --git a/android-app-core/res/drawable-xhdpi/kb_delete.png b/android-app-core/res/drawable-xhdpi/kb_delete.png
deleted file mode 100644
index f5ca50ec..00000000
Binary files a/android-app-core/res/drawable-xhdpi/kb_delete.png and /dev/null differ
diff --git a/android-app-core/res/drawable-xlarge-hdpi/kb_delete.png b/android-app-core/res/drawable-xlarge-hdpi/kb_delete.png
deleted file mode 100644
index f5ca50ec..00000000
Binary files a/android-app-core/res/drawable-xlarge-hdpi/kb_delete.png and /dev/null differ
diff --git a/android-app-core/res/layout/cpp_simple_button_copy.xml b/android-app-core/res/layout/cpp_simple_button_copy.xml
index 601065eb..fdd2d978 100644
--- a/android-app-core/res/layout/cpp_simple_button_copy.xml
+++ b/android-app-core/res/layout/cpp_simple_button_copy.xml
@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_copy"
-	a:src="@drawable/copy"
+	a:src="@drawable/ab_copy"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Copy" />
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_erase.xml b/android-app-core/res/layout/cpp_simple_button_erase.xml
index feb9ad00..fd582b17 100644
--- a/android-app-core/res/layout/cpp_simple_button_erase.xml
+++ b/android-app-core/res/layout/cpp_simple_button_erase.xml
@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_erase"
-	a:src="@drawable/ic_input_delete"
+	a:src="@drawable/ab_erase"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Erase" />
\ No newline at end of file
diff --git a/android-app-core/res/layout/cpp_simple_button_paste.xml b/android-app-core/res/layout/cpp_simple_button_paste.xml
index 14c31c5d..6e9f8d54 100644
--- a/android-app-core/res/layout/cpp_simple_button_paste.xml
+++ b/android-app-core/res/layout/cpp_simple_button_paste.xml
@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_paste"
-	a:src="@drawable/paste"
+	a:src="@drawable/ab_paste"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Paste" />
\ No newline at end of file
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 caf66fc5..8c802c1c 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 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_settings"
-	a:src="@drawable/settings"
+	a:src="@drawable/ab_settings"
 	style="@style/cpp_simple_metro_control_image_button_style"
 	a:contentDescription="Settings" />
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_button_copy.xml b/android-app/res/layout/cpp_app_button_copy.xml
index 124ce9d4..f61df90c 100644
--- a/android-app/res/layout/cpp_app_button_copy.xml
+++ b/android-app/res/layout/cpp_app_button_copy.xml
@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_copy"
-	a:src="@drawable/copy"
+	a:src="@drawable/ab_copy"
 	style="?cpp_control_image_button_style"
 	a:onClick="copyButtonClickHandler" />
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_button_erase.xml b/android-app/res/layout/cpp_app_button_erase.xml
index 9a06835f..84ce39fa 100644
--- a/android-app/res/layout/cpp_app_button_erase.xml
+++ b/android-app/res/layout/cpp_app_button_erase.xml
@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_erase"
-	a:src="@drawable/ic_input_delete"
+	a:src="@drawable/ab_erase"
 	style="?cpp_control_image_button_style"
 	a:onClick="eraseButtonClickHandler" />
\ No newline at end of file
diff --git a/android-app/res/layout/cpp_app_button_paste.xml b/android-app/res/layout/cpp_app_button_paste.xml
index 7fc720b9..5181d986 100644
--- a/android-app/res/layout/cpp_app_button_paste.xml
+++ b/android-app/res/layout/cpp_app_button_paste.xml
@@ -8,6 +8,6 @@
 
 <ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
 	a:id="@id/cpp_button_paste"
-	a:src="@drawable/paste"
+	a:src="@drawable/ab_paste"
 	style="?cpp_control_image_button_style"
 	a:onClick="pasteButtonClickHandler" />
\ 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 d688501a..e1656688 100644
--- a/android-app/res/layout/cpp_plot_function_list_item.xml
+++ b/android-app/res/layout/cpp_plot_function_list_item.xml
@@ -31,6 +31,6 @@
 		a:paddingTop="0dp"
 		a:paddingBottom="0dp"
 		a:scaleType="centerInside"
-		a:src="@drawable/settings" />
+		a:src="@drawable/ab_settings" />
 
 </LinearLayout>
\ 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 9de835f7..b56037f9 100644
--- a/android-app/res/menu/functions_menu.xml
+++ b/android-app/res/menu/functions_menu.xml
@@ -11,6 +11,6 @@
 	<item
 		a:id="@+id/functions_menu_add_function"
 		a:title="@string/c_add"
-		a:icon="@drawable/plus"
+		a:icon="@drawable/ab_add"
 		a:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/android-app/res/menu/plot_menu.xml b/android-app/res/menu/plot_menu.xml
index 6b4ba92d..c186b6ac 100644
--- a/android-app/res/menu/plot_menu.xml
+++ b/android-app/res/menu/plot_menu.xml
@@ -11,37 +11,37 @@
 	<item
 		a:id="@+id/menu_plot_2d"
 		a:title="@string/cpp_plot_2d"
-		a:icon="@drawable/stats"
+		a:icon="@drawable/ab_graph"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_3d"
 		a:title="@string/cpp_plot_3d"
-		a:icon="@drawable/stats"
+		a:icon="@drawable/ab_graph"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_range"
 		a:title="@string/cpp_plot_range"
-		a:icon="@drawable/expand"
+		a:icon="@drawable/ab_expand"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_functions"
 		a:title="@string/cpp_plot_functions"
-		a:icon="@drawable/menu2"
+		a:icon="@drawable/ab_menu"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_schreeshot"
 		a:title="@string/cpp_plot_screenshot"
-		a:icon="@drawable/disk"
+		a:icon="@drawable/ab_save"
 		a:showAsAction="always" />
 
 	<item
 		a:id="@+id/menu_plot_settings"
 		a:title="@string/c_settings"
-		a:icon="@drawable/settings"
+		a:icon="@drawable/ab_settings"
 		a:showAsAction="always" />
 
 </menu>
\ No newline at end of file
diff --git a/android-app/res/menu/vars_menu.xml b/android-app/res/menu/vars_menu.xml
index adb415a9..c1dd8388 100644
--- a/android-app/res/menu/vars_menu.xml
+++ b/android-app/res/menu/vars_menu.xml
@@ -11,6 +11,6 @@
 	<item
 		a:id="@+id/var_menu_add_var"
 		a:title="@string/c_add"
-		a:icon="@drawable/plus"
+		a:icon="@drawable/ab_add"
 		a:showAsAction="always" />
 </menu>
\ No newline at end of file