diff --git a/app/src/main/res/drawable-hdpi/app_icon.png b/app/src/main/res/drawable-hdpi/app_icon.png
deleted file mode 100644
index 39c8550b..00000000
Binary files a/app/src/main/res/drawable-hdpi/app_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_file_upload_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_upload_white_24dp.png
new file mode 100644
index 00000000..4203a957
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_file_upload_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_launch_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_launch_white_48dp.png
new file mode 100644
index 00000000..2ed5b0e1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launch_white_48dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_vertical_align_center_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_vertical_align_center_white_24dp.png
new file mode 100644
index 00000000..d28b0573
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_vertical_align_center_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_vertical_align_top_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_vertical_align_top_white_24dp.png
new file mode 100644
index 00000000..9ec5e44f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_vertical_align_top_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/app_icon.png b/app/src/main/res/drawable-mdpi/app_icon.png
deleted file mode 100644
index 257ab389..00000000
Binary files a/app/src/main/res/drawable-mdpi/app_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_file_upload_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_upload_white_24dp.png
new file mode 100644
index 00000000..8ad2957a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_file_upload_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launch_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_launch_white_48dp.png
new file mode 100644
index 00000000..a2caac51
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launch_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_vertical_align_center_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_vertical_align_center_white_24dp.png
new file mode 100644
index 00000000..d4687998
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_vertical_align_center_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_vertical_align_top_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_vertical_align_top_white_24dp.png
new file mode 100644
index 00000000..074439e4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_vertical_align_top_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/app_icon.png b/app/src/main/res/drawable-xhdpi/app_icon.png
deleted file mode 100644
index 1658a3f8..00000000
Binary files a/app/src/main/res/drawable-xhdpi/app_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_file_upload_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_upload_white_24dp.png
new file mode 100644
index 00000000..939a5b70
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_file_upload_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launch_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_launch_white_48dp.png
new file mode 100644
index 00000000..bab25f30
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launch_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vertical_align_center_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_vertical_align_center_white_24dp.png
new file mode 100644
index 00000000..4a818865
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_vertical_align_center_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vertical_align_top_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_vertical_align_top_white_24dp.png
new file mode 100644
index 00000000..76818f39
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_vertical_align_top_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/app_icon.png b/app/src/main/res/drawable-xxhdpi/app_icon.png
deleted file mode 100644
index de6a6055..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/app_icon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_upload_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_upload_white_24dp.png
new file mode 100644
index 00000000..172c3ff3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_file_upload_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launch_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_launch_white_48dp.png
new file mode 100644
index 00000000..5eeb0bbe
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launch_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vertical_align_center_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_vertical_align_center_white_24dp.png
new file mode 100644
index 00000000..2abae7cd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_vertical_align_center_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vertical_align_top_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_vertical_align_top_white_24dp.png
new file mode 100644
index 00000000..cf0dfc49
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_vertical_align_top_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_upload_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_upload_white_24dp.png
new file mode 100644
index 00000000..17652e41
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_file_upload_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launch_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_launch_white_48dp.png
new file mode 100644
index 00000000..54b50152
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launch_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_vertical_align_center_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_vertical_align_center_white_24dp.png
new file mode 100644
index 00000000..d6c75541
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_vertical_align_center_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_vertical_align_top_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_vertical_align_top_white_24dp.png
new file mode 100644
index 00000000..e3f88f9a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_vertical_align_top_white_24dp.png differ
diff --git a/app/src/main/res/layout/cpp_simple_button_app.xml b/app/src/main/res/layout/cpp_simple_button_app.xml
index b6e43c32..09801640 100644
--- a/app/src/main/res/layout/cpp_simple_button_app.xml
+++ b/app/src/main/res/layout/cpp_simple_button_app.xml
@@ -27,4 +27,4 @@
     a:id="@id/cpp_button_app"
     style="@style/CppKeyboardButton.Metro.Simple.Control.Image"
     a:contentDescription="App"
-    a:src="@drawable/kb_logo" />
\ No newline at end of file
+    a:src="@drawable/ic_launch_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_app_material.xml b/app/src/main/res/layout/cpp_simple_button_app_material.xml
index 1a4202d0..83b01001 100644
--- a/app/src/main/res/layout/cpp_simple_button_app_material.xml
+++ b/app/src/main/res/layout/cpp_simple_button_app_material.xml
@@ -27,4 +27,4 @@
     a:id="@id/cpp_button_app"
     style="@style/CppKeyboardButton.Material.Simple.Control.Image"
     a:contentDescription="App"
-    a:src="@drawable/kb_logo" />
\ No newline at end of file
+    a:src="@drawable/ic_launch_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/cpp_simple_button_app_material_light.xml b/app/src/main/res/layout/cpp_simple_button_app_material_light.xml
index 56042566..a1c2e129 100644
--- a/app/src/main/res/layout/cpp_simple_button_app_material_light.xml
+++ b/app/src/main/res/layout/cpp_simple_button_app_material_light.xml
@@ -27,4 +27,4 @@
     a:id="@id/cpp_button_app"
     style="@style/CppKeyboardButton.Material.Light.Simple.Control.Image"
     a:contentDescription="App"
-    a:src="@drawable/kb_logo" />
\ No newline at end of file
+    a:src="@drawable/ic_launch_white_48dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/onscreen_header.xml b/app/src/main/res/layout/onscreen_header.xml
index 4db82398..58ec4822 100644
--- a/app/src/main/res/layout/onscreen_header.xml
+++ b/app/src/main/res/layout/onscreen_header.xml
@@ -13,12 +13,12 @@
         <ImageButton
             a:id="@+id/onscreen_fold_button"
             style="@style/CppHeaderButton.Metro.Blue"
-            a:src="@drawable/ic_space_bar_white_24dp" />
+            a:src="@drawable/ic_vertical_align_center_white_24dp" />
 
         <ImageButton
             a:id="@+id/onscreen_minimize_button"
             style="@style/CppHeaderButton.Metro.Blue"
-            a:src="@drawable/ic_file_download_white_24dp" />
+            a:src="@drawable/ic_vertical_align_top_white_24dp" />
 
         <ImageButton
             a:id="@+id/onscreen_close_button"
diff --git a/app/src/main/res/layout/onscreen_header_material.xml b/app/src/main/res/layout/onscreen_header_material.xml
index fba0c19b..c6826e79 100644
--- a/app/src/main/res/layout/onscreen_header_material.xml
+++ b/app/src/main/res/layout/onscreen_header_material.xml
@@ -13,12 +13,12 @@
         <ImageButton
             a:id="@+id/onscreen_fold_button"
             style="@style/CppHeaderButton.Material"
-            a:src="@drawable/ic_space_bar_white_24dp" />
+            a:src="@drawable/ic_vertical_align_center_white_24dp" />
 
         <ImageButton
             a:id="@+id/onscreen_minimize_button"
             style="@style/CppHeaderButton.Material"
-            a:src="@drawable/ic_file_download_white_24dp" />
+            a:src="@drawable/ic_vertical_align_top_white_24dp" />
 
         <ImageButton
             a:id="@+id/onscreen_close_button"
diff --git a/app/src/main/res/layout/onscreen_header_material_light.xml b/app/src/main/res/layout/onscreen_header_material_light.xml
index 625240f8..158a3f29 100644
--- a/app/src/main/res/layout/onscreen_header_material_light.xml
+++ b/app/src/main/res/layout/onscreen_header_material_light.xml
@@ -13,12 +13,12 @@
         <ImageButton
             a:id="@+id/onscreen_fold_button"
             style="@style/CppHeaderButton.Material.Light"
-            a:src="@drawable/ic_space_bar_white_24dp" />
+            a:src="@drawable/ic_vertical_align_center_white_24dp" />
 
         <ImageButton
             a:id="@+id/onscreen_minimize_button"
             style="@style/CppHeaderButton.Material.Light"
-            a:src="@drawable/ic_file_download_white_24dp" />
+            a:src="@drawable/ic_vertical_align_top_white_24dp" />
 
         <ImageButton
             a:id="@+id/onscreen_close_button"