diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedViewManager.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedViewManager.kt
index ada2cd004..d1274da9c 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedViewManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedViewManager.kt
@@ -144,29 +144,25 @@ class AdvancedUnlockedViewManager(var context: FragmentActivity,
     private fun initNotAvailable() {
         showFingerPrintViews(false)
 
-        advancedUnlockInfoView?.stopIconViewAnimation()
         advancedUnlockInfoView?.setIconViewClickListener(null)
     }
 
     private fun initPause() {
         showFingerPrintViews(true)
 
-        advancedUnlockInfoView?.stopIconViewAnimation()
         advancedUnlockInfoView?.setIconViewClickListener(null)
     }
 
     private fun initNotConfigured() {
         showFingerPrintViews(true)
         setAdvancedUnlockedView(R.string.configure_biometric)
-        advancedUnlockInfoView?.stopIconViewAnimation()
 
         advancedUnlockInfoView?.setIconViewClickListener(null)
     }
 
     private fun initWaitData() {
         showFingerPrintViews(true)
-        setAdvancedUnlockedView(R.string.no_password_stored)
-        advancedUnlockInfoView?.startIconViewAnimation()
+        setAdvancedUnlockedView(R.string.no_credentials_stored)
 
         advancedUnlockInfoView?.setIconViewClickListener(null)
     }
@@ -174,7 +170,6 @@ class AdvancedUnlockedViewManager(var context: FragmentActivity,
     private fun initEncryptData() {
         showFingerPrintViews(true)
         setAdvancedUnlockedView(R.string.open_biometric_prompt_store_credential)
-        advancedUnlockInfoView?.startIconViewAnimation()
 
         biometricHelper?.initEncryptData { biometricPrompt, cryptoObject, promptInfo ->
             // Set listener to open the biometric dialog and save credential
@@ -189,7 +184,6 @@ class AdvancedUnlockedViewManager(var context: FragmentActivity,
     private fun initDecryptData() {
         showFingerPrintViews(true)
         setAdvancedUnlockedView(R.string.open_biometric_prompt_unlock_database)
-        advancedUnlockInfoView?.startIconViewAnimation()
 
         if (biometricHelper != null) {
             prefsNoBackup.getString(preferenceKeyIvSpec, null)?.let {
diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
index 8800e891f..835d57998 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/FingerPrintAnimatedVector.kt
@@ -39,19 +39,23 @@ class FingerPrintAnimatedVector(context: Context, imageView: ImageView) {
         imageView.setImageDrawable(scanFingerprint)
     }
 
+    private var animationCallback = object : Animatable2.AnimationCallback() {
+        override fun onAnimationEnd(drawable: Drawable) {
+            if (!scanFingerprint.isRunning)
+                scanFingerprint.start()
+        }
+    }
+
     fun startScan() {
-        scanFingerprint.registerAnimationCallback(object : Animatable2.AnimationCallback() {
-            override fun onAnimationEnd(drawable: Drawable) {
-                if (!scanFingerprint.isRunning)
-                    scanFingerprint.start()
-            }
-        })
+        scanFingerprint.registerAnimationCallback(animationCallback)
 
         if (!scanFingerprint.isRunning)
             scanFingerprint.start()
     }
 
     fun stopScan() {
+        scanFingerprint.unregisterAnimationCallback(animationCallback)
+
         if (scanFingerprint.isRunning)
             scanFingerprint.stop()
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
index 2411094b4..9d629d584 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt
@@ -50,8 +50,12 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context,
     }
 
     fun setIconViewClickListener(listener: ((view: View)->Unit)?) {
-        unlockIconImageView?.setOnClickListener(listener)
+        if (listener == null)
+            stopIconViewAnimation()
+        else
+            startIconViewAnimation()
         unlockContainerView.alpha = if (listener == null) 0.8f else 1f
+        unlockIconImageView?.setOnClickListener(listener)
     }
 
     var text: CharSequence
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2cf9591ab..3f1866633 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -184,7 +184,7 @@
     <string name="warning_unmounted">اربط بطاقة الذاكرة لإنشاء او تحميل قاعدة بيانات.</string>
     <string name="build_label">بناء %1$s</string>
     <string name="encrypted_value_stored">تم حفظ كلمة السر المشفرة</string>
-    <string name="no_password_stored">قاعدة البيانات لا تمتلك كلمة سر.</string>
+    <string name="no_credentials_stored">قاعدة البيانات لا تمتلك كلمة سر.</string>
     <string name="menu_appearance_settings">مظهر</string>
     <string name="general">عام</string>
     <string name="autofill">ملأ تلقائي</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1a2b14e16..cd5b62a07 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -223,7 +223,7 @@
     <string name="fingerprint_not_recognized">Otisk prstu není rozpoznán</string>
     <string name="biometric_scanning_error">Problém s otiskem prstu: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Použít pro uložení tohoto hesla otisk prstu</string>
-    <string name="no_password_stored">Tato databáze zatím není chráněna heslem.</string>
+    <string name="no_credentials_stored">Tato databáze zatím není chráněna heslem.</string>
     <string name="history">Historie</string>
     <string name="menu_appearance_settings">Vzhled</string>
     <string name="general">Obecné</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a12b30fb5..cc36e9565 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -219,7 +219,7 @@
     <string name="fingerprint_not_recognized">Kunne ikke genkende fingeraftryk</string>
     <string name="biometric_scanning_error">Problem med fingeraftryk: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Brug fingeraftryk til at gemme adgangskoden</string>
-    <string name="no_password_stored">Databasen har endnu ikke en adgangskode.</string>
+    <string name="no_credentials_stored">Databasen har endnu ikke en adgangskode.</string>
     <string name="history">Historik</string>
     <string name="menu_appearance_settings">Udseende</string>
     <string name="general">Generelt</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a8d960c02..f7fde4a18 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -213,7 +213,7 @@
     <string name="usage">Verwendung</string>
     <string name="general">Allgemein</string>
     <string name="open_biometric_prompt_store_credential">Fingerabdruck verwenden, um dieses Passwort zu speichern</string>
-    <string name="no_password_stored">Diese Datenbank hat noch kein Passwort.</string>
+    <string name="no_credentials_stored">Diese Datenbank hat noch kein Passwort.</string>
     <string name="style_choose_summary">App-Design, das in der App genutzt wird</string>
     <string name="encryption">Verschlüsselung</string>
     <string name="key_derivation_function">Schlüsselableitungsfunktion</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2c8b2721f..8cc0bdeab 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -205,7 +205,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="fingerprint_not_recognized">Huella digital no reconocida</string>
     <string name="biometric_scanning_error">Problema de huella digital: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Usa la huella digital para almacenar esta contraseña</string>
-    <string name="no_password_stored">Aún sin contraseña almacenada para esta base de datos</string>
+    <string name="no_credentials_stored">Aún sin contraseña almacenada para esta base de datos</string>
     <string name="history">Historial</string>
     <string name="menu_appearance_settings">Apariencia</string>
     <string name="general">General</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9bd3088ce..8bf6368e6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -185,7 +185,7 @@
     <string name="fingerprint_not_recognized">Impossible de reconnaître l’empreinte digitale</string>
     <string name="biometric_scanning_error">Problème d’empreinte digitale : %1$s</string>
     <string name="open_biometric_prompt_store_credential">Utiliser l’empreinte digitale pour stocker ce mot de passe</string>
-    <string name="no_password_stored">Cette base de données n’a pas encore de mot de passe.</string>
+    <string name="no_credentials_stored">Cette base de données n’a pas encore de mot de passe.</string>
     <string name="history">Historique</string>
     <string name="menu_appearance_settings">Apparence</string>
     <string name="general">Général</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index f03cdaca9..b6dcea0d0 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -155,7 +155,7 @@
     <string name="biometric_invalid_key">Az ujjlenyomat kulcs nem olvasható. Állítsa vissza a jelszavát.</string>
     <string name="biometric_scanning_error">Ujjlenyomat probléma: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Használjon ujjlenyomatot a jelszó tárolásához</string>
-    <string name="no_password_stored">Az adatbázisnak még nincs jelszava.</string>
+    <string name="no_credentials_stored">Az adatbázisnak még nincs jelszava.</string>
 
     <string name="education_unlock_summary">Adja meg a jelszót és/vagy a kulcsfájlt, hogy kinyithassa az adatbázist.
 \n
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 93a75668f..60357609b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -159,7 +159,7 @@
     <string name="biometric_invalid_key">Lettura dell\'impronta fallita. Ripristina la tua password.</string>
     <string name="biometric_scanning_error">Problema impronta: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Usa l\'impronta per salvare questa password</string>
-    <string name="no_password_stored">Questo database non ha ancora alcuna password.</string>
+    <string name="no_credentials_stored">Questo database non ha ancora alcuna password.</string>
     <string name="education_unlock_summary">Inserisci una password e/o file chiave per sbloccare il database.
 \n
 \nRicorda di salvare una copia del tuo file .kdbx in un luogo sicuro dopo ogni modifica.</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index b5f81f44e..8f9547e17 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -180,7 +180,7 @@
     <string name="fingerprint_not_recognized">Fremmed fingeravtrykk</string>
     <string name="biometric_scanning_error">Fingeravtrykksproblem: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Bruk fingeravtrykk til å lagre dette passordet</string>
-    <string name="no_password_stored">Denne databasen har ikke et passord enda.</string>
+    <string name="no_credentials_stored">Denne databasen har ikke et passord enda.</string>
     <string name="history">Historikk</string>
     <string name="menu_appearance_settings">Utseende</string>
     <string name="general">Generelt</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0db7ed419..7d92a5f7b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -222,7 +222,7 @@
     <string name="fingerprint_not_recognized">Vingerafdruk niet herkend</string>
     <string name="biometric_scanning_error">Vingerafdrukprobleem: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Vingerafdruk gebruiken om dit wachtwoord op te slaan</string>
-    <string name="no_password_stored">Deze databank heeft nog geen wachtwoord.</string>
+    <string name="no_credentials_stored">Deze databank heeft nog geen wachtwoord.</string>
     <string name="history">Geschiedenis</string>
     <string name="menu_appearance_settings">Uiterlijk</string>
     <string name="general">Algemeen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ff7499a1f..d850f4473 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -217,7 +217,7 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="fingerprint_not_recognized">Nie można rozpoznać odcisku palca</string>
     <string name="biometric_scanning_error">Problem z odciskiem palca: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Użyj odcisku palca, aby zapisać to hasło</string>
-    <string name="no_password_stored">Baza danych nie ma jeszcze hasła.</string>
+    <string name="no_credentials_stored">Baza danych nie ma jeszcze hasła.</string>
     <string name="history">Historia</string>
     <string name="menu_appearance_settings">Wygląd</string>
     <string name="general">Ogólne</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8cfd39f55..b21cacd0c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -215,7 +215,7 @@
     <string name="fingerprint_not_recognized">Não pôde reconhecer impressão digital</string>
     <string name="biometric_scanning_error">Problema de Impressão digital: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Use Impressão digital para armazenar esta senha</string>
-    <string name="no_password_stored">Ainda não há nenhuma senha armazenada nesse banco de dados.</string>
+    <string name="no_credentials_stored">Ainda não há nenhuma senha armazenada nesse banco de dados.</string>
     <string name="history">Histórico</string>
     <string name="menu_appearance_settings">Aparência</string>
     <string name="general">Geral</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 006517148..cdaa5554d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -208,7 +208,7 @@
     <string name="fingerprint_not_recognized">Impressão digital não reconhecida</string>
     <string name="biometric_scanning_error">Problema da Impressão digital: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Use a impressão digital para armazenar esta palavra-chave</string>
-    <string name="no_password_stored">Ainda não há nenhuma palavra-chave armazenada nesta base de dados.</string>
+    <string name="no_credentials_stored">Ainda não há nenhuma palavra-chave armazenada nesta base de dados.</string>
     <string name="history">Histórico</string>
     <string name="menu_appearance_settings">Aparência</string>
     <string name="general">Geral</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index eda6de812..6af59df6e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -160,7 +160,7 @@
     <string name="biometric_invalid_key">Неверный ключ отпечатка пальца. Восстановите пароль.</string>
     <string name="biometric_scanning_error">Проблема с отпечатком пальца : %1$s</string>
     <string name="open_biometric_prompt_store_credential">Используйте отпечаток пальца, чтобы сохранить пароль</string>
-    <string name="no_password_stored">Для этой базы пароль ещё не сохранён</string>
+    <string name="no_credentials_stored">Для этой базы пароль ещё не сохранён</string>
     <string name="education_unlock_summary">Введите пароль и/или файл ключа, чтобы разблокировать базу.
 \n
 \nНе забудьте сохранить копию .kdbx файла в безопасном месте после каждого изменения.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b53536f4c..d7938eba0 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -183,7 +183,7 @@
     <string name="fingerprint_not_recognized">Parmak izi tanınamadı</string>
     <string name="biometric_scanning_error">Parmak izi sorunu: %1$s</string>
     <string name="open_biometric_prompt_store_credential">Bu şifreyi saklamak için parmak izini kullanın</string>
-    <string name="no_password_stored">Bu veritabanının henüz bir parolası yok.</string>
+    <string name="no_credentials_stored">Bu veritabanının henüz bir parolası yok.</string>
     <string name="history">Geçmiş</string>
     <string name="menu_appearance_settings">Görünüm</string>
     <string name="general">Genel</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4097c3a5d..ac09c81f0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -255,7 +255,7 @@
     <string name="biometric_invalid_key">不能读取指纹密钥，请重置你的密码。</string>
     <string name="fingerprint_not_recognized">未能识别的指纹</string>
     <string name="biometric_scanning_error">指纹识别问题：%1$s</string>
-    <string name="no_password_stored">当前数据库没有任何密码。</string>
+    <string name="no_credentials_stored">当前数据库没有任何密码。</string>
     <string name="set_autofill_service_title">配置自动填充服务</string>
     <string name="set_autofill_service_summary">打开自动填充功能，以便快速的在其他应用中填写信息</string>
     <string name="password_size_title">密码生成长度</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fc8e1b60..c2af0e75d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -236,7 +236,7 @@
     <string name="fingerprint_not_recognized">Could not recognize fingerprint</string>
     <!--This problem could be with scanning, or something else.-->
     <string name="biometric_scanning_error">Biometric error: %1$s</string>
-    <string name="no_password_stored">This database does not have stored credential yet.</string>
+    <string name="no_credentials_stored">This database does not have stored credential yet.</string>
     <string name="history">History</string>
     <string name="menu_appearance_settings">Appearance</string>
     <string name="biometric">Biometric</string>