diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0c433c77..6138791ce 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,9 +15,10 @@ if (ENABLE_QT)
     add_subdirectory(citra_qt)
 endif()
 if (ANDROID)
-    add_subdirectory(android/app)
+    add_subdirectory(android/app/src/main/cpp)
+else()
+    add_subdirectory(dedicated_room)
 endif()
 if (ENABLE_WEB_SERVICE)
     add_subdirectory(web_service)
 endif()
-add_subdirectory(dedicated_room)
diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle
index 8f84571a5..e57271517 100644
--- a/src/android/app/build.gradle
+++ b/src/android/app/build.gradle
@@ -70,6 +70,8 @@ android {
                         "-DANDROID_STL=c++_shared"
 
                 abiFilters "arm64-v8a"
+
+                targets "citra-android"
             }
         }
     }
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml
index d4ca5f63e..c1e38446a 100644
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@@ -15,12 +15,12 @@
 
     <application
         android:name="org.citra_emu.citra.CitraApplication"
-        android:label="Citra Emulator"
-        android:icon="@drawable/ic_citra"
+        android:label="Citra"
+        android:icon="@mipmap/ic_citra"
         android:allowBackup="true"
         android:supportsRtl="true"
         android:isGame="true"
-        android:banner="@drawable/ic_citra">
+        android:banner="@mipmap/ic_citra">
 
         <activity
             android:name=".ui.main.MainActivity"
diff --git a/src/android/app/CMakeLists.txt b/src/android/app/src/main/cpp/CMakeLists.txt
similarity index 71%
rename from src/android/app/CMakeLists.txt
rename to src/android/app/src/main/cpp/CMakeLists.txt
index 6626c6f76..674b9287c 100644
--- a/src/android/app/CMakeLists.txt
+++ b/src/android/app/src/main/cpp/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 
-add_library(citra-android STATIC
-            src/main/cpp/dummy.cpp
+add_library(citra-android SHARED
+            dummy.cpp
             )
 
 # find Android's log library
diff --git a/src/android/app/src/main/ic_citra-web.png b/src/android/app/src/main/ic_citra-web.png
new file mode 100644
index 000000000..129946a37
Binary files /dev/null and b/src/android/app/src/main/ic_citra-web.png differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_add.png b/src/android/app/src/main/res/drawable-hdpi/ic_add.png
deleted file mode 100644
index 4006b497c..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_add.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_citra.png b/src/android/app/src/main/res/drawable-hdpi/ic_citra.png
deleted file mode 100644
index f32b8ca45..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_citra.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-hdpi/ic_folder.png b/src/android/app/src/main/res/drawable-hdpi/ic_folder.png
deleted file mode 100644
index f7f540e22..000000000
Binary files a/src/android/app/src/main/res/drawable-hdpi/ic_folder.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_citra.png b/src/android/app/src/main/res/drawable-xhdpi/ic_citra.png
deleted file mode 100644
index 8a9e4cb2d..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/ic_citra.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xhdpi/ic_folder.png b/src/android/app/src/main/res/drawable-xhdpi/ic_folder.png
deleted file mode 100644
index 1dfae07fd..000000000
Binary files a/src/android/app/src/main/res/drawable-xhdpi/ic_folder.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_citra.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_citra.png
deleted file mode 100644
index 11a5dd384..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/ic_citra.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxhdpi/ic_folder.png b/src/android/app/src/main/res/drawable-xxhdpi/ic_folder.png
deleted file mode 100644
index 309864a2a..000000000
Binary files a/src/android/app/src/main/res/drawable-xxhdpi/ic_folder.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable-xxxhdpi/ic_folder.png b/src/android/app/src/main/res/drawable-xxxhdpi/ic_folder.png
deleted file mode 100644
index df3fb0451..000000000
Binary files a/src/android/app/src/main/res/drawable-xxxhdpi/ic_folder.png and /dev/null differ
diff --git a/src/android/app/src/main/res/drawable/ic_add.xml b/src/android/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 000000000..e3979cd7f
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_citra.xml b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_citra.xml
new file mode 100644
index 000000000..036d09bc5
--- /dev/null
+++ b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_citra.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/mipmap-anydpi-v26/ic_citra_round.xml b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_citra_round.xml
new file mode 100644
index 000000000..036d09bc5
--- /dev/null
+++ b/src/android/app/src/main/res/mipmap-anydpi-v26/ic_citra_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_citra.png b/src/android/app/src/main/res/mipmap-hdpi/ic_citra.png
new file mode 100644
index 000000000..23fb939e0
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-hdpi/ic_citra.png differ
diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_citra_round.png b/src/android/app/src/main/res/mipmap-hdpi/ic_citra_round.png
new file mode 100644
index 000000000..f1ff8f1e4
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-hdpi/ic_citra_round.png differ
diff --git a/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..6b23d66f1
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_citra.png b/src/android/app/src/main/res/mipmap-mdpi/ic_citra.png
new file mode 100644
index 000000000..1b50f37ff
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-mdpi/ic_citra.png differ
diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_citra_round.png b/src/android/app/src/main/res/mipmap-mdpi/ic_citra_round.png
new file mode 100644
index 000000000..c21c0cab2
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-mdpi/ic_citra_round.png differ
diff --git a/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..d577ec583
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_citra.png b/src/android/app/src/main/res/mipmap-xhdpi/ic_citra.png
new file mode 100644
index 000000000..a39b72567
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xhdpi/ic_citra.png differ
diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_citra_round.png b/src/android/app/src/main/res/mipmap-xhdpi/ic_citra_round.png
new file mode 100644
index 000000000..fc3faff81
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xhdpi/ic_citra_round.png differ
diff --git a/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..c2deb815c
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_citra.png b/src/android/app/src/main/res/mipmap-xxhdpi/ic_citra.png
new file mode 100644
index 000000000..8d4c19ba0
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxhdpi/ic_citra.png differ
diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_citra_round.png b/src/android/app/src/main/res/mipmap-xxhdpi/ic_citra_round.png
new file mode 100644
index 000000000..fac2dcfe6
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxhdpi/ic_citra_round.png differ
diff --git a/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..2e3b41ede
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra.png b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra.png
new file mode 100644
index 000000000..a8d3281af
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra.png differ
diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra_round.png b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra_round.png
new file mode 100644
index 000000000..09aa0ca98
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_citra_round.png differ
diff --git a/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..b2372bef7
Binary files /dev/null and b/src/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/src/android/app/src/main/res/values/ic_launcher_background.xml b/src/android/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 000000000..c5d5899fd
--- /dev/null
+++ b/src/android/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file