diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
index f10f134..9c071bd 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/SettingsFragment.kt
@@ -2,9 +2,7 @@ package im.angry.openeuicc.ui
 
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import android.widget.Toast
 import androidx.datastore.preferences.core.Preferences
 import androidx.lifecycle.lifecycleScope
@@ -40,28 +38,25 @@ class SettingsFragment: PreferenceFragmentCompat() {
             }.collect()
         }
 
-        findPreference<Preference>("pref_info_app_version")?.apply {
-            summary = requireContext().selfAppVersion
+        findPreference<Preference>("pref_info_app_version")
+            ?.apply {
+                summary = requireContext().selfAppVersion
 
-            // Enable developer options when this is clicked for 7 times
-            setOnPreferenceClickListener(::onAppVersionClicked)
-        }
-
-        findPreference<Preference>("pref_info_source_code")?.apply {
-            intent = Intent(Intent.ACTION_VIEW, Uri.parse(summary.toString()))
-        }
-
-        findPreference<Preference>("pref_language")?.apply {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) return@apply
-            isVisible = true
-            intent = Intent(Settings.ACTION_APP_LOCALE_SETTINGS).apply {
-                data = Uri.fromParts("package", requireContext().packageName, null)
+                // Enable developer options when this is clicked for 7 times
+                setOnPreferenceClickListener(this@SettingsFragment::onAppVersionClicked)
             }
-        }
 
-        findPreference<Preference>("pref_advanced_logs")?.apply {
-            intent = Intent(requireContext(), LogsActivity::class.java)
-        }
+        findPreference<Preference>("pref_info_source_code")
+            ?.setOnPreferenceClickListener {
+                startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(it.summary.toString())))
+                true
+            }
+
+        findPreference<Preference>("pref_advanced_logs")
+            ?.setOnPreferenceClickListener {
+                startActivity(Intent(requireContext(), LogsActivity::class.java))
+                true
+            }
 
         findPreference<CheckBoxPreference>("pref_notifications_download")
             ?.bindBooleanFlow(preferenceRepository.notificationDownloadFlow, PreferenceKeys.NOTIFICATION_DOWNLOAD)
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index 174b18c..73b1938 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -146,8 +146,6 @@
     <string name="pref_advanced_disable_safeguard_removable_esim_desc">By default, this app prevents you from disabling the active profile on a removable eSIM inserted in the device, because doing so may <i>sometimes</i> render it inaccessible.\nCheck this box to <i>remove</i> this safeguard.</string>
     <string name="pref_advanced_verbose_logging">Verbose Logging</string>
     <string name="pref_advanced_verbose_logging_desc">Enable verbose logs, which may contain sensitive information. Only share your logs with someone you trust after turning this on.</string>
-    <string name="pref_language">Language</string>
-    <string name="pref_language_desc">Select current language</string>
     <string name="pref_advanced_logs">Logs</string>
     <string name="pref_advanced_logs_desc">View recent debug logs of the application</string>
     <string name="pref_developer">Developer Options</string>
diff --git a/app-common/src/main/res/xml/locale_config.xml b/app-common/src/main/res/xml/locale_config.xml
deleted file mode 100644
index dd9d189..0000000
--- a/app-common/src/main/res/xml/locale_config.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en-US" />
-    <locale android:name="ja" />
-</locale-config>
\ No newline at end of file
diff --git a/app-common/src/main/res/xml/pref_settings.xml b/app-common/src/main/res/xml/pref_settings.xml
index 107e0b4..60646bc 100644
--- a/app-common/src/main/res/xml/pref_settings.xml
+++ b/app-common/src/main/res/xml/pref_settings.xml
@@ -36,13 +36,6 @@
             app:title="@string/pref_advanced_verbose_logging"
             app:summary="@string/pref_advanced_verbose_logging_desc" />
 
-        <Preference
-            app:iconSpaceReserved="false"
-            app:isPreferenceVisible="false"
-            app:key="pref_language"
-            app:summary="@string/pref_language_desc"
-            app:title="@string/pref_language" />
-
         <Preference
             app:key="pref_advanced_logs"
             app:iconSpaceReserved="false"
diff --git a/app-unpriv/src/main/AndroidManifest.xml b/app-unpriv/src/main/AndroidManifest.xml
index ce985cd..8760fb9 100644
--- a/app-unpriv/src/main/AndroidManifest.xml
+++ b/app-unpriv/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:name="im.angry.openeuicc.UnprivilegedOpenEuiccApplication"
@@ -9,9 +8,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:localeConfig="@xml/locale_config"
-        android:theme="@style/Theme.OpenEUICC"
-        tools:targetApi="tiramisu">
+        android:theme="@style/Theme.OpenEUICC">
 
         <activity
             android:name="im.angry.openeuicc.ui.UnprivilegedMainActivity"
@@ -28,14 +25,6 @@
             android:exported="false"
             android:label="@string/compatibility_check" />
 
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
     </application>
 
     <queries>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cae19d3..cd30620 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,8 +5,7 @@
     package="im.angry.openeuicc">
     <uses-feature
         android:name="android.hardware.telephony"
-        android:required="true"
-        tools:ignore="UnnecessaryRequiredFeature" />
+        android:required="true" />
 
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
@@ -20,9 +19,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:localeConfig="@xml/locale_config"
-        android:theme="@style/Theme.OpenEUICC"
-        tools:targetApi="tiramisu">
+        android:theme="@style/Theme.OpenEUICC">
         <activity
             android:name=".ui.PrivilegedMainActivity"
             android:exported="true">
@@ -52,15 +49,6 @@
                 <category android:name="android.service.euicc.category.EUICC_UI" />
             </intent-filter>
         </activity>
-
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
     </application>
 
 </manifest>
diff --git a/gradle.properties b/gradle.properties
index 239cc44..022338b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,5 +22,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
-android.suppressUnsupportedCompileSdk=35
+android.nonFinalResIds=false
\ No newline at end of file