diff --git a/app/build.gradle b/app/build.gradle
index e1b8de21f..bf7a4adf9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-kapt'
 
 android {
     namespace 'com.kunzisoft.keepass'
-    compileSdkVersion 34
+    compileSdkVersion 36
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode = 139
         versionName = "4.1.7"
         multiDexEnabled true
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
index a2a7250c5..c07cc8c4a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.kt
@@ -57,7 +57,7 @@ class AboutActivity : StylishActivity() {
         var version: String
         var build: String
         try {
-            version = packageManager.getPackageInfoCompat(packageName).versionName
+            version = packageManager.getPackageInfoCompat(packageName).versionName ?: ""
             build = BuildConfig.BUILD_VERSION
         } catch (e: NameNotFoundException) {
             Log.w(javaClass.simpleName, "Unable to get the app or the build version", e)
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index eb6726cd8..6e2e063f5 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -1457,7 +1457,8 @@ class GroupActivity : DatabaseLockActivity(),
                     }
                     else -> {
                         // Load the previous group
-                        loadMainGroup(mPreviousGroupsIds.removeLast())
+                        loadMainGroup(mPreviousGroupsIds
+                            .removeAt(mPreviousGroupsIds.lastIndex))
                     }
                 }
             }
diff --git a/app/src/main/java/com/kunzisoft/keepass/services/NotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/services/NotificationService.kt
index f116eaf60..4d7fae28c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/services/NotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/NotificationService.kt
@@ -12,6 +12,7 @@ import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_NONE
 import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE
 import android.os.Build
 import android.os.IBinder
+import android.util.Log
 import android.util.TypedValue
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
@@ -156,11 +157,21 @@ abstract class NotificationService : Service() {
         mReset = true
     }
 
-    override fun onDestroy() {
+    override fun onTimeout(startId: Int, fgsType: Int) {
+        super.onTimeout(startId, fgsType)
+        Log.e(javaClass::class.simpleName, "The service took too long to execute")
+        cancelNotification()
+        stopSelf()
+    }
+
+    protected fun cancelNotification() {
         mTimerJob?.cancel()
         mTimerJob = null
         notificationManager?.cancel(notificationId)
+    }
 
+    override fun onDestroy() {
+        cancelNotification()
         super.onDestroy()
     }
 
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index d956bfc9d..b0211987e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -19,10 +19,11 @@
 -->
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <include
diff --git a/app/src/main/res/layout/activity_file_selection.xml b/app/src/main/res/layout/activity_file_selection.xml
index cc5a458fe..89f800d8e 100644
--- a/app/src/main/res/layout/activity_file_selection.xml
+++ b/app/src/main/res/layout/activity_file_selection.xml
@@ -21,6 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
diff --git a/app/src/main/res/layout/activity_icon_picker.xml b/app/src/main/res/layout/activity_icon_picker.xml
index aa1578622..aba1312e2 100644
--- a/app/src/main/res/layout/activity_icon_picker.xml
+++ b/app/src/main/res/layout/activity_icon_picker.xml
@@ -19,11 +19,12 @@
 -->
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:id="@+id/icon_picker_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:filterTouchesWhenObscured="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:filterTouchesWhenObscured="true">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/icon_picker_coordinator"
diff --git a/app/src/main/res/layout/activity_key_generator.xml b/app/src/main/res/layout/activity_key_generator.xml
index b2771230e..3d9abc222 100644
--- a/app/src/main/res/layout/activity_key_generator.xml
+++ b/app/src/main/res/layout/activity_key_generator.xml
@@ -19,11 +19,12 @@
 -->
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:id="@+id/key_generator_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:filterTouchesWhenObscured="true"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:filterTouchesWhenObscured="true">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/key_generator_coordinator"
diff --git a/app/src/main/res/layout/activity_main_credential.xml b/app/src/main/res/layout/activity_main_credential.xml
index 0505bd770..cc3ce69ce 100644
--- a/app/src/main/res/layout/activity_main_credential.xml
+++ b/app/src/main/res/layout/activity_main_credential.xml
@@ -21,6 +21,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml
index 602f0b813..561cafb50 100644
--- a/app/src/main/res/layout/activity_toolbar.xml
+++ b/app/src/main/res/layout/activity_toolbar.xml
@@ -19,6 +19,7 @@
 -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:filterTouchesWhenObscured="true"
diff --git a/app/src/main/res/layout/keyboard_container.xml b/app/src/main/res/layout/keyboard_container.xml
index 38461bc3c..abbfdca46 100644
--- a/app/src/main/res/layout/keyboard_container.xml
+++ b/app/src/main/res/layout/keyboard_container.xml
@@ -17,10 +17,12 @@
   You should have received a copy of the GNU General Public License
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fitsSystemWindows="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_alignParentBottom="true"
     android:paddingTop="4dp"
     android:paddingBottom="8dp"
diff --git a/app/src/main/res/xml/dataset_service.xml b/app/src/main/res/xml/dataset_service.xml
index 870cf884a..94b60987b 100644
--- a/app/src/main/res/xml/dataset_service.xml
+++ b/app/src/main/res/xml/dataset_service.xml
@@ -28,269 +28,275 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
     tools:ignore="UnusedAttribute">
     <compatibility-package
         android:name="alook.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="alook.browser.google"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="app.vanadium.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.amazon.cloud9"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.android.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.android.chrome"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="711900039" />
     <compatibility-package
         android:name="com.android.htmlviewer"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.avast.android.secure.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.avg.android.secure.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.brave.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="427912623" />
     <compatibility-package
         android:name="com.brave.browser_beta"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.brave.browser_default"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.brave.browser_dev"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.brave.browser_nightly"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.chrome.beta"
-        android:maxLongVersionCode="10000000000"/>
-    <compatibility-package
-        android:name="com.chrome.canary"
-        android:maxLongVersionCode="10000000000"/>
-    <compatibility-package
-        android:name="com.chrome.dev"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="711900039" />
     <compatibility-package
         android:name="com.cookiegames.smartcookie"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.cookiejarapps.android.smartcookieweb"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.ecosia.android"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.google.android.apps.chrome"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.google.android.apps.chrome_dev"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.google.android.captiveportallogin"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.iode.firefox"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.jamal2367.styx"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.kiwibrowser.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.kiwibrowser.browser.dev"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
+    <compatibility-package
+        android:name="com.ktllq.play"
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.lemurbrowser.exts"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.microsoft.emmx"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.microsoft.emmx.beta"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.microsoft.emmx.canary"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.microsoft.emmx.dev"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.mmbox.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.mmbox.xbrowser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.mycompany.app.soulbrowser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.naver.whale"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.neeva.app"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.opera.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.opera.browser.beta"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.opera.gx"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.opera.mini.native"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.opera.mini.native.beta"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.opera.touch"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.qflair.browserq"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.qwant.liberty"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.rainsee.create"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.sec.android.app.sbrowser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.sec.android.app.sbrowser.beta"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.stoutner.privacybrowser.free"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.stoutner.privacybrowser.standard"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.vivaldi.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.vivaldi.browser.snapshot"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.vivaldi.browser.sopranos"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.yandex.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
+    <compatibility-package
+        android:name="com.yjllq.chrome.beta"
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.yjllq.internet"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.yjllq.kito"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
+    <compatibility-package
+        android:name="com.yjllqint.kito"
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.yujian.ResideMenuDemo"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.z28j.feel"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="idm.internet.download.manager"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="idm.internet.download.manager.adm.lite"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="idm.internet.download.manager.plus"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="io.github.forkmaintainers.iceraven"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="mark.via"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="mark.via.gp"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="net.dezor.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="net.slions.fulguris.full.download"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="net.slions.fulguris.full.download.debug"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="net.slions.fulguris.full.playstore"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="net.slions.fulguris.full.playstore.debug"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.adblockplus.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.adblockplus.browser.beta"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.bromite.bromite"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.bromite.chromium"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.chromium.chrome"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.codeaurora.swe.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
+    <compatibility-package
+        android:name="org.cromite.cromite"
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.gnu.icecat"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
+    <compatibility-package
+        android:name="org.ironfoxoss.ironfox"
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.fenix"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.fenix.nightly"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.fennec_aurora"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.fennec_fdroid"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.firefox"
-        android:maxLongVersionCode="2015836711"/>
+        android:maxLongVersionCode="2015836711" />
     <compatibility-package
         android:name="org.mozilla.firefox_beta"
-        android:maxLongVersionCode="2015849447"/>
+        android:maxLongVersionCode="2015849447" />
     <compatibility-package
         android:name="org.mozilla.reference.browser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.rocket"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.torproject.torbrowser"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.torproject.torbrowser_alpha"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.ungoogled.chromium.extensions.stable"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.ungoogled.chromium.stable"
-        android:maxLongVersionCode="10000000000"/>
-    <compatibility-package
-        android:name="us.spotco.fennec_dos"
-        android:maxLongVersionCode="10000000000"/>
+        android:maxLongVersionCode="10000000000" />
 </autofill-service>
diff --git a/crypto/build.gradle b/crypto/build.gradle
index 16874fa45..e299deaab 100644
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.kunzisoft.encrypt'
-    compileSdkVersion 34
+    compileSdkVersion 36
     ndkVersion "21.4.7075529"
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/database/build.gradle b/database/build.gradle
index b162fa086..f2063e666 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-parcelize'
 
 android {
     namespace 'com.kunzisoft.keepass.database'
-    compileSdkVersion 34
+    compileSdkVersion 36
 
     defaultConfig {
         minSdkVersion 19
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/icon-pack/build.gradle b/icon-pack/build.gradle
index 83b7fa8ec..fe486ae76 100644
--- a/icon-pack/build.gradle
+++ b/icon-pack/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace 'com.kunzisoft.keepass.icon'
-    compileSdkVersion 34
+    compileSdkVersion 36
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
     }
 
     compileOptions {
diff --git a/icon-pack/classic/build.gradle b/icon-pack/classic/build.gradle
index 6fcd807bc..f5a2baaad 100644
--- a/icon-pack/classic/build.gradle
+++ b/icon-pack/classic/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'com.kunzisoft.keepass.icon.classic'
-    compileSdkVersion 34
+    compileSdkVersion 36
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
     }
 
     resourcePrefix 'classic_'
diff --git a/icon-pack/material/build.gradle b/icon-pack/material/build.gradle
index b17b7ebee..bfb426dfe 100644
--- a/icon-pack/material/build.gradle
+++ b/icon-pack/material/build.gradle
@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
 
 android {
     namespace 'com.kunzisoft.keepass.icon.material'
-    compileSdkVersion 34
+    compileSdkVersion 36
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 35
     }
 
     resourcePrefix 'material_'