diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index da2ce6d..7c78b21 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdk = 26
         targetSdk = 33
-        versionCode = 3
-        versionName = "1.3"
+        versionCode = 5
+        versionName = "1.5"
         applicationId = android.namespace
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -43,17 +43,15 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
 
     implementation("com.google.guava:guava:31.1-jre")
-    implementation("com.google.protobuf:protobuf-java:3.21.2")
-    implementation("com.android.tools.build:apksig:7.4.2")
-    implementation("com.android.tools.build:bundletool:1.14.0")
+    implementation("com.google.protobuf:protobuf-java:3.23.0")
+    implementation("com.android.tools.build:apksig:8.0.1")
+    implementation("com.android.tools.build:bundletool:1.15.0")
     implementation("org.bouncycastle:bcprov-jdk15on:1.70")
 
     testImplementation("junit:junit:4.13.2")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c1220a..5cdb760 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,13 +6,11 @@
         android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MyApplication">
         <activity
             android:name=".activity.MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.MyApplication">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/shapun/apkaabconverter/fragment/AABToApkDialogFragment.kt b/app/src/main/java/com/shapun/apkaabconverter/fragment/AABToApkDialogFragment.kt
index 53e745f..3a28c57 100644
--- a/app/src/main/java/com/shapun/apkaabconverter/fragment/AABToApkDialogFragment.kt
+++ b/app/src/main/java/com/shapun/apkaabconverter/fragment/AABToApkDialogFragment.kt
@@ -33,7 +33,7 @@ class AABToApkDialogFragment : BaseDialogFragment<DialogAabToApkBinding>() {
     private var mApkUri: Uri? = null
     private var mLogger: Logger? = null
     private val mResultLauncherSelectApkPath = registerForActivityResult(
-        CreateDocument("*/*")
+        CreateDocument("application/octet-stream")
     ) {
         if (it != null) {
             val contentResolver = requireContext().contentResolver
diff --git a/app/src/main/java/com/shapun/apkaabconverter/fragment/ApkToAABDialogFragment.kt b/app/src/main/java/com/shapun/apkaabconverter/fragment/ApkToAABDialogFragment.kt
index fee381b..25751e1 100644
--- a/app/src/main/java/com/shapun/apkaabconverter/fragment/ApkToAABDialogFragment.kt
+++ b/app/src/main/java/com/shapun/apkaabconverter/fragment/ApkToAABDialogFragment.kt
@@ -79,7 +79,8 @@ class ApkToAABDialogFragment : BaseDialogFragment<DialogApkToAabBinding>() {
         "**.[wW][mM][aA]",
         "**.[wW][mM][vV]",
         "**.[xX][mM][fF]"
-    )
+    ).shuffled()
+
     private val mResultLauncherSelectApk = registerForActivityResult(
         ActivityResultContracts.GetContent()
     ) {
@@ -94,7 +95,7 @@ class ApkToAABDialogFragment : BaseDialogFragment<DialogApkToAabBinding>() {
         }
     }
     private val mResultLauncherSelectAABPath =
-        registerForActivityResult(CreateDocument("*/*")) {
+        registerForActivityResult(CreateDocument("application/octet-stream")) {
             if (it != null) {
                 val name: String = Utils.queryName(contentResolver, it)
                 if (name.endsWith(".aab")) {
diff --git a/app/src/main/jniLibs/arm64-v8a/libaapt2.so b/app/src/main/jniLibs/arm64-v8a/libaapt2.so
index da36d9a..8e07220 100644
Binary files a/app/src/main/jniLibs/arm64-v8a/libaapt2.so and b/app/src/main/jniLibs/arm64-v8a/libaapt2.so differ
diff --git a/app/src/main/jniLibs/armeabi-v7a/libaapt2.so b/app/src/main/jniLibs/armeabi-v7a/libaapt2.so
index 334edac..d7b6e6b 100644
Binary files a/app/src/main/jniLibs/armeabi-v7a/libaapt2.so and b/app/src/main/jniLibs/armeabi-v7a/libaapt2.so differ
diff --git a/app/src/main/jniLibs/x86/libaapt2.so b/app/src/main/jniLibs/x86/libaapt2.so
index 3d46603..d727965 100644
Binary files a/app/src/main/jniLibs/x86/libaapt2.so and b/app/src/main/jniLibs/x86/libaapt2.so differ
diff --git a/app/src/main/jniLibs/x86_64/libaapt2.so b/app/src/main/jniLibs/x86_64/libaapt2.so
index 85fac9b..7088850 100644
Binary files a/app/src/main/jniLibs/x86_64/libaapt2.so and b/app/src/main/jniLibs/x86_64/libaapt2.so differ
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 19075ab..aebc4a6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
 	android:gravity="center"
-    tools:context=".MainActivity" >
+    tools:context=".activity.MainActivity" >
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_aab_to_apk"
diff --git a/app/src/main/res/layout/dialog_apk_to_aab.xml b/app/src/main/res/layout/dialog_apk_to_aab.xml
index 98a413d..7934923 100644
--- a/app/src/main/res/layout/dialog_apk_to_aab.xml
+++ b/app/src/main/res/layout/dialog_apk_to_aab.xml
@@ -58,7 +58,7 @@
            android:id="@+id/cb_default_gradle_config"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           android:text="Use default AGP config (partially implemented)"
+           android:text="Use default AGP config"
            android:checked="true"
            tools:ignore="HardcodedText" />
         <TextView
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap/ic_launcher.png b/app/src/main/res/mipmap/ic_launcher.png
new file mode 100644
index 0000000..2083aff
Binary files /dev/null and b/app/src/main/res/mipmap/ic_launcher.png differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index eae493d..e3d668b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Aug 05 11:35:36 UTC 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 785ed3e..e218399 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,9 +7,9 @@ pluginManagement {
         gradlePluginPortal()
     }
     plugins {
-        kotlin("android") version "1.8.0" apply false
-        id("com.android.application") version "7.4.0" apply false
-        id("com.android.library") version "7.4.0" apply false
+        kotlin("android") version "1.8.20" apply false
+        id("com.android.application") version "8.0.1" apply false
+        id("com.android.library") version "8.0.1" apply false
     }
 }
 dependencyResolutionManagement {