diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bd067c9468..4ffc0bd04f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,13 +17,13 @@ shortcutHelper.setFilePath("./shortcuts.xml")
 val SUPPORTED_ABIS = setOf("armeabi-v7a", "arm64-v8a", "x86")
 
 android {
-    compileSdk = AndroidConfig.compileSdk
-    ndkVersion = AndroidConfig.ndk
+    compileSdkPreview = "Tiramisu"
+    ndkVersion = "22.1.7171670"
 
     defaultConfig {
         applicationId = "eu.kanade.tachiyomi"
-        minSdk = AndroidConfig.minSdk
-        targetSdk = AndroidConfig.targetSdk
+        minSdk = 23
+        targetSdk = 29
         versionCode = 76
         versionName = "0.13.1"
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 3687108723..aa780281c5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.ui.setting
 import android.content.Intent
 import android.os.Build
 import android.provider.Settings
+import androidx.core.net.toUri
 import androidx.preference.PreferenceScreen
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.preference.bindTo
@@ -54,5 +55,17 @@ class SettingsGeneralController : SettingsController() {
                 }
             }
         }
+        if (Build.VERSION.CODENAME == "Tiramisu") {
+            preference {
+                key = "pref_manage_language"
+                titleRes = R.string.pref_app_language
+                onClick {
+                    val intent = Intent(Settings.ACTION_APP_LOCALE_SETTINGS).apply {
+                        data = "package:${context.packageName}".toUri()
+                    }
+                    startActivity(intent)
+                }
+            }
+        }
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 608ad5cf14..df28e93d39 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -178,6 +178,7 @@
     <string name="pref_start_screen">Start screen</string>
     <string name="pref_confirm_exit">Confirm exit</string>
     <string name="pref_manage_notifications">Manage notifications</string>
+    <string name="pref_app_language">App language</string>
 
     <string name="pref_category_security">Security</string>
     <string name="lock_with_biometrics">Require unlock</string>
diff --git a/buildSrc/src/main/kotlin/AndroidConfig.kt b/buildSrc/src/main/kotlin/AndroidConfig.kt
deleted file mode 100644
index 19fce6f441..0000000000
--- a/buildSrc/src/main/kotlin/AndroidConfig.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-object AndroidConfig {
-    const val compileSdk = 31
-    const val minSdk = 23
-    const val targetSdk = 29
-    const val ndk = "22.1.7171670"
-}