diff --git a/CHANGELOG b/CHANGELOG
index 1e58e6dd5..37c57d066 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ KeePassDX(3.5.0)
  * Hide clipboard sensitive text when copy entry field #1386
  * Fix attachment download button #1401
  * Add monochrome icon #1403 #1404 (Thx @Sandelinos)
+ * Fix lock with back button #1412 #1414 (Thx @ryg-git)
 
 KeePassDX(3.4.5)
  * Fix custom data in group (fix KeeShare) #1335
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 e20bcd8fe..b658afdcd 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -1368,7 +1368,6 @@ class GroupActivity : DatabaseLockActivity(),
                 EntrySelectionHelper.removeInfoFromIntent(intent)
                 if (PreferencesUtil.isLockDatabaseWhenBackButtonOnRootClicked(this)) {
                     lockAndExit()
-                    super.onRegularBackPressed()
                 } else {
                     backToTheAppCaller()
                 }
diff --git a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt
index 8c1a08e7f..256cce671 100644
--- a/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/hardware/HardwareKeyResponseHelper.kt
@@ -134,7 +134,7 @@ class HardwareKeyResponseHelper {
                         activity.getString(R.string.error_driver_required, hardwareKey.toString())
                     )
                     .setPositiveButton(R.string.download) { _, _ ->
-                        UriUtil.gotoUrl(activity, activity.getString(R.string.key_driver_url))
+                        UriUtil.openExternalApp(activity, activity.getString(R.string.key_driver_app_id))
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
                 builder.create().show()
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0fdd8a73c..6635456f4 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -145,7 +145,7 @@
     <string name="copy_field">Αντιγραφή του %1$s</string>
     <string name="menu_form_filling_settings">Γέμισμα Φόρμας</string>
     <string name="read_only">Προστασία εγγραφής</string>
-    <string name="encryption_explanation">Αλγόριθμος κρυπτογράφησης βάσης δεδομένων που χρησιμοποιείται για όλα τα δεδομένα.</string>
+    <string name="encryption_explanation">Αλγόριθμος κρυπτογράφησης βάσης δεδομένων που χρησιμοποιείται για όλα τα δεδομένα</string>
     <string name="kdf_explanation">Για να δημιουργηθεί το κλειδί για τον αλγόριθμο κρυπτογράφησης, το κύριο κλειδί μετασχηματίζεται χρησιμοποιώντας μια τυχαία εμπλουτισμένη συνάρτηση παραγωγής κλειδιού.</string>
     <string name="memory_usage">Χρήση μνήμης</string>
     <string name="memory_usage_explanation">Ποσότητα μνήμης που θα χρησιμοποιηθεί από τη συνάρτηση παραγωγής κλειδιού.</string>
@@ -607,7 +607,7 @@
     <string name="enable_keep_screen_on_summary">Κρατήστε την οθόνη ενεργή όταν παρακολουθείτε την καταχώρηση</string>
     <string name="enable_keep_screen_on_title">Διατηρήστε την οθόνη ενεργή</string>
     <string name="show_entry_colors_title">Χρώματα καταχώρησης</string>
-    <string name="show_entry_colors_summary">Εμφανίζει τα χρώματα του προσκηνίου και του φόντου σε μια καταχώρηση</string>
+    <string name="show_entry_colors_summary">Εμφανίζει τα χρώματα του προσκηνίου και του φόντου για μια καταχώρηση</string>
     <string name="searchable">Αναζητήσιμο</string>
     <string name="case_sensitive">Διάκριση πεζών-κεφαλαίων</string>
     <string name="menu_merge_from">Συγχώνευση από …</string>
@@ -667,4 +667,5 @@
     <string name="error_empty_key">Το κλειδί δεν μπορεί να είναι κενό.</string>
     <string name="corrupted_file">Κατεστραμμένο αρχείο.</string>
     <string name="html_about_privacy">&lt;strong&gt;Δεν ανακτώνται δεδομένα χρήστη&lt;/strong&gt;, αυτή η εφαρμογή δεν συνδέεται με κανένα διακομιστή, λειτουργεί μόνο τοπικά και σέβεται πλήρως το απόρρητο των χρηστών.</string>
+    <string name="auto_type">Αυτόματη-Πληκτρολόγηση</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bbe1dce9c..be2fe481b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -155,7 +155,7 @@
     <string name="protection">Ochrona</string>
     <string name="read_only">Chroniony przed zapisem</string>
     <string name="read_only_warning">KeePassDX potrzebuje uprawnień do zapisu, aby mógł modyfikować bazę danych.</string>
-    <string name="encryption_explanation">Algorytm szyfrowania bazy danych używany dla wszystkich danych.</string>
+    <string name="encryption_explanation">Algorytm szyfrowania bazy danych używany dla wszystkich danych</string>
     <string name="kdf_explanation">Aby wygenerować klucz dla algorytmu szyfrowania, klucz główny jest transformowany przy użyciu losowo solonej funkcji wyprowadzania klucza.</string>
     <string name="memory_usage">Użycie pamięci</string>
     <string name="memory_usage_explanation">Ilość pamięci do użycia przez funkcję wyprowadzania klucza.</string>
@@ -607,7 +607,7 @@
     <string name="enable_keep_screen_on_summary">Nie wyłączaj ekranu podczas oglądania wpisu</string>
     <string name="tags">Znaczniki</string>
     <string name="enable_keep_screen_on_title">Nie wyłączaj ekranu</string>
-    <string name="show_entry_colors_summary">Wyświetla kolory pierwszego planu i tła we wpisie</string>
+    <string name="show_entry_colors_summary">Wyświetla kolory pierwszego planu i tła wpisu</string>
     <string name="content_description_nav_header">Nagłówek nawigacyjny</string>
     <string name="navigation_drawer_open">Szuflada nawigacyjna otwarta</string>
     <string name="navigation_drawer_close">Szuflada nawigacyjna zamknięta</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 721d26fc2..04e27ac5d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -148,7 +148,7 @@
     <string name="error_autofill_enable_service">Служба автозаполнения не может быть включена.</string>
     <string name="copy_field">%1$s скопировано</string>
     <string name="menu_form_filling_settings">Заполнение форм</string>
-    <string name="encryption_explanation">Алгоритм шифрования всех данных базы.</string>
+    <string name="encryption_explanation">Алгоритм шифрования всех данных базы</string>
     <string name="kdf_explanation">При создании ключа для алгоритма шифрования, главный пароль преобразуется при помощи функции формирования ключа со случайной солью.</string>
     <string name="memory_usage">Использование памяти</string>
     <string name="memory_usage_explanation">Объём памяти, который будет использоваться функцией формирования ключа.</string>
@@ -667,4 +667,5 @@
     <string name="waiting_challenge_request">Ожидание запроса на вызов…</string>
     <string name="waiting_challenge_response">Ожидание ответа на вызов…</string>
     <string name="html_about_privacy">&lt;strong&gt;Никакие пользовательские данные не собираются&lt;/strong&gt;, это приложение не подключается ни к одному серверу, работает исключительно локально и полностью соблюдает конфиденциальность пользователей.</string>
+    <string name="auto_type">Автонабор</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f31ef007d..7d852c330 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -70,7 +70,7 @@
     <string name="error_can_not_handle_uri">Bu URI, KeePassDX\'te işlenemedi.</string>
     <string name="error_nokeyfile">Bir anahtar dosyası seçin.</string>
     <string name="error_out_of_memory">Tüm veri tabanınızı yükleyecek kadar bellek yok.</string>
-    <string name="error_load_database">Veri tabanınız yüklenemedi.</string>
+    <string name="error_load_database">Veri tabanı yüklenemedi.</string>
     <string name="error_load_database_KDF_memory">Anahtar yüklenemedi. KDF \"Bellek Kullanımı\" nı azaltmaya çalışın.</string>
     <string name="error_pass_gen_type">En az bir parola oluşturma türü seçilmelidir.</string>
     <string name="error_pass_match">Parolalar uyuşmuyor.</string>
@@ -137,7 +137,7 @@
     <string name="read_only_warning">Dosya yöneticinize bağlı olarak KeePassDX\'in depolama alanınıza yazmasına izin verilmeyebilir.</string>
     <string name="content_description_remove_from_list">Kaldır</string>
     <string name="root">Kök</string>
-    <string name="encryption_explanation">Tüm veriler için kullanılan veri tabanı şifreleme algoritması.</string>
+    <string name="encryption_explanation">Tüm veriler için kullanılan veri tabanı şifreleme algoritması</string>
     <string name="kdf_explanation">Şifreleme algoritmasının anahtarını üretmek için ana anahtar, rastgele anahtar türetme işlevi kullanılarak dönüştürülür.</string>
     <string name="rounds">Dönüşüm turları</string>
     <string name="rounds_explanation">Ek şifreleme turları, kaba kuvvet saldırılarına karşı daha yüksek koruma sağlar, ancak yükleme ve kaydetmeyi gerçekten yavaşlatabilir.</string>
@@ -601,7 +601,7 @@
     <string name="warning_keyfile_integrity">Android, verilerini anında değiştirebildiğinden dosyanın sağlama toplamı garanti edilmez. Doğru bütünlük için dosya uzantısını .bin olarak değiştirin.</string>
     <string name="enable_keep_screen_on_title">Ekranı açık tut</string>
     <string name="show_entry_colors_title">Girdi renkleri</string>
-    <string name="show_entry_colors_summary">Bir girdide ön plan ve arka plan renklerini görüntüler</string>
+    <string name="show_entry_colors_summary">Bir girdi için ön plan ve arka plan renklerini görüntüler</string>
     <string name="enable_keep_screen_on_summary">Girdiyi izlerken ekranı açık tutun</string>
     <string name="content_description_nav_header">Gezinme başlığı</string>
     <string name="navigation_drawer_open">Gezinme çekmecesi açık</string>
@@ -640,4 +640,27 @@
     <string name="word_separator">Ayırıcı</string>
     <string name="upper_case">BÜYÜK HARF</string>
     <string name="title_case">İlk Harfleri Büyük</string>
+    <string name="html_about_privacy"><strong>Hiçbir kullanıcı verisi alınmaz</strong>, bu uygulama herhangi bir sunucuya bağlanmaz, yalnızca yerel olarak çalışır ve kullanıcıların gizliliğine tamamen saygı duyar.</string>
+    <string name="error_empty_key">Anahtar boş olamaz.</string>
+    <string name="remember_hardware_key_title">Donanım anahtarlarını hatırla</string>
+    <string name="error_unable_merge_database_kdb">V1 veri tabanından birleştirme yapılamıyor.</string>
+    <string name="error_location_unknown">Veri tabanı konumu bilinmiyor, veri tabanı eylemi gerçekleştirilemiyor.</string>
+    <string name="error_hardware_key_unsupported">Donanım anahtarı desteklenmiyor.</string>
+    <string name="corrupted_file">Bozuk dosya.</string>
+    <string name="remember_hardware_key_summary">Kullanılan donanım anahtarlarının kaydını tutar</string>
+    <string name="content_description_hardware_key_checkbox">Donanım anahtarı onay kutusu</string>
+    <string name="waiting_challenge_request">Doğrulama isteği bekleniyor…</string>
+    <string name="waiting_challenge_response">Doğrulama yanıtı bekleniyor…</string>
+    <string name="hardware_key">Donanım anahtarı</string>
+    <string name="auto_type">Otomatik Yaz</string>
+    <string name="error_no_hardware_key">Bir donanım anahtarı seçin.</string>
+    <string name="error_XML_malformed">XML hatalı biçimlendirildi.</string>
+    <string name="error_challenge_already_requested">Doğrulama zaten istendi</string>
+    <string name="error_response_already_provided">Yanıt zaten verildi.</string>
+    <string name="error_no_response_from_challenge">Doğrulamadan yanıt alınamıyor.</string>
+    <string name="error_cancel_by_user">Kullanıcı tarafından iptal edildi.</string>
+    <string name="error_driver_required">%1$s için sürücü gerekli.</string>
+    <string name="enable_screenshot_mode_title">Ekran görüntüsü modu</string>
+    <string name="enable_screenshot_mode_summary">Üçüncü taraf uygulamaların uygulamanın ekran görüntülerini kaydetmesine veya almasına izin verin</string>
+    <string name="screenshot_mode_banner_text">Ekran görüntüsü modu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c14b47da2..3c1ef0b47 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -432,7 +432,7 @@
     <string name="parallelism_explanation">Ступінь паралелізму (тобто кількість потоків), необхідних для функції створення ключа.</string>
     <string name="parallelism">Паралельність</string>
     <string name="memory_usage">Використання пам\'яті</string>
-    <string name="encryption_explanation">Алгоритм шифрування бази даних, застосований для всіх даних.</string>
+    <string name="encryption_explanation">Алгоритм шифрування бази даних, застосований для всіх даних</string>
     <string name="autofill_block_restart">Перезапустіть застосунок, який містить форму, для застосування блокування.</string>
     <string name="autofill_block">Блокування автозаповнення</string>
     <string name="autofill_web_domain_blocklist_summary">Вебдомени для яких вимкнено автозаповнення</string>
@@ -666,4 +666,6 @@
     <string name="error_location_unknown">Розташування бази даних невідоме, дія бази даних не може бути виконана.</string>
     <string name="error_empty_key">Ключ не може бути порожнім.</string>
     <string name="corrupted_file">Пошкоджений файл.</string>
+    <string name="html_about_privacy"><strong>Жодні користувацькі дані не збираються</strong>, цей застосунок не з\'єднується з жодним сервером, він працює лише локально та повністю поважає приватність користувачів.</string>
+    <string name="auto_type">Автовведення</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1868d2b2d..121d426e1 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -156,7 +156,7 @@
     <string name="read_only_warning">根据您的文件管理器，KeePassDX 可能不允许在您的存储中写入数据。</string>
     <string name="show_recent_files_title">显示最近打开的文件</string>
     <string name="show_recent_files_summary">显示最近打开数据库的位置</string>
-    <string name="encryption_explanation">加密数据库所有数据时采用的算法。</string>
+    <string name="encryption_explanation">用于所有数据的数据库加密算法</string>
     <string name="kdf_explanation">将迭代主密钥以生成加密数据库所需的密钥，转换方式为随机加盐算法。</string>
     <string name="memory_usage">内存使用量</string>
     <string name="memory_usage_explanation">密钥推导算法使用的内存。</string>
@@ -667,4 +667,5 @@
     <string name="enable_screenshot_mode_title">截屏模式</string>
     <string name="enable_screenshot_mode_summary">允许第三方应用对 KeePassDX 屏幕进行录制或截图</string>
     <string name="screenshot_mode_banner_text">截屏模式</string>
+    <string name="html_about_privacy"><strong>不获取用户数据</strong>，此应用不连接任何服务器，仅在本地运行，并充分尊重用户的隐私。</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 0158be051..92cab1627 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -32,7 +32,7 @@
 
     <string name="play_store_url" translatable="false">https://play.google.com/store/apps/details?id=%1$s</string>
     <string name="keepro_app_id" translatable="false">com.kunzisoft.keepass.pro</string>
-    <string name="key_driver_url" translatable="false">https://gitlab.com/kunzisoft/android-hardware-key-driver#user-content-download</string>
+    <string name="key_driver_app_id" translatable="false">com.kunzisoft.hardware.key</string>
     <string name="contribution_url" translatable="false">https://www.keepassdx.com/#donation</string>
     <string name="homepage_url" translatable="false">https://www.keepassdx.com</string>
     <string name="external_icon_url" translatable="false">https://www.keepassdx.com/#icons</string>
diff --git a/fastlane/metadata/android/en-US/changelogs/116.txt b/fastlane/metadata/android/en-US/changelogs/116.txt
index a584604c8..40aedac28 100644
--- a/fastlane/metadata/android/en-US/changelogs/116.txt
+++ b/fastlane/metadata/android/en-US/changelogs/116.txt
@@ -1,6 +1,7 @@
  * Support YubiKey challenge-response #8 #137
  * Better exception management during database save #1346
- * Better management of mime-types and extensions #1211
  * Add "Screenshot mode" setting #459 #1377 #1354 (Thx @GianpaMX)
  * Hide clipboard sensitive text when copy entry field #1386
  * Fix attachment download button #1401
+ * Add monochrome icon #1403 #1404 (Thx @Sandelinos)
+ * Fix lock with back button #1412 #1414 (Thx @ryg-git)
diff --git a/fastlane/metadata/android/fr-FR/changelogs/115.txt b/fastlane/metadata/android/fr-FR/changelogs/116.txt
similarity index 54%
rename from fastlane/metadata/android/fr-FR/changelogs/115.txt
rename to fastlane/metadata/android/fr-FR/changelogs/116.txt
index 6c37c15d8..b1943184d 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/115.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/116.txt
@@ -1,5 +1,7 @@
  * Support du YubiKey challenge-response #8 #137
  * Meilleure gestion des exceptions durant une sauvegarde de base de données #1346
- * Meilleure gestion des mime-types et extensions #1211
  * Ajout du "Mode Capture d'Ecran" dans les paramètres #459 #1377 #1354 (Thx @GianpaMX)
- * Masquage du texte sensible dans le presse-papiers lors de la copie du champ de saisie #1386
\ No newline at end of file
+ * Masquage du texte sensible dans le presse-papiers lors de la copie du champ de saisie #1386
+ * Correction du bouton de téléchargement des pièces jointes #1401
+ * Ajout de l'icone monochrome #1403 #1404 (Thx @Sandelinos)
+ * Correction du verrouillage avec le bouton arrière #1412 #1414 (Thx @ryg-git)
\ No newline at end of file