diff --git a/Android/app/src/main/java/emu/project64/settings/BaseSettingsFragment.java b/Android/app/src/main/java/emu/project64/settings/BaseSettingsFragment.java
index d0dc4c006..cf55120f2 100644
--- a/Android/app/src/main/java/emu/project64/settings/BaseSettingsFragment.java
+++ b/Android/app/src/main/java/emu/project64/settings/BaseSettingsFragment.java
@@ -2,12 +2,9 @@ package emu.project64.settings;
 
 import emu.project64.R;
 import emu.project64.SplashActivity;
-import emu.project64.jni.NativeExports;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.Preference;
diff --git a/Android/app/src/main/java/emu/project64/settings/InputFragment.java b/Android/app/src/main/java/emu/project64/settings/InputFragment.java
index 9186c59a6..619123973 100644
--- a/Android/app/src/main/java/emu/project64/settings/InputFragment.java
+++ b/Android/app/src/main/java/emu/project64/settings/InputFragment.java
@@ -2,7 +2,7 @@ package emu.project64.settings;
 
 import emu.project64.R;
 
-public class InputFragment extends SettingsFragment
+public class InputFragment extends BaseSettingsFragment
 {
     @Override
     protected int getXml()
diff --git a/Android/app/src/main/java/emu/project64/settings/LogLevelPreference.java b/Android/app/src/main/java/emu/project64/settings/LogLevelPreference.java
index 56063c8bd..48b6c355e 100644
--- a/Android/app/src/main/java/emu/project64/settings/LogLevelPreference.java
+++ b/Android/app/src/main/java/emu/project64/settings/LogLevelPreference.java
@@ -7,10 +7,8 @@ import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.text.TextUtils;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.res.TypedArrayUtils;
 import androidx.preference.Preference;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 
 public class LogLevelPreference extends Preference {
     private CharSequence[] mEntries;
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_arrow_d.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_d.png
deleted file mode 100644
index 508b679b4..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_arrow_d.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_arrow_l.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_l.png
deleted file mode 100644
index 1e90eecef..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_arrow_l.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_arrow_r.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_r.png
deleted file mode 100644
index 3348b84d4..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_arrow_r.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_arrow_u.png b/Android/app/src/main/res/drawable-hdpi/ic_arrow_u.png
deleted file mode 100644
index d36cd41b1..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_arrow_u.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_box.png b/Android/app/src/main/res/drawable-hdpi/ic_box.png
deleted file mode 100644
index af32f9a20..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_box.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_bug.png b/Android/app/src/main/res/drawable-hdpi/ic_bug.png
deleted file mode 100644
index fdef8c53c..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_bug.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_check.png b/Android/app/src/main/res/drawable-hdpi/ic_check.png
deleted file mode 100644
index cdc66ff0c..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_check.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_controller.png b/Android/app/src/main/res/drawable-hdpi/ic_controller.png
deleted file mode 100644
index 27d817fbb..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_controller.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_debug.png b/Android/app/src/main/res/drawable-hdpi/ic_debug.png
deleted file mode 100644
index 8d8134fc7..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_debug.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_discord.png b/Android/app/src/main/res/drawable-hdpi/ic_discord.png
deleted file mode 100644
index 284e1a0f0..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_discord.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_folder.png b/Android/app/src/main/res/drawable-hdpi/ic_folder.png
deleted file mode 100644
index 968fa90d8..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_folder.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_gamepad.png b/Android/app/src/main/res/drawable-hdpi/ic_gamepad.png
deleted file mode 100644
index 3e2e13199..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_gamepad.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_lock.png b/Android/app/src/main/res/drawable-hdpi/ic_lock.png
deleted file mode 100644
index 58e488218..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_lock.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_menu.png b/Android/app/src/main/res/drawable-hdpi/ic_menu.png
deleted file mode 100644
index 36295a2cb..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_menu.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_phone.png b/Android/app/src/main/res/drawable-hdpi/ic_phone.png
deleted file mode 100644
index cd3852307..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_phone.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_picture.png b/Android/app/src/main/res/drawable-hdpi/ic_picture.png
deleted file mode 100644
index f72e2e5e7..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_picture.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_play.png b/Android/app/src/main/res/drawable-hdpi/ic_play.png
deleted file mode 100644
index 55bfec379..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_play.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_refresh.png b/Android/app/src/main/res/drawable-hdpi/ic_refresh.png
deleted file mode 100644
index fb1391d6c..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_refresh.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_review.png b/Android/app/src/main/res/drawable-hdpi/ic_review.png
deleted file mode 100644
index 62aca4f1e..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_review.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_search.png b/Android/app/src/main/res/drawable-hdpi/ic_search.png
deleted file mode 100644
index e192fbadb..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_search.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_sliders.png b/Android/app/src/main/res/drawable-hdpi/ic_sliders.png
deleted file mode 100644
index 66765b6fd..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_sliders.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_speaker.png b/Android/app/src/main/res/drawable-hdpi/ic_speaker.png
deleted file mode 100644
index c259ff9d7..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_speaker.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_storage.png b/Android/app/src/main/res/drawable-hdpi/ic_storage.png
deleted file mode 100644
index af84014b4..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_storage.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-hdpi/ic_undo.png b/Android/app/src/main/res/drawable-hdpi/ic_undo.png
deleted file mode 100644
index e70d89922..000000000
Binary files a/Android/app/src/main/res/drawable-hdpi/ic_undo.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_about.png b/Android/app/src/main/res/drawable-mdpi/ic_about.png
deleted file mode 100644
index ce2614f58..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_about.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_arrow_d.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_d.png
deleted file mode 100644
index 2bcf60189..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_arrow_d.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_arrow_l.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_l.png
deleted file mode 100644
index b8b3e1abe..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_arrow_l.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_arrow_r.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_r.png
deleted file mode 100644
index 3fa488735..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_arrow_r.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_arrow_u.png b/Android/app/src/main/res/drawable-mdpi/ic_arrow_u.png
deleted file mode 100644
index ce678ae46..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_arrow_u.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_box.png b/Android/app/src/main/res/drawable-mdpi/ic_box.png
deleted file mode 100644
index 81393365d..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_box.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_bug.png b/Android/app/src/main/res/drawable-mdpi/ic_bug.png
deleted file mode 100644
index b720e0de5..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_bug.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_check.png b/Android/app/src/main/res/drawable-mdpi/ic_check.png
deleted file mode 100644
index 6d4c9b9b9..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_check.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_controller.png b/Android/app/src/main/res/drawable-mdpi/ic_controller.png
deleted file mode 100644
index 531afd55c..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_controller.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_debug.png b/Android/app/src/main/res/drawable-mdpi/ic_debug.png
deleted file mode 100644
index eb4ce6520..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_debug.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_discord.png b/Android/app/src/main/res/drawable-mdpi/ic_discord.png
deleted file mode 100644
index 116779cf9..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_discord.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_folder.png b/Android/app/src/main/res/drawable-mdpi/ic_folder.png
deleted file mode 100644
index 541c1107b..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_folder.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_gamepad.png b/Android/app/src/main/res/drawable-mdpi/ic_gamepad.png
deleted file mode 100644
index e3b912ad4..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_gamepad.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_lock.png b/Android/app/src/main/res/drawable-mdpi/ic_lock.png
deleted file mode 100644
index 413ab430c..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_lock.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_menu.png b/Android/app/src/main/res/drawable-mdpi/ic_menu.png
deleted file mode 100644
index d22ed2da8..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_menu.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/Android/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index 2ba592396..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_phone.png b/Android/app/src/main/res/drawable-mdpi/ic_phone.png
deleted file mode 100644
index 57dd04cee..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_phone.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_picture.png b/Android/app/src/main/res/drawable-mdpi/ic_picture.png
deleted file mode 100644
index d2076219c..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_picture.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_play.png b/Android/app/src/main/res/drawable-mdpi/ic_play.png
deleted file mode 100644
index 6a40cd5f7..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_play.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_refresh.png b/Android/app/src/main/res/drawable-mdpi/ic_refresh.png
deleted file mode 100644
index 7ca0f5b00..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_refresh.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_review.png b/Android/app/src/main/res/drawable-mdpi/ic_review.png
deleted file mode 100644
index b43d59c11..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_review.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_search.png b/Android/app/src/main/res/drawable-mdpi/ic_search.png
deleted file mode 100644
index 288761457..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_search.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_settings.png b/Android/app/src/main/res/drawable-mdpi/ic_settings.png
deleted file mode 100644
index d0639161e..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_settings.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_sliders.png b/Android/app/src/main/res/drawable-mdpi/ic_sliders.png
deleted file mode 100644
index d3e42edcb..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_sliders.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_speaker.png b/Android/app/src/main/res/drawable-mdpi/ic_speaker.png
deleted file mode 100644
index 3d8cbc156..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_speaker.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_storage.png b/Android/app/src/main/res/drawable-mdpi/ic_storage.png
deleted file mode 100644
index d82f9bd3e..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_storage.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_support.png b/Android/app/src/main/res/drawable-mdpi/ic_support.png
deleted file mode 100644
index 8222d8b60..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_support.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-mdpi/ic_undo.png b/Android/app/src/main/res/drawable-mdpi/ic_undo.png
deleted file mode 100644
index 7e6a2ac55..000000000
Binary files a/Android/app/src/main/res/drawable-mdpi/ic_undo.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_about.png b/Android/app/src/main/res/drawable-xhdpi/ic_about.png
deleted file mode 100644
index 949ce96a6..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_about.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_arrow_l.png b/Android/app/src/main/res/drawable-xhdpi/ic_arrow_l.png
deleted file mode 100644
index e97e910e0..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_arrow_l.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_arrow_r.png b/Android/app/src/main/res/drawable-xhdpi/ic_arrow_r.png
deleted file mode 100644
index 7dc45c0d4..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_arrow_r.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_bug.png b/Android/app/src/main/res/drawable-xhdpi/ic_bug.png
deleted file mode 100644
index b943f5f00..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_bug.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_controller.png b/Android/app/src/main/res/drawable-xhdpi/ic_controller.png
deleted file mode 100644
index b965a4ecd..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_controller.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_debug.png b/Android/app/src/main/res/drawable-xhdpi/ic_debug.png
deleted file mode 100644
index abf0e087c..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_debug.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_discord.png b/Android/app/src/main/res/drawable-xhdpi/ic_discord.png
deleted file mode 100644
index bb22c3c73..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_discord.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_gamepad.png b/Android/app/src/main/res/drawable-xhdpi/ic_gamepad.png
deleted file mode 100644
index dceba27c5..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_gamepad.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_lock.png b/Android/app/src/main/res/drawable-xhdpi/ic_lock.png
deleted file mode 100644
index 917185007..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_lock.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_menu.png b/Android/app/src/main/res/drawable-xhdpi/ic_menu.png
deleted file mode 100644
index 193185fd8..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_menu.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_phone.png b/Android/app/src/main/res/drawable-xhdpi/ic_phone.png
deleted file mode 100644
index 2e46eb061..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_phone.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_picture.png b/Android/app/src/main/res/drawable-xhdpi/ic_picture.png
deleted file mode 100644
index 7dd6d0e34..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_picture.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_play.png b/Android/app/src/main/res/drawable-xhdpi/ic_play.png
deleted file mode 100644
index 51124993d..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_play.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png b/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png
deleted file mode 100644
index 93a51a040..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_review.png b/Android/app/src/main/res/drawable-xhdpi/ic_review.png
deleted file mode 100644
index 5a2569c30..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_review.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_settings.png b/Android/app/src/main/res/drawable-xhdpi/ic_settings.png
deleted file mode 100644
index a6705d299..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_sliders.png b/Android/app/src/main/res/drawable-xhdpi/ic_sliders.png
deleted file mode 100644
index 09b014834..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_sliders.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png b/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png
deleted file mode 100644
index a35eb894b..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_speaker.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_storage.png b/Android/app/src/main/res/drawable-xhdpi/ic_storage.png
deleted file mode 100644
index 2202d0ae1..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_storage.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_support.png b/Android/app/src/main/res/drawable-xhdpi/ic_support.png
deleted file mode 100644
index 05405ca05..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_support.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable-xhdpi/ic_undo.png b/Android/app/src/main/res/drawable-xhdpi/ic_undo.png
deleted file mode 100644
index ec4e0cc75..000000000
Binary files a/Android/app/src/main/res/drawable-xhdpi/ic_undo.png and /dev/null differ
diff --git a/Android/app/src/main/res/drawable/ic_about.xml b/Android/app/src/main/res/drawable/ic_about.xml
new file mode 100644
index 000000000..f821d216c
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_about.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <path
+      android:pathData="M64,1C29.3,1 1,29.3 1,64s28.3,63 63,63s63,-28.3 63,-63S98.7,1 64,1zM64,119C33.7,119 9,94.3 9,64S33.7,9 64,9s55,24.7 55,55S94.3,119 64,119z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M60,54.5h8v40h-8z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M60,35.5h8v8h-8z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_advanced.xml b/Android/app/src/main/res/drawable/ic_advanced.xml
new file mode 100644
index 000000000..f46b51d0f
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_advanced.xml
@@ -0,0 +1,5 @@
+<vector android:height="48dp" android:viewportHeight="507.5"
+    android:viewportWidth="507.5" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M254.88,262.34c8.67,-12.81 14.8,-27.5 17.75,-43.23h43.55v-0.02V174.81h-43.55c-3.02,-15.83 -9.1,-30.46 -17.77,-43.25l30.69,-30.72l-31.34,-31.36l-30.74,30.72c-12.77,-8.72 -27.46,-14.8 -43.25,-17.84V38.85h-44.28v43.51c-15.79,3.09 -30.46,9.12 -43.21,17.84L61.99,69.48L30.61,100.8l30.74,30.76c-8.67,12.79 -14.78,27.4 -17.8,43.25H0v44.31h43.55c3.06,15.73 9.15,30.42 17.8,43.23l-30.74,30.74l31.39,31.32l30.69,-30.76c12.79,8.67 27.46,14.84 43.25,17.86v43.55h44.33v-43.55c15.75,-3.04 30.46,-9.19 43.25,-17.82l30.74,30.72l31.34,-31.32L254.88,262.34zM158.07,245.26c-26.66,0 -48.32,-21.68 -48.32,-48.36c0,-26.7 21.66,-48.32 48.32,-48.32c26.68,0 48.36,21.61 48.36,48.32C206.43,223.58 184.75,245.26 158.07,245.26z"/>
+    <path android:fillColor="#000000" android:pathData="M507.5,365.28v-33.69h-33.09c-2.24,-12.02 -6.88,-23.12 -13.52,-32.85l23.34,-23.34l-23.84,-23.84l-23.32,23.34c-9.73,-6.62 -20.92,-11.24 -32.85,-13.57v-33.11h-33.69v33.09c-12.02,2.35 -23.15,6.95 -32.83,13.57l-23.43,-23.34l-23.84,23.81l23.34,23.38c-6.62,9.73 -11.24,20.92 -13.57,32.87h-33.07v33.69h33.07c2.31,11.95 6.95,23.17 13.57,32.85l-23.34,23.34l23.84,23.81l23.34,-23.38c9.69,6.66 20.88,11.28 32.83,13.61v33.11h33.69v-33.11c11.99,-2.29 23.12,-6.95 32.83,-13.52l23.34,23.3l23.81,-23.81l-23.34,-23.34c6.66,-9.69 11.24,-20.97 13.52,-32.85L507.5,365.28L507.5,365.28zM387.3,385.19c-20.25,0 -36.76,-16.48 -36.76,-36.78c0,-20.28 16.5,-36.74 36.76,-36.74c20.3,0 36.76,16.46 36.76,36.74C424.06,368.73 407.6,385.19 387.3,385.19z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_arrow_d.xml b/Android/app/src/main/res/drawable/ic_arrow_d.xml
new file mode 100644
index 000000000..26f50740e
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_arrow_d.xml
@@ -0,0 +1,4 @@
+<vector android:height="32dp" android:viewportHeight="512.01"
+    android:viewportWidth="512.01" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M505.76,123.59c-8.34,-8.34 -21.82,-8.34 -30.17,0L256.01,343.18L36.42,123.59c-8.34,-8.34 -21.82,-8.34 -30.17,0s-8.34,21.82 0,30.17l234.67,234.67c4.16,4.16 9.62,6.25 15.08,6.25c5.46,0 10.92,-2.09 15.08,-6.25l234.67,-234.67C514.1,145.42 514.1,131.93 505.76,123.59z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_arrow_l.xml b/Android/app/src/main/res/drawable/ic_arrow_l.xml
new file mode 100644
index 000000000..dc352802d
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_arrow_l.xml
@@ -0,0 +1,4 @@
+<vector android:height="32dp" android:viewportHeight="512.01"
+    android:viewportWidth="512.01" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M388.42,475.59L168.83,256.01L388.42,36.42c8.34,-8.34 8.34,-21.82 0,-30.17s-21.82,-8.34 -30.17,0L123.59,240.92c-8.34,8.34 -8.34,21.82 0,30.17l234.67,234.67c4.16,4.16 9.62,6.25 15.08,6.25c5.46,0 10.92,-2.09 15.08,-6.25C396.76,497.41 396.76,483.93 388.42,475.59z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_arrow_r.xml b/Android/app/src/main/res/drawable/ic_arrow_r.xml
new file mode 100644
index 000000000..886645aa2
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_arrow_r.xml
@@ -0,0 +1,4 @@
+<vector android:height="32dp" android:viewportHeight="512.01"
+    android:viewportWidth="512.01" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M388.42,240.92L153.75,6.26c-8.34,-8.34 -21.82,-8.34 -30.17,0s-8.34,21.82 0,30.17L343.17,256.01L123.59,475.59c-8.34,8.34 -8.34,21.82 0,30.17c4.16,4.16 9.62,6.25 15.08,6.25c5.46,0 10.92,-2.09 15.08,-6.25l234.67,-234.67C396.76,262.75 396.76,249.26 388.42,240.92z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_arrow_u.xml b/Android/app/src/main/res/drawable/ic_arrow_u.xml
new file mode 100644
index 000000000..59cf38149
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_arrow_u.xml
@@ -0,0 +1,4 @@
+<vector android:height="32dp" android:viewportHeight="512.01"
+    android:viewportWidth="512.01" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M505.76,358.26L271.09,123.59c-8.34,-8.34 -21.82,-8.34 -30.17,0L6.26,358.26c-8.34,8.34 -8.34,21.82 0,30.17s21.82,8.34 30.17,0l219.58,-219.58l219.58,219.58c4.16,4.16 9.62,6.25 15.08,6.25c5.46,0 10.92,-2.09 15.08,-6.25C514.1,380.08 514.1,366.6 505.76,358.26z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_box.xml b/Android/app/src/main/res/drawable/ic_box.xml
new file mode 100644
index 000000000..60751fa09
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_box.xml
@@ -0,0 +1,6 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#f9fbff"
+        android:pathData="M6,0.5L18,0.5A5.5,5.5 0,0 1,23.5 6L23.5,18A5.5,5.5 0,0 1,18 23.5L6,23.5A5.5,5.5 0,0 1,0.5 18L0.5,6A5.5,5.5 0,0 1,6 0.5z"
+        android:strokeColor="#868c8f" android:strokeWidth="1"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_check.xml b/Android/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 000000000..84a0cbdc8
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,7 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#f9fbff"
+        android:pathData="M6,0.5L18,0.5A5.5,5.5 0,0 1,23.5 6L23.5,18A5.5,5.5 0,0 1,18 23.5L6,23.5A5.5,5.5 0,0 1,0.5 18L0.5,6A5.5,5.5 0,0 1,6 0.5z"
+        android:strokeColor="#868c8f" android:strokeWidth="1"/>
+    <path android:fillColor="#494c4e" android:pathData="M19.707,7.293a1,1 0,0 0,-1.414 0L10,15.586 6.707,12.293a1,1 0,0 0,-1.414 1.414l4,4a1,1 0,0 0,1.414 0l9,-9A1,1 0,0 0,19.707 7.293Z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_controller.xml b/Android/app/src/main/res/drawable/ic_controller.xml
new file mode 100644
index 000000000..778406c0f
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_controller.xml
@@ -0,0 +1,51 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="587.03"
+    android:viewportHeight="587.03">
+  <path
+      android:pathData="M402.37,186.22c-10.97,0 -19.9,8.92 -19.9,19.9s8.92,19.9 19.9,19.9c10.97,0 19.9,-8.93 19.9,-19.9S413.35,186.22 402.37,186.22z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M360.36,67.14c-2.7,-1.5 -5.65,-2.03 -8.72,-2.03c-38.74,0 -77.5,0 -116.24,0c-1.72,0 -3.42,0.16 -5.09,0.61c-3.71,0.99 -6.73,2.96 -8.81,6.25c-1.97,3.12 -2.58,6.55 -2.04,10.16c0.75,4.99 3.4,8.62 7.94,10.83c2.52,1.23 5.21,1.63 7.98,1.63c19.38,0 38.76,0 58.14,0c19.37,0 38.73,0 58.1,0c1.65,0 3.29,-0.14 4.9,-0.54c3.5,-0.87 6.43,-2.63 8.54,-5.59c2.33,-3.27 3.09,-6.95 2.51,-10.89C366.91,72.94 364.48,69.43 360.36,67.14zM249.37,88.98c-0.35,0 -0.68,0 -1,0c-1.39,0 -2.8,-0.01 -4.19,0.01c-0.31,0.01 -0.47,-0.1 -0.63,-0.35c-2.47,-3.99 -4.94,-7.97 -7.42,-11.96c-0.08,-0.13 -0.17,-0.26 -0.25,-0.39c-0.04,0.01 -0.07,0.01 -0.1,0.02c0,2.1 0,4.2 0,6.3c0,2.11 0,4.21 0,6.35c-1.88,0 -3.71,0 -5.59,0c0,-6.08 0,-12.17 0,-18.3c0.15,0 0.29,0 0.42,0c1.59,0 3.16,0.01 4.75,-0.01c0.34,-0.01 0.53,0.09 0.72,0.39c2.44,3.98 4.89,7.94 7.34,11.91c0.08,0.14 0.17,0.26 0.34,0.38c0,-4.21 0,-8.42 0,-12.65c1.9,0 3.74,0 5.61,0C249.37,76.77 249.37,82.86 249.37,88.98zM252.59,70.65c0.92,0 1.82,0 2.73,0c0.89,0 1.79,0 2.72,0c0,1.22 0,2.42 0,3.67c-1.79,0 -3.61,0 -5.45,0C252.59,73.1 252.59,71.89 252.59,70.65zM258.06,88.95c-1.82,0 -3.61,0 -5.44,0c0,-4.03 0,-8.06 0,-12.11c1.81,0 3.61,0 5.44,0C258.06,80.9 258.06,84.91 258.06,88.95zM277.19,88.95c-1.79,0 -3.56,0 -5.4,0c0,-0.15 0,-0.3 0,-0.45c0,-2.41 0,-4.82 0,-7.23c0,-1.26 -0.76,-2.24 -1.95,-2.49c-1.27,-0.27 -2.6,0.34 -3.07,1.46c-0.14,0.32 -0.18,0.69 -0.18,1.03c-0.01,2.4 0,4.8 0.01,7.2c0,0.15 0,0.31 0,0.49c-1.84,0 -3.6,0 -5.4,0c0,-4.04 0,-8.07 0,-12.12c1.78,0 3.56,0 5.4,0c0,0.38 0,0.76 0,1.24c0.2,-0.16 0.31,-0.24 0.42,-0.33c2.52,-2.11 6.36,-1.95 8.64,0.37c1.06,1.08 1.53,2.42 1.55,3.9c0.04,2.25 0.01,4.51 0.01,6.76C277.21,88.83 277.19,88.88 277.19,88.95zM285.78,88.94c-1.84,0 -3.65,0 -5.51,0c0,-4.03 0,-8.07 0,-12.14c-1.01,0 -1.96,0 -2.99,0c0,-0.56 -0.01,-1.1 0.02,-1.63c0,-0.06 0.21,-0.15 0.34,-0.15c0.86,-0.01 1.71,-0.01 2.62,-0.01c0,-0.82 0,-1.62 0,-2.44c1.85,0 3.65,0 5.51,0c0,0.8 0,1.59 0,2.42c1,0 1.97,0 2.96,0c0,0.62 0,1.19 0,1.8c-0.99,0 -1.94,0 -2.93,0C285.78,80.86 285.78,84.88 285.78,88.94zM294.02,86.4c0.17,1.18 1.16,1.85 2.33,1.81c1.07,-0.04 1.94,-0.86 2.1,-2.01c0.07,-0.47 0.07,-0.94 0.12,-1.46c0.89,0 1.78,0 2.67,0c0.88,0 1.76,0 2.7,0c-0.07,0.2 -0.12,0.37 -0.2,0.53c-0.95,2.06 -2.6,3.34 -4.72,3.98c-3.07,0.94 -5.96,0.54 -8.51,-1.48c-1.7,-1.35 -2.59,-3.13 -2.44,-5.35c0.12,-1.71 0.91,-3.1 2.17,-4.21c1.89,-1.66 4.13,-2.3 6.62,-2.12c2.14,0.15 4.01,0.94 5.53,2.48c1.19,1.21 1.91,2.89 1.85,4.36c-3.46,0 -6.89,0 -10.42,0C293.89,84.12 293.85,85.28 294.02,86.4zM322,88.94c-1.77,0 -3.54,0 -5.37,0c-0.01,-0.15 -0.03,-0.32 -0.03,-0.48c0,-2.38 0,-4.75 0,-7.12c0,-1.25 -0.59,-2.12 -1.68,-2.49c-1.1,-0.37 -2.35,0 -3.05,0.91c-0.33,0.42 -0.47,0.9 -0.47,1.44c0.01,2.4 0.01,4.8 0.01,7.2c0,0.17 0,0.34 0,0.54c-1.81,0 -3.59,0 -5.4,0c0,-4.03 0,-8.05 0,-12.1c1.79,0 3.56,0 5.4,0c0,0.39 0,0.77 0,1.27c0.21,-0.17 0.32,-0.27 0.44,-0.37c2.66,-2.22 6.79,-1.9 8.92,0.71c0.75,0.92 1.19,1.98 1.22,3.15c0.05,2.38 0.03,4.74 0.04,7.12C322.04,88.79 322.02,88.85 322,88.94zM339.36,88.95c-1.79,0 -3.56,0 -5.37,0c-0.02,-0.2 -0.04,-0.4 -0.05,-0.67c-1.85,1.08 -3.78,1.35 -5.8,0.66c-1.32,-0.45 -2.37,-1.3 -3.17,-2.44c-1.53,-2.17 -1.51,-5.16 0.07,-7.38c0.66,-0.93 1.49,-1.66 2.52,-2.18c1.02,-0.51 2.09,-0.7 3.21,-0.62c1.14,0.07 2.15,0.52 3.2,1.09c0,-1.17 0,-2.28 0,-3.38c0,-1.11 0,-2.21 0,-3.37c1.82,0 3.59,0 5.39,0C339.36,76.77 339.36,82.85 339.36,88.95zM354.84,87.72c-1.63,1.33 -3.52,1.91 -5.78,1.92c-2.03,-0.03 -4.02,-0.68 -5.68,-2.17c-2.9,-2.62 -2.86,-6.79 0.07,-9.38c3.18,-2.79 8.4,-2.82 11.56,-0.05C358.13,80.76 358.05,85.11 354.84,87.72z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M440.3,228.14c-10.97,0 -19.9,8.92 -19.9,19.9s8.92,19.9 19.9,19.9c10.97,0 19.9,-8.92 19.9,-19.9S451.28,228.14 440.3,228.14z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M535.02,94.32V76.35c-36.94,-28.95 -120.28,-30.45 -120.28,-30.45l-4.49,-6.98C358.82,7.77 294.7,9.93 293.52,9.97C292.33,9.93 228.21,7.77 176.79,38.92l-4.49,6.99c0,0 -83.35,1.5 -120.28,30.45v17.97c0,0 -41.09,36.27 -41.09,81.52s-30.61,188.32 10.65,266.84c41.26,78.51 77.85,-61.23 81.85,-87.18c4,-25.95 17.97,-57.9 26.62,-62.55c0,0 76.52,-5.32 79.85,54.56c3.32,59.85 24.93,226.7 83.57,229.57v0.01c0.02,0 0.04,-0.01 0.05,-0.01s0.04,0.01 0.06,0.01v-0.01c58.64,-2.87 80.25,-169.72 83.57,-229.57c3.33,-59.89 79.85,-54.56 79.85,-54.56c8.65,4.66 22.63,36.6 26.62,62.55s40.59,165.7 81.85,87.17c41.26,-78.53 10.65,-221.59 10.65,-266.84C576.11,130.59 535.02,94.32 535.02,94.32zM161.05,192.8c0,4.99 -4.06,9.05 -9.05,9.05H130.1v21.89c0,4.99 -4.06,9.05 -9.05,9.05h-15.97c-4.99,0 -9.05,-4.06 -9.05,-9.05v-21.89H74.13c-4.99,0 -9.05,-4.06 -9.05,-9.05v-15.97c0,-4.99 4.06,-9.05 9.05,-9.05H96.03v-21.89c0,-4.99 4.06,-9.05 9.05,-9.05h15.97c4.99,0 9.05,4.06 9.05,9.05v21.89h21.9c4.99,0 9.05,4.06 9.05,9.05V192.8zM485.22,114.72c11.05,0 20.03,8.98 20.03,20.02c0,11.04 -8.98,20.02 -20.03,20.02c-11.04,0 -20.02,-8.98 -20.02,-20.02C465.2,123.7 474.18,114.72 485.22,114.72zM451.28,148.65c11.05,0 20.03,8.98 20.03,20.02s-8.98,20.03 -20.03,20.03c-11.04,0 -20.02,-8.99 -20.02,-20.03S440.24,148.65 451.28,148.65zM293.52,388.07c-34.65,0 -62.84,-28.19 -62.84,-62.84s28.19,-62.85 62.84,-62.85c34.65,0 62.84,28.19 62.84,62.85C356.36,359.88 328.17,388.07 293.52,388.07zM267.5,211.1c0,-14.35 11.67,-26.02 26.02,-26.02s26.02,11.67 26.02,26.02c0,14.35 -11.67,26.02 -26.02,26.02S267.5,225.45 267.5,211.1zM371.84,85.35c-2.11,7.41 -8.4,12.66 -16.54,13.75c-0.75,0.1 -1.51,0.17 -2.27,0.25c-39.66,0 -79.32,0 -118.98,0c-0.5,-0.05 -0.99,-0.11 -1.49,-0.16c-2.83,-0.28 -5.54,-1.03 -8.04,-2.4c-5.59,-3.08 -8.89,-7.79 -9.86,-14.11c-0.1,-0.69 -0.16,-1.38 -0.24,-2.08c0,-0.48 0,-0.95 0,-1.43c0.08,-0.7 0.14,-1.41 0.24,-2.11c0.72,-4.9 2.96,-8.97 6.8,-12.1c3.93,-3.21 8.52,-4.58 13.53,-4.58c39.03,-0.01 78.05,-0.01 117.07,-0.01c2.05,0 4.07,0.25 6.05,0.79C369.24,64.16 374.76,75.05 371.84,85.35zM376.36,206.11c0,-14.35 11.67,-26.02 26.02,-26.02c14.35,0 26.02,11.67 26.02,26.02c0,14.35 -11.67,26.02 -26.02,26.02C388.03,232.13 376.36,220.46 376.36,206.11zM440.3,274.05c-14.35,0 -26.02,-11.67 -26.02,-26.02s11.67,-26.02 26.02,-26.02c14.35,0 26.02,11.67 26.02,26.02S454.65,274.05 440.3,274.05zM485.22,222.65c-11.04,0 -20.02,-8.98 -20.02,-20.02s8.98,-20.02 20.02,-20.02c11.05,0 20.03,8.98 20.03,20.02S496.27,222.65 485.22,222.65zM519.16,188.71c-11.04,0 -20.02,-8.99 -20.02,-20.03s8.98,-20.02 20.02,-20.02c11.05,0 20.03,8.98 20.03,20.02S530.21,188.71 519.16,188.71z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M351.21,78.8c-0.33,-0.89 -1.05,-1.35 -2,-1.35c-0.92,0 -1.64,0.44 -1.98,1.32c-0.18,0.48 -0.29,1.02 -0.29,1.54c-0.04,1.67 -0.02,3.35 -0.01,5.02c0,0.29 0.03,0.58 0.08,0.86c0.2,1.13 1.03,1.92 2.07,1.95c1.29,0.05 2.28,-0.83 2.36,-2.19c0.06,-1.05 0.01,-2.11 0.01,-3.16c0.02,0 0.03,0 0.05,0c0,-0.79 0.04,-1.59 -0.01,-2.38C351.46,79.87 351.4,79.31 351.21,78.8z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M485.22,202.62m-13.9,0a13.9,13.9 0,1 1,27.81 0a13.9,13.9 0,1 1,-27.81 0"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M519.16,168.68m-13.91,0a13.91,13.91 0,1 1,27.82 0a13.91,13.91 0,1 1,-27.82 0"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M293.52,268.51c-31.27,0 -56.72,25.45 -56.72,56.73s25.45,56.72 56.72,56.72s56.72,-25.44 56.72,-56.72S324.79,268.51 293.52,268.51zM293.52,355.8c-16.85,0 -30.56,-13.71 -30.56,-30.56s13.71,-30.56 30.56,-30.56c16.85,0 30.56,13.71 30.56,30.56S310.37,355.8 293.52,355.8z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M451.28,168.68m-13.91,0a13.91,13.91 0,1 1,27.82 0a13.91,13.91 0,1 1,-27.82 0"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M293.52,300.78c-13.48,0 -24.44,10.97 -24.44,24.44s10.97,24.44 24.44,24.44s24.44,-10.97 24.44,-24.44S306.99,300.78 293.52,300.78z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M485.22,134.75m-13.9,0a13.9,13.9 0,1 1,27.81 0a13.9,13.9 0,1 1,-27.81 0"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M296.28,77.51c-1.09,-0.04 -2.06,0.72 -2.27,1.81c-0.09,0.46 -0.07,0.94 -0.12,1.41c-0.02,0.26 0.08,0.35 0.34,0.34c0.66,-0.01 1.32,-0.01 1.98,-0.01c0.66,0 1.32,-0.01 1.98,0.01c0.28,0.01 0.38,-0.09 0.35,-0.37c-0.04,-0.42 -0.03,-0.84 -0.09,-1.26C298.28,78.35 297.36,77.54 296.28,77.51z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M152,173.9h-28.02v-28.01c0,-1.62 -1.32,-2.93 -2.93,-2.93h-15.97c-1.62,0 -2.93,1.32 -2.93,2.93v28.01H74.13c-1.62,0 -2.93,1.32 -2.93,2.93v15.97c0,1.62 1.32,2.93 2.93,2.93h28.02v28.01c0,1.62 1.32,2.93 2.93,2.93h15.97c1.62,0 2.93,-1.32 2.93,-2.93v-28.01h28.02c1.62,0 2.93,-1.32 2.93,-2.93v-15.97C154.93,175.22 153.61,173.9 152,173.9z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M313.42,211.1c0,-10.97 -8.92,-19.9 -19.9,-19.9c-10.97,0 -19.9,8.92 -19.9,19.9s8.92,19.9 19.9,19.9C304.49,231 313.42,222.07 313.42,211.1z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M331.8,78.27c-1.21,0.02 -2.09,0.81 -2.12,2c-0.04,1.7 -0.04,3.4 0,5.1c0.03,1.18 0.91,2 2.1,2.04c1.16,0.04 2.1,-0.75 2.18,-1.94c0.06,-0.86 0.01,-1.74 0.01,-2.61l0,0c0,-0.89 0.05,-1.79 -0.01,-2.69C333.88,78.99 332.98,78.25 331.8,78.27z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_discord.xml b/Android/app/src/main/res/drawable/ic_discord.xml
new file mode 100644
index 000000000..6644ed59d
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_discord.xml
@@ -0,0 +1,36 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M14.55,40.17c3.53,2.67 8.86,5.46 17.45,5.46s13.92,-2.79 17.45,-5.46"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M48,22.18c-4.31,-2.2 -8.57,-4.26 -16,-4.26S20.33,20 16,22.18"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="m27.32,18.23 l-1.87,-3.68a22.75,22.75 0,0 0,-10.9 4.36S9,27 8,42.91c5.63,6.49 14.18,6.54 14.18,6.54L25.5,45"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="m38.5,45 l3.32,4.42s8.55,-0.02 14.18,-6.51c-1,-15.9 -6.55,-24 -6.55,-24s-5,-3.92 -10.9,-4.36l-1.82,3.69"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M21.09,34.18a3.82,4.36 0,1 0,7.64 0a3.82,4.36 0,1 0,-7.64 0z"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M35.27,34.18a3.82,4.36 0,1 0,7.64 0a3.82,4.36 0,1 0,-7.64 0z"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_folder.xml b/Android/app/src/main/res/drawable/ic_folder.xml
new file mode 100644
index 000000000..dc413c659
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_folder.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M426.67,213.33L426.67,128L274.71,128L220.75,85.33L42.67,85.33L42.67,426.67L103.6,426.67L406.08,426.67L415.25,426.67L480,213.33L426.67,213.33ZM85.33,338.77L85.33,128L205.92,128L259.88,170.67L384,170.67L384,213.33L124.69,213.33L85.33,338.77ZM383.63,384L115.85,384L156.02,256L422.46,256L383.63,384Z"
+      android:fillColor="#000000"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_gamepad.xml b/Android/app/src/main/res/drawable/ic_gamepad.xml
new file mode 100644
index 000000000..87e806e51
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_gamepad.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M173.87,296.61h-20.61v-20.61c0,-10.38 -8.45,-18.83 -18.83,-18.83H111.82c-10.38,0 -18.83,8.45 -18.83,18.83v20.61H72.38c-10.38,0 -18.83,8.45 -18.83,18.83v22.61c0,10.38 8.45,18.83 18.83,18.83H92.99v20.61c0,10.38 8.45,18.83 18.83,18.83h22.61c10.38,0 18.83,-8.45 18.83,-18.83v-20.61h20.61c10.38,0 18.83,-8.45 18.83,-18.83V315.44C192.7,305.06 184.25,296.61 173.87,296.61zM173.87,340.74h-28.68c-4.46,0 -8.07,3.61 -8.07,8.07v28.68c0,1.46 -1.23,2.69 -2.69,2.69H111.82c-1.46,0 -2.69,-1.23 -2.69,-2.69v-28.68c0,-4.46 -3.61,-8.07 -8.07,-8.07H72.38c-1.46,0 -2.69,-1.23 -2.69,-2.69V315.44c0,-1.46 1.23,-2.69 2.69,-2.69h28.68c4.46,0 8.07,-3.61 8.07,-8.07v-28.68c0,-1.46 1.23,-2.69 2.69,-2.69h22.61c1.46,0 2.69,1.23 2.69,2.69v28.68c0,4.46 3.61,8.07 8.07,8.07h28.68c1.46,0 2.69,1.23 2.69,2.69v22.61h0C176.56,339.51 175.33,340.74 173.87,340.74z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M226.95,257.17h-25.82c-4.46,0 -8.07,3.61 -8.07,8.07s3.61,8.07 8.07,8.07h25.82c4.46,0 8.07,-3.61 8.07,-8.07S231.4,257.17 226.95,257.17z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M318.95,265.24c0,-4.46 -3.61,-8.07 -8.07,-8.07h-25.82c-4.46,0 -8.07,3.61 -8.07,8.07s3.61,8.07 8.07,8.07h25.82C315.33,273.31 318.95,269.7 318.95,265.24z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M388.88,310.62c16.62,0 30.14,-13.52 30.14,-30.14c0,-16.62 -13.52,-30.14 -30.14,-30.14c-16.62,0 -30.14,13.52 -30.14,30.14C358.74,297.1 372.26,310.62 388.88,310.62zM388.88,266.48c7.72,0 14,6.28 14,14s-6.28,14 -14,14c-7.72,0 -14,-6.28 -14,-14S381.16,266.48 388.88,266.48z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M435.15,296.61c-16.62,0 -30.14,13.52 -30.14,30.14s13.52,30.14 30.14,30.14c16.62,0 30.14,-13.52 30.14,-30.14S451.76,296.61 435.15,296.61zM435.15,340.74c-7.72,0 -14,-6.28 -14,-14s6.28,-14 14,-14s14,6.28 14,14S442.86,340.74 435.15,340.74z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M393.66,208.4h-67.77v-8.07c0,-13.35 -10.86,-24.21 -24.21,-24.21h-37.61v-6.81c0,-21.56 17.54,-39.09 39.09,-39.09h54.02c30.46,0 55.23,-24.78 55.23,-55.23c0,-4.46 -3.61,-8.07 -8.07,-8.07s-8.07,3.61 -8.07,8.07c0,21.56 -17.54,39.09 -39.09,39.09h-54.02c-30.46,0 -55.23,24.78 -55.23,55.23v6.81h-37.61c-13.35,0 -24.21,10.86 -24.21,24.21v8.07h-67.76c-0,-0 -0,-0 -0.01,0C53.09,208.4 0,261.49 0,326.75C0,392 53.09,445.09 118.34,445.09c19.4,0 38.64,-4.8 55.64,-13.88c0.18,-0.1 0.36,-0.2 0.54,-0.31c20.84,-12.29 45.15,-23.63 81.48,-23.63c36.28,0 60.57,11.3 81.39,23.57c0.2,0.13 0.41,0.26 0.63,0.37c17.01,9.08 36.25,13.87 55.65,13.87c65.25,0 118.34,-53.09 118.34,-118.34S458.91,208.4 393.66,208.4zM202.25,200.34c0,-4.45 3.62,-8.07 8.07,-8.07h91.36c4.45,0 8.07,3.62 8.07,8.07v8.07H202.25V200.34zM393.66,428.95c-16.63,0 -33.13,-4.08 -47.72,-11.8c-0,-0 -0.01,-0 -0.01,-0.01C323.06,403.63 296.34,391.13 256,391.13c-40.3,0 -67,12.48 -89.85,25.97c-14.62,7.75 -31.14,11.85 -47.81,11.85c-56.35,0 -102.2,-45.85 -102.2,-102.2c0,-56.2 45.6,-101.96 101.75,-102.2c0.3,0.02 0.61,0.02 0.92,-0h274.85c56.35,0 102.2,45.85 102.2,102.2S450.01,428.95 393.66,428.95z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M388.88,342.88c-16.62,0 -30.14,13.52 -30.14,30.14c0,16.62 13.52,30.14 30.14,30.14c16.62,0 30.14,-13.52 30.14,-30.14S405.5,342.88 388.88,342.88zM388.88,387.01c-7.72,0 -14,-6.28 -14,-14s6.28,-14 14,-14s14,6.28 14,14S396.6,387.01 388.88,387.01z"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M372.75,326.75c0,-16.62 -13.52,-30.14 -30.14,-30.14c-16.62,0 -30.14,13.52 -30.14,30.14c0,16.62 13.52,30.14 30.14,30.14C359.23,356.88 372.75,343.36 372.75,326.75zM342.61,340.74c-7.72,0 -14,-6.28 -14,-14s6.28,-14 14,-14s14,6.28 14,14S350.33,340.74 342.61,340.74z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_phone.xml b/Android/app/src/main/res/drawable/ic_phone.xml
new file mode 100644
index 000000000..e6fa752ec
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_phone.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.5,0h-7C3.675,0 3,0.675 3,1.5v13C3,15.325 3.675,16 4.5,16h7c0.825,0 1.5,-0.675 1.5,-1.5v-13C13,0.675 12.325,0 11.5,0zM8,15c-0.553,0 -1,-0.447 -1,-1s0.447,-1 1,-1s1,0.447 1,1S8.553,15 8,15zM12,12H4V2h8V12z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_picture.xml b/Android/app/src/main/res/drawable/ic_picture.xml
new file mode 100644
index 000000000..1f89e40f8
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_picture.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M30,2.497h-28c-1.099,0 -2,0.901 -2,2v23.006c0,1.099 0.9,2 2,2h28c1.099,0 2,-0.901 2,-2v-23.006c0,-1.099 -0.901,-2 -2,-2zM30,27.503l-28,-0v-5.892l8.027,-7.779 8.275,8.265c0.341,0.414 0.948,0.361 1.379,0.035l3.652,-3.306 6.587,6.762c0.025,0.025 0.053,0.044 0.08,0.065v1.85zM30,22.806l-5.876,-6.013c-0.357,-0.352 -0.915,-0.387 -1.311,-0.086l-3.768,3.282 -8.28,-8.19c-0.177,-0.214 -0.432,-0.344 -0.709,-0.363 -0.275,-0.01 -0.547,0.08 -0.749,0.27l-7.309,7.112v-14.322h28v18.309zM23,12.504c1.102,0 1.995,-0.894 1.995,-1.995s-0.892,-1.995 -1.995,-1.995 -1.995,0.894 -1.995,1.995c0,1.101 0.892,1.995 1.995,1.995z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_play.xml b/Android/app/src/main/res/drawable/ic_play.xml
new file mode 100644
index 000000000..db7409544
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_play.xml
@@ -0,0 +1,6 @@
+<vector android:height="48dp" android:viewportHeight="28"
+    android:viewportWidth="28" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd"
+        android:pathData="M24.415,12.554L5.418,0.311C4.291,-0.296 3,-0.233 3,1.946L3,26.054C3,28.046 4.385,28.36 5.418,27.689L24.415,15.446C25.197,14.647 25.197,13.353 24.415,12.554"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_refresh.xml b/Android/app/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 000000000..3129ed09e
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,4 @@
+<vector android:height="48dp" android:viewportHeight="1024"
+    android:viewportWidth="1024" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M784.5,230.3v-50.6a32,32 0,1 1,64 0v149.1a32,32 0,0 1,-32 32H667.5a32,32 0,1 1,0 -64h93A320,320 0,1 0,524.8 833.2a320,320 0,0 0,320 -320h64a384,384 0,0 1,-384 384,384 384,0 0,1 -384,-384 384,384 0,0 1,643.7 -282.9z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_settings.xml b/Android/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 000000000..29d0f4cbc
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="30dp"
+    android:height="30dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,8.25C9.929,8.25 8.25,9.929 8.25,12C8.25,14.071 9.929,15.75 12,15.75C14.071,15.75 15.75,14.071 15.75,12C15.75,9.929 14.071,8.25 12,8.25ZM9.75,12C9.75,10.757 10.757,9.75 12,9.75C13.243,9.75 14.25,10.757 14.25,12C14.25,13.243 13.243,14.25 12,14.25C10.757,14.25 9.75,13.243 9.75,12Z"
+      android:fillColor="#1C274C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M11.975,1.25C11.53,1.25 11.159,1.25 10.855,1.271C10.538,1.292 10.238,1.339 9.948,1.459C9.274,1.738 8.738,2.274 8.459,2.948C8.314,3.298 8.275,3.668 8.26,4.07C8.248,4.393 8.085,4.663 7.844,4.801C7.603,4.94 7.288,4.947 7.003,4.796C6.647,4.608 6.307,4.457 5.931,4.407C5.208,4.312 4.476,4.508 3.898,4.952C3.648,5.144 3.458,5.38 3.281,5.643C3.111,5.897 2.925,6.218 2.703,6.603L2.678,6.647C2.455,7.032 2.27,7.353 2.136,7.627C1.996,7.913 1.886,8.195 1.845,8.507C1.75,9.23 1.946,9.961 2.39,10.54C2.621,10.841 2.922,11.06 3.262,11.274C3.536,11.446 3.688,11.722 3.688,12C3.688,12.278 3.536,12.554 3.262,12.726C2.922,12.94 2.621,13.159 2.39,13.46C1.946,14.038 1.75,14.77 1.845,15.493C1.886,15.804 1.996,16.087 2.136,16.373C2.27,16.647 2.455,16.968 2.678,17.353L2.703,17.397C2.925,17.782 3.111,18.103 3.281,18.357C3.458,18.62 3.648,18.856 3.898,19.048C4.476,19.492 5.208,19.688 5.931,19.593C6.307,19.543 6.647,19.392 7.003,19.204C7.288,19.053 7.603,19.06 7.844,19.199C8.085,19.337 8.248,19.607 8.26,19.93C8.275,20.332 8.314,20.702 8.459,21.052C8.738,21.726 9.274,22.262 9.948,22.541C10.238,22.661 10.538,22.708 10.855,22.729C11.159,22.75 11.53,22.75 11.975,22.75H12.025C12.47,22.75 12.841,22.75 13.145,22.729C13.462,22.708 13.762,22.661 14.052,22.541C14.726,22.262 15.262,21.726 15.541,21.052C15.686,20.702 15.725,20.332 15.74,19.93C15.752,19.607 15.915,19.337 16.156,19.198C16.397,19.06 16.712,19.053 16.997,19.204C17.353,19.392 17.693,19.543 18.069,19.592C18.792,19.688 19.524,19.492 20.102,19.048C20.352,18.856 20.542,18.62 20.719,18.357C20.889,18.103 21.075,17.782 21.297,17.397L21.322,17.353C21.545,16.968 21.73,16.647 21.864,16.373C22.004,16.087 22.114,15.804 22.155,15.493C22.25,14.77 22.054,14.038 21.61,13.46C21.379,13.159 21.078,12.94 20.738,12.726C20.464,12.554 20.312,12.278 20.312,12C20.312,11.722 20.464,11.446 20.738,11.274C21.078,11.06 21.379,10.841 21.61,10.54C22.054,9.961 22.25,9.23 22.155,8.507C22.114,8.195 22.004,7.913 21.865,7.627C21.73,7.353 21.545,7.032 21.322,6.647L21.297,6.603C21.075,6.218 20.889,5.897 20.719,5.643C20.542,5.38 20.352,5.144 20.102,4.952C19.524,4.508 18.792,4.312 18.069,4.407C17.693,4.457 17.353,4.608 16.997,4.796C16.712,4.947 16.397,4.94 16.156,4.801C15.915,4.663 15.752,4.393 15.74,4.07C15.725,3.668 15.686,3.298 15.541,2.948C15.262,2.274 14.726,1.738 14.052,1.459C13.762,1.339 13.462,1.292 13.145,1.271C12.841,1.25 12.47,1.25 12.025,1.25H11.975ZM10.522,2.845C10.599,2.813 10.716,2.784 10.957,2.767C11.204,2.75 11.524,2.75 12,2.75C12.476,2.75 12.796,2.75 13.043,2.767C13.284,2.784 13.401,2.813 13.478,2.845C13.785,2.972 14.028,3.215 14.155,3.522C14.195,3.618 14.228,3.769 14.241,4.126C14.271,4.918 14.68,5.681 15.406,6.1C16.132,6.52 16.997,6.492 17.698,6.122C18.014,5.955 18.161,5.908 18.265,5.895C18.594,5.851 18.926,5.94 19.189,6.142C19.255,6.193 19.34,6.28 19.474,6.48C19.612,6.686 19.773,6.963 20.011,7.375C20.249,7.787 20.408,8.064 20.517,8.287C20.624,8.504 20.657,8.62 20.667,8.703C20.711,9.032 20.622,9.364 20.42,9.627C20.356,9.71 20.242,9.814 19.94,10.004C19.268,10.426 18.812,11.162 18.812,12C18.812,12.838 19.268,13.574 19.94,13.996C20.242,14.186 20.356,14.29 20.42,14.373C20.622,14.636 20.711,14.968 20.667,15.297C20.656,15.38 20.623,15.496 20.517,15.713C20.408,15.936 20.249,16.212 20.011,16.625C19.772,17.037 19.612,17.314 19.474,17.52C19.339,17.72 19.255,17.807 19.189,17.858C18.926,18.059 18.594,18.149 18.265,18.105C18.161,18.092 18.014,18.045 17.698,17.878C16.997,17.507 16.132,17.48 15.406,17.899C14.68,18.319 14.271,19.082 14.241,19.874C14.228,20.231 14.195,20.382 14.155,20.478C14.028,20.785 13.785,21.028 13.478,21.155C13.401,21.187 13.284,21.216 13.043,21.233C12.796,21.25 12.476,21.25 12,21.25C11.524,21.25 11.204,21.25 10.957,21.233C10.716,21.216 10.599,21.187 10.522,21.155C10.215,21.028 9.972,20.785 9.845,20.478C9.805,20.382 9.772,20.231 9.759,19.874C9.729,19.082 9.32,18.319 8.594,17.899C7.868,17.48 7.003,17.508 6.302,17.878C5.986,18.045 5.839,18.092 5.735,18.105C5.406,18.149 5.074,18.059 4.811,17.858C4.745,17.807 4.66,17.72 4.526,17.52C4.388,17.314 4.227,17.037 3.989,16.625C3.751,16.213 3.592,15.936 3.483,15.713C3.376,15.496 3.343,15.38 3.332,15.297C3.289,14.968 3.378,14.636 3.58,14.373C3.644,14.29 3.758,14.186 4.06,13.996C4.732,13.574 5.188,12.838 5.188,12C5.188,11.162 4.732,10.426 4.06,10.004C3.758,9.814 3.644,9.71 3.58,9.627C3.378,9.364 3.289,9.031 3.333,8.703C3.343,8.62 3.377,8.504 3.483,8.287C3.592,8.064 3.751,7.787 3.989,7.375C4.227,6.963 4.388,6.686 4.526,6.48C4.661,6.28 4.745,6.193 4.811,6.142C5.074,5.94 5.406,5.851 5.735,5.895C5.839,5.908 5.986,5.955 6.302,6.122C7.003,6.492 7.868,6.52 8.594,6.1C9.32,5.681 9.729,4.918 9.759,4.126C9.772,3.769 9.805,3.618 9.845,3.522C9.972,3.215 10.215,2.972 10.522,2.845Z"
+      android:fillColor="#1C274C"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_sliders.xml b/Android/app/src/main/res/drawable/ic_sliders.xml
new file mode 100644
index 000000000..8089c8d0d
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_sliders.xml
@@ -0,0 +1,4 @@
+<vector android:height="48dp" android:viewportHeight="16"
+    android:viewportWidth="16" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M11.5,2a1.5,1.5 0,1 0,0 3,1.5 1.5,0 0,0 0,-3zM9.05,3a2.5,2.5 0,0 1,4.9 0L16,3v1h-2.05a2.5,2.5 0,0 1,-4.9 0L0,4L0,3h9.05zM4.5,7a1.5,1.5 0,1 0,0 3,1.5 1.5,0 0,0 0,-3zM2.05,8a2.5,2.5 0,0 1,4.9 0L16,8v1L6.95,9a2.5,2.5 0,0 1,-4.9 0L0,9L0,8h2.05zM11.5,12a1.5,1.5 0,1 0,0 3,1.5 1.5,0 0,0 0,-3zM9.05,13a2.5,2.5 0,0 1,4.9 0L16,13v1h-2.05a2.5,2.5 0,0 1,-4.9 0L0,14v-1h9.05z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_speaker.xml b/Android/app/src/main/res/drawable/ic_speaker.xml
new file mode 100644
index 000000000..659aeef79
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_speaker.xml
@@ -0,0 +1,9 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12.035,8.521C12.426,8.131 13.067,8.127 13.388,8.576C14.088,9.558 14.5,10.759 14.5,12.057C14.5,13.354 14.088,14.555 13.388,15.537C13.067,15.987 12.426,15.983 12.035,15.592C11.645,15.202 11.659,14.573 11.941,14.098C12.296,13.5 12.5,12.802 12.5,12.057C12.5,11.311 12.296,10.613 11.941,10.016C11.659,9.541 11.645,8.912 12.035,8.521Z"/>
+    <path android:fillColor="#000000" android:pathData="M14.864,5.693C15.255,5.303 15.892,5.3 16.242,5.727C17.653,7.451 18.5,9.655 18.5,12.057C18.5,14.459 17.653,16.663 16.242,18.387C15.892,18.815 15.255,18.812 14.864,18.421C14.473,18.031 14.479,17.401 14.818,16.965C15.872,15.61 16.5,13.907 16.5,12.057C16.5,10.208 15.872,8.504 14.818,7.149C14.479,6.714 14.473,6.084 14.864,5.693Z"/>
+    <path android:fillColor="#000000" android:pathData="M17.693,2.793C18.083,2.403 18.72,2.4 19.081,2.818C21.211,5.274 22.5,8.479 22.5,11.985C22.5,15.531 21.182,18.769 19.008,21.236C18.643,21.65 18.007,21.643 17.62,21.25C17.232,20.856 17.241,20.226 17.601,19.807C19.408,17.706 20.5,14.973 20.5,11.985C20.5,9.031 19.433,6.327 17.663,4.236C17.306,3.814 17.302,3.184 17.693,2.793Z"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M10,16.586V7.414C10,6.523 8.923,6.077 8.293,6.707L6.293,8.707C6.105,8.895 5.851,9 5.586,9H4C3.448,9 3,9.448 3,10V14C3,14.552 3.448,15 4,15H5.586C5.851,15 6.105,15.105 6.293,15.293L8.293,17.293C8.923,17.923 10,17.477 10,16.586Z"
+        android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="2"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_storage.xml b/Android/app/src/main/res/drawable/ic_storage.xml
new file mode 100644
index 000000000..eb4ede646
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_storage.xml
@@ -0,0 +1,6 @@
+<vector android:height="48dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M0,17.07V153.6h512V17.07H0zM110.93,110.93h-51.2v-51.2h51.2V110.93z"/>
+    <path android:fillColor="#000000" android:pathData="M0,324.27h512V187.73H0V324.27zM59.73,230.39h51.2v51.2h-51.2V230.39z"/>
+    <path android:fillColor="#000000" android:pathData="M0,494.93h512V358.4H0V494.93zM59.73,401.06h51.2v51.2h-51.2V401.06z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_undo.xml b/Android/app/src/main/res/drawable/ic_undo.xml
new file mode 100644
index 000000000..b767c53e7
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_undo.xml
@@ -0,0 +1,4 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#1C274C" android:fillType="evenOdd" android:pathData="M7.53,3.47C7.823,3.763 7.823,4.237 7.53,4.53L5.811,6.25H15C18.176,6.25 20.75,8.824 20.75,12C20.75,15.176 18.176,17.75 15,17.75H8C7.586,17.75 7.25,17.414 7.25,17C7.25,16.586 7.586,16.25 8,16.25H15C17.347,16.25 19.25,14.347 19.25,12C19.25,9.653 17.347,7.75 15,7.75H5.811L7.53,9.47C7.823,9.763 7.823,10.237 7.53,10.53C7.237,10.823 6.763,10.823 6.47,10.53L3.47,7.53C3.177,7.237 3.177,6.763 3.47,6.47L6.47,3.47C6.763,3.177 7.237,3.177 7.53,3.47Z"/>
+</vector>
diff --git a/Android/app/src/main/res/xml/setting_input.xml b/Android/app/src/main/res/xml/setting_input.xml
index 608d595a0..6611ab039 100644
--- a/Android/app/src/main/res/xml/setting_input.xml
+++ b/Android/app/src/main/res/xml/setting_input.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto" app:title="@string/preferences">
     <Preference
-        android:summary="@string/touch_screen_summary"
-        android:title="@string/touch_screen_title"
-        android:key="settings_touch_screen" 
-        android:icon="@drawable/ic_phone"
-        />
+        style="@style/Theme.Project64.PreferenceNoIcon"
+        app:title="@string/AudioPlugin"
+        app:key="logging_audio" />
+	<Preference
+		app:key="settings_touch_screen"
+		app:title="@string/touch_screen_title"
+		app:summary="@string/touch_screen_summary"
+		app:icon="@drawable/ic_phone"
+		/>
     <Preference
-        android:summary="@string/gamepad_summary"
-        android:title="@string/gamepad_title"
-        android:key="settings_gamepad_screen" 
-        android:icon="@drawable/ic_gamepad"
+        app:summary="@string/gamepad_summary"
+        app:title="@string/gamepad_title"
+        app:key="settings_gamepad_screen" 
+        app:icon="@drawable/ic_gamepad"
         />
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/Android/app/src/main/res/xml/settings.xml b/Android/app/src/main/res/xml/settings.xml
index 5fc319a71..4730a027d 100644
--- a/Android/app/src/main/res/xml/settings.xml
+++ b/Android/app/src/main/res/xml/settings.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:title="@string/preferences">
-
+<androidx.preference.PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto" app:title="@string/preferences">
     <PreferenceCategory app:title="@string/Hardware">
         <Preference
             app:key="settings_input"
@@ -34,7 +31,7 @@
             app:key="settings_advanced"
             app:title="@string/advanced_screen_title"
             app:summary="@string/advanced_screen_summary"
-            app:icon="@drawable/ic_debug"
+            app:icon="@drawable/ic_advanced"
             />
         <Preference
             app:key="settings_reset"