diff --git a/.github/workflows/Android.yml b/.github/workflows/Android.yml
index 5961466..67bd21c 100644
--- a/.github/workflows/Android.yml
+++ b/.github/workflows/Android.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   build-android:
-    name: Build Android APK (ARM64)
+    name: Build Android APK (Universal)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -23,14 +23,18 @@ jobs:
 
       - name: Prepare jniLibs
         run: |
-          mkdir -p gui/android/app/src/main/jniLibs/arm64-v8a
-          for f in bins/android/arm64-v8a/*; do
-            if [ -f "$f" ]; then
-              b=$(basename "$f")
-              cp "$f" "gui/android/app/src/main/jniLibs/arm64-v8a/lib${b}.so"
+          for abi in arm64-v8a x86_64; do
+            mkdir -p "gui/android/app/src/main/jniLibs/$abi"
+            if [ -d "bins/android/$abi" ]; then
+              for f in "bins/android/$abi"/*; do
+                if [ -f "$f" ]; then
+                  b=$(basename "$f")
+                  cp "$f" "gui/android/app/src/main/jniLibs/$abi/lib${b}.so"
+                fi
+              done
+              chmod +x gui/android/app/src/main/jniLibs/$abi/* 2>/dev/null || true
             fi
           done
-          chmod +x gui/android/app/src/main/jniLibs/arm64-v8a/*
 
       - name: Set up Java 17
         uses: actions/setup-java@v4
@@ -47,10 +51,10 @@ jobs:
         run: |
           cd gui
           flutter pub get
-          flutter build apk --release --target-platform android-arm64
+          flutter build apk --release
 
       - name: Upload APK artifact
         uses: actions/upload-artifact@v4
         with:
-          name: OpenROM-Android-arm64
+          name: OpenROM-Android-Universal
           path: gui/build/app/outputs/flutter-apk/app-release.apk
diff --git a/gui/android/app/build.gradle.kts b/gui/android/app/build.gradle.kts
index 6dd4023..e2961fd 100644
--- a/gui/android/app/build.gradle.kts
+++ b/gui/android/app/build.gradle.kts
@@ -26,7 +26,7 @@ android {
         versionCode = flutter.versionCode
         versionName = flutter.versionName
         ndk {
-            abiFilters.add("arm64-v8a")
+            abiFilters.addAll(listOf("arm64-v8a", "x86_64"))
         }
     }
 
diff --git a/gui/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/gui/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..e15ed7d
Binary files /dev/null and b/gui/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/gui/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/gui/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..5358fef
Binary files /dev/null and b/gui/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/gui/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/gui/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..424f122
Binary files /dev/null and b/gui/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/gui/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/gui/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..0d61ae0
Binary files /dev/null and b/gui/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/gui/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/gui/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..90e1797
Binary files /dev/null and b/gui/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/gui/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/gui/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..c79c58a
--- /dev/null
+++ b/gui/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,9 @@
+<?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>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
+</adaptive-icon>
diff --git a/gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4..8644a8b 100644
Binary files a/gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/gui/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b7..c17486b 100644
Binary files a/gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/gui/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/gui/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391..358b02a 100644
Binary files a/gui/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/gui/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d..e06e805 100644
Binary files a/gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/gui/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372e..a90b19e 100644
Binary files a/gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/gui/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/gui/android/app/src/main/res/values/colors.xml b/gui/android/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..bca0754
--- /dev/null
+++ b/gui/android/app/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#090910</color>
+</resources>
\ No newline at end of file
diff --git a/gui/pubspec.lock b/gui/pubspec.lock
index 8c1f559..ce6ead6 100644
--- a/gui/pubspec.lock
+++ b/gui/pubspec.lock
@@ -41,6 +41,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
@@ -126,6 +142,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -181,6 +205,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
   intl:
     dependency: "direct main"
     description:
diff --git a/gui/pubspec.yaml b/gui/pubspec.yaml
index 02e8ad6..9bdb899 100644
--- a/gui/pubspec.yaml
+++ b/gui/pubspec.yaml
@@ -29,9 +29,17 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^6.0.0
   cross_file: ^0.3.5
+  flutter_launcher_icons: ^0.14.4
 
 flutter:
   uses-material-design: true
   generate: true
   assets:
     - themes/
+
+flutter_launcher_icons:
+  android: "ic_launcher"
+  ios: false
+  image_path: "../assets/icons/icon.png"
+  adaptive_icon_background: "#090910"
+  adaptive_icon_foreground: "../assets/icons/icon.png"