diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
index 1615c35a8..5ff3a7b25 100644
--- a/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/adapters/FileDatabaseHistoryAdapter.kt
@@ -70,8 +70,6 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         val fileHistoryEntity = listDatabaseFiles[position]
         val fileDatabaseInfo = FileDatabaseInfo(context, fileHistoryEntity.databaseUri)
 
-        // Context menu creation
-        holder.fileContainer.setOnCreateContextMenuListener(ContextMenuBuilder(fileHistoryEntity))
         // Click item to open file
         if (fileItemOpenListener != null)
             holder.fileContainer.setOnClickListener {
@@ -165,21 +163,6 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         this.saveAliasListener = listener
     }
 
-    private inner class ContextMenuBuilder(private val fileHistoryEntity: FileDatabaseHistoryEntity) : View.OnCreateContextMenuListener {
-
-        private val mOnMyActionClickListener = MenuItem.OnMenuItemClickListener { item ->
-            when (item.itemId) {
-                MENU_CLEAR -> fileSelectClearListener?.invoke(fileHistoryEntity) ?: false
-                else -> false
-            }
-        }
-
-        override fun onCreateContextMenu(contextMenu: ContextMenu?, view: View?, contextMenuInfo: ContextMenu.ContextMenuInfo?) {
-            contextMenu?.add(Menu.NONE, MENU_CLEAR, Menu.NONE, R.string.remove_from_filelist)
-                    ?.setOnMenuItemClickListener(mOnMyActionClickListener)
-        }
-    }
-
     inner class FileDatabaseHistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         var fileContainer: ViewGroup = itemView.findViewById(R.id.file_container_basic_info)
@@ -199,9 +182,4 @@ class FileDatabaseHistoryAdapter(private val context: Context)
         var fileModification: TextView = itemView.findViewById(R.id.file_modification)
         var fileSize: TextView = itemView.findViewById(R.id.file_size)
     }
-
-    companion object {
-
-        private const val MENU_CLEAR = 1
-    }
 }
diff --git a/app/src/main/res/layout/item_file_row.xml b/app/src/main/res/layout/item_file_row.xml
index 24424e59c..cee214a19 100644
--- a/app/src/main/res/layout/item_file_row.xml
+++ b/app/src/main/res/layout/item_file_row.xml
@@ -132,6 +132,7 @@
             android:padding="12dp"
             android:src="@drawable/ic_mode_edit_white_24dp"
             android:scaleX="-1"
+            android:contentDescription="@string/content_description_update_from_list"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:tint="?android:attr/textColorHintInverse"/>
@@ -200,6 +201,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:padding="12dp"
+                android:contentDescription="@string/content_description_remove_from_list"
                 android:src="@drawable/ic_content_delete_white_24dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ca58927a2..e10d893fe 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -89,7 +89,7 @@
     <string name="protection">الحماية</string>
     <string name="read_only">للقراءة فقط</string>
     <string name="recentfile_summary">تذكر أسماء الملفات المستخدمة مؤخرا</string>
-    <string name="remove_from_filelist">حذف</string>
+    <string name="content_description_remove_from_list">حذف</string>
     <string name="root">الجذر</string>
     <string name="memory_usage">استخدام الذاكرة</string>
     <string name="parallelism">التَّوازِي</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index fa88514b6..f50d7c318 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -118,7 +118,7 @@
     <string name="progress_title">Treballant&#8230;</string>
     <string name="remember_keyfile_summary">Recorda la localització d\'arxius clau</string>
     <string name="remember_keyfile_title">Guarda arxiu clau</string>
-    <string name="remove_from_filelist">Elimina</string>
+    <string name="content_description_remove_from_list">Elimina</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Arrel</string>
     <string name="rounds">Passades d\'encriptació</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b48aea8c1..54efc654a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -134,7 +134,7 @@
     <string name="recentfile_summary">Pamatovat si nedávno otevřené soubory</string>
     <string name="remember_keyfile_summary">Pamatovat si umístění souborů s klíči</string>
     <string name="remember_keyfile_title">Uložit soubor s klíčem</string>
-    <string name="remove_from_filelist">Odstranit</string>
+    <string name="content_description_remove_from_list">Odstranit</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Kořen</string>
     <string name="rounds">Počet šifrovacích průchodů</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index cc783bbcc..facc0d14a 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -131,7 +131,7 @@
     <string name="recentfile_summary">Husk de seneste filnavne</string>
     <string name="remember_keyfile_summary">Husker placeringen af databasernøglefiler</string>
     <string name="remember_keyfile_title">Gem nøglefil</string>
-    <string name="remove_from_filelist">Fjern</string>
+    <string name="content_description_remove_from_list">Fjern</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Rod</string>
     <string name="rounds">Transformationsrunder</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b91b09414..033fb7f5b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -136,7 +136,7 @@
     <string name="recentfile_summary">Zuletzt verwendete Datenbanken merken</string>
     <string name="remember_keyfile_summary">Erinnert sich an den Speicherort der Schlüsseldateien der Datenbanken</string>
     <string name="remember_keyfile_title">Schlüsselquelle merken</string>
-    <string name="remove_from_filelist">Löschen</string>
+    <string name="content_description_remove_from_list">Löschen</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Start</string>
     <string name="rounds">Schlüsseltransformationen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ac44d64d0..362b059b4 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -131,7 +131,7 @@
     <string name="recentfile_summary">Να θυμάσαι πρόσφατα χρησιμοποιημένα ονόματα αρχείων</string>
     <string name="remember_keyfile_summary">Να θυμάσαι την τοποθεσία των αρχείων κλειδιών</string>
     <string name="remember_keyfile_title">Αποθήκευση αρχείου κλειδιού</string>
-    <string name="remove_from_filelist">Απομάκρυνση</string>
+    <string name="content_description_remove_from_list">Απομάκρυνση</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Ριζικός Κατάλογος</string>
     <string name="rounds">Κύκλοι Κρυπτογράφησης</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f93846bb1..0c7fa2bbb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -118,7 +118,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="progress_title">Trabajando…</string>
     <string name="remember_keyfile_summary">Recordar la ubicación de archivos de clave</string>
     <string name="remember_keyfile_title">Guardando archivo de clave</string>
-    <string name="remove_from_filelist">Borrar</string>
+    <string name="content_description_remove_from_list">Borrar</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Raíz</string>
     <string name="rounds">Pasadas de cifrado</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 9c06bbc71..bb64228ba 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -130,7 +130,7 @@
     <string name="recentfile_summary">Gogoratu duela gutxi erabili diren fitxategien izenak</string>
     <string name="remember_keyfile_summary">Gogoratu gako fitxategien kokapenak</string>
     <string name="remember_keyfile_title">Gako fitxategia gorde</string>
-    <string name="remove_from_filelist">Ezabatu</string>
+    <string name="content_description_remove_from_list">Ezabatu</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Enkriptatzeko Rondak</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ee9a4e3c9..bcfdb0629 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -129,7 +129,7 @@
     <string name="recentfile_summary">Muista viimeksi käytettyjen tiedostojen nimet</string>
     <string name="remember_keyfile_summary">Muista avaintiedostojen sijainti</string>
     <string name="remember_keyfile_title">Tallenna avaintiedosto</string>
-    <string name="remove_from_filelist">Poista</string>
+    <string name="content_description_remove_from_list">Poista</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Juuri</string>
     <string name="rounds">Salauskierroksia</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 01d5f487d..ccc9dcd46 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -141,7 +141,7 @@
     <string name="recentfile_summary">Mémoriser les noms des fichiers récents</string>
     <string name="remember_keyfile_summary">Mémoriser l’emplacement des fichiers clé des bases de données</string>
     <string name="remember_keyfile_title">Enregistrer le fichier clé</string>
-    <string name="remove_from_filelist">Effacer</string>
+    <string name="content_description_remove_from_list">Effacer</string>
     <string name="root">Racine</string>
     <string name="encryption_explanation">Algorithme de chiffrement de la base de données utilisé pour toutes les données.</string>
     <string name="kdf_explanation">Afin de générer la clé pour l’algorithme de chiffrement, la clé maîtresse est transformée en utilisant une fonction de dérivation de clé salée aléatoirement.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 26315f246..15b5272b9 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -128,7 +128,7 @@
     <string name="recentfile_summary">Az előző fájlnevek megjegyzése</string>
     <string name="remember_keyfile_summary">Megjegyzi az adatbázis-kulcsfájlok helyét</string>
     <string name="remember_keyfile_title">Kulcsfájl mentése</string>
-    <string name="remove_from_filelist">Eltávolítás</string>
+    <string name="content_description_remove_from_list">Eltávolítás</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Gyökérkönyvár</string>
     <string name="rounds">Transzformációs körök</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index eb86bb2e4..fbd37e3c1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -133,7 +133,7 @@
     <string name="recentfile_summary">Ricorda i file recenti</string>
     <string name="remember_keyfile_summary">Ricorda la posizione dei file chiave dei database</string>
     <string name="remember_keyfile_title">Salva il file chiave</string>
-    <string name="remove_from_filelist">Elimina</string>
+    <string name="content_description_remove_from_list">Elimina</string>
     <string name="root">Root</string>
     <string name="rounds">Livello cifratura</string>
     <string name="rounds_explanation">Livelli di cifratura aggiuntivi forniscono una maggiore protezione contro attacchi di tipo forza bruta, ma può rallentare il caricamento e il salvataggio.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a65d38790..9714ca530 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -128,7 +128,7 @@
     <string name="recentfile_summary">שמור קבצים שהיו בשימוש לאחרונה</string>
     <string name="remember_keyfile_summary">זכור מיקום קבצי מפתח</string>
     <string name="remember_keyfile_title">שמור קובץ מפתח</string>
-    <string name="remove_from_filelist">הסר</string>
+    <string name="content_description_remove_from_list">הסר</string>
     <string name="rounds">סיבובי הצפנה</string>
     <string name="rounds_explanation">מספר סיבובי הצפנה גבוה יותר מספר הגה טובה יותר נגד התקפות, אבל יכול להעלות בהרבה את זמן הטעינה והשמירה.</string>
     <string name="rounds_hint">סיבובים</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index c8d0fe611..74a45136e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -114,7 +114,7 @@
     <string name="progress_title">実行中…</string>
     <string name="remember_keyfile_summary">前回使用したキーファイルを次回も表示します</string>
     <string name="remember_keyfile_title">キーファイルを記憶</string>
-    <string name="remove_from_filelist">消去</string>
+    <string name="content_description_remove_from_list">消去</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">暗号化レベル</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 21f7a770e..b2d93b0cc 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -136,7 +136,7 @@
     <string name="recentfile_summary">최근 파일 이름 기억하기</string>
     <string name="remember_keyfile_summary">데이터베이스 키 파일 위치 기억하기</string>
     <string name="remember_keyfile_title">키 파일 저장</string>
-    <string name="remove_from_filelist">삭제</string>
+    <string name="content_description_remove_from_list">삭제</string>
     <string name="root">루트</string>
     <string name="encryption_explanation">데이터베이스 암호화 알고리즘이 모든 데이터에 적용됩니다.</string>
     <string name="memory_usage">메모리 사용량</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index bba5f3312..22d29b714 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -64,7 +64,7 @@
     <string name="recentfile_summary">Atsiminti paskutinius naudotus failų pavadinimus</string>
     <string name="remember_keyfile_title">Saugoti rakto failą</string>
     <string name="remember_keyfile_summary">Atsimena rakto failų vietą</string>
-    <string name="remove_from_filelist">Pašalinti</string>
+    <string name="content_description_remove_from_list">Pašalinti</string>
     <string name="root">Šaknis</string>
     <string name="read_only">Tik skaitymui</string>
     <string name="error_pass_match">Slaptažodžiai nesutampa</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index c30605473..e96ba006e 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -109,7 +109,7 @@
     <string name="recentfile_summary">Glabāt atvērto failu nosaukumus</string>
     <string name="remember_keyfile_summary">Atcerēties šo atslēgas faila vietu</string>
     <string name="remember_keyfile_title">Saglabāt atslēgas failu</string>
-    <string name="remove_from_filelist">Noņemt</string>
+    <string name="content_description_remove_from_list">Noņemt</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Šifrēšanas līmeņi</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 26ef89060..8555e0121 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -136,7 +136,7 @@
     <string name="recentfile_summary">Husk nylig brukte filnavn</string>
     <string name="remember_keyfile_summary">Husk nøkkelfilers plassering</string>
     <string name="remember_keyfile_title">Lagre nøkkelfil</string>
-    <string name="remove_from_filelist">Fjern</string>
+    <string name="content_description_remove_from_list">Fjern</string>
     <string name="root">Rot</string>
     <string name="encryption_explanation">Algoritme for å kryptere hele databasen. (Passord, brukernavn, merknader og all data i databasen er kryptert med valgt algoritme).</string>
     <string name="kdf_explanation">For å generere en nøkkel for krypteringsalgoritmen, er den komprimerte hovednøkkelen (SHA-256) transformert ved bruk av en tilfeldig saltet nøkkelutledningsfunksjon.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f9e0921da..4f14c16cf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -117,7 +117,7 @@
     <string name="progress_title">Bezig met verwerken…</string>
     <string name="remember_keyfile_summary">Locatie van databank-sleutelbestanden onthouden</string>
     <string name="remember_keyfile_title">Sleutelbestand opslaan</string>
-    <string name="remove_from_filelist">Verwijderen</string>
+    <string name="content_description_remove_from_list">Verwijderen</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Hoofdmap</string>
     <string name="rounds">Encryptie-cycli</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 73207ad1d..9830b27da 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -115,7 +115,7 @@
     <string name="progress_title">Arbeider …</string>
     <string name="remember_keyfile_summary">Hugsar staden til nøkkelfilene</string>
     <string name="remember_keyfile_title">Lagra nøkkelfila</string>
-    <string name="remove_from_filelist">Ta vekk</string>
+    <string name="content_description_remove_from_list">Ta vekk</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Rot</string>
     <string name="rounds">Krypteringsomgangar</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index cea774a4c..86569599b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -114,7 +114,7 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="recentfile_summary">Zapamiętaj najnowsze nazwy plików</string>
     <string name="remember_keyfile_summary">Zapamiętuje lokalizację plików kluczy baz danych</string>
     <string name="remember_keyfile_title">Zapisz plik klucza</string>
-    <string name="remove_from_filelist">Usuń</string>
+    <string name="content_description_remove_from_list">Usuń</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Rundy szyfrowania</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b493927b5..21a4aedce 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -117,7 +117,7 @@
     <string name="progress_title">Trabalhando…</string>
     <string name="remember_keyfile_summary">Lembra o local dos arquivos-chave dos bancos de dados</string>
     <string name="remember_keyfile_title">Salvar arquivo de chave</string>
-    <string name="remove_from_filelist">Remover</string>
+    <string name="content_description_remove_from_list">Remover</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Raiz</string>
     <string name="rounds">Rodadas de criptografia</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 82cc2962b..ae623e1db 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -132,7 +132,7 @@
     <string name="recentfile_summary">Relembrar o nome dos ficheiros usados recentemente</string>
     <string name="remember_keyfile_summary">Relembra a localização dos ficheiros chave</string>
     <string name="remember_keyfile_title">Guardar ficheiro chave</string>
-    <string name="remove_from_filelist">Remover</string>
+    <string name="content_description_remove_from_list">Remover</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Raiz</string>
     <string name="rounds">Rondas de encriptação</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c367ad77e..35f8bf8e8 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -132,7 +132,7 @@
     <string name="recentfile_summary">Хранить имена открытых файлов</string>
     <string name="remember_keyfile_summary">Хранить пути к файлам ключей</string>
     <string name="remember_keyfile_title">Хранить файлы ключей</string>
-    <string name="remove_from_filelist">Убрать из списка</string>
+    <string name="content_description_remove_from_list">Убрать из списка</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">База</string>
     <string name="rounds">Раунды шифрования</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 6a2fe851e..2ca101a92 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -114,7 +114,7 @@
     <string name="progress_title">Pracujem…</string>
     <string name="remember_keyfile_summary">Zapamätať si umiestnenie keyfile</string>
     <string name="remember_keyfile_title">Uložiť keyfile</string>
-    <string name="remove_from_filelist">Odstrániť</string>
+    <string name="content_description_remove_from_list">Odstrániť</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Šifrovacie opakovania</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c2de47dd0..7c87a9dbb 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -127,7 +127,7 @@
     <string name="protection">Skydd</string>
     <string name="remember_keyfile_summary">Sparar sökvägar till nyckelfiler</string>
     <string name="remember_keyfile_title">Spara nyckelfil</string>
-    <string name="remove_from_filelist">Ta bort</string>
+    <string name="content_description_remove_from_list">Ta bort</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Krypteringsrundor</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 80da283bf..27856fb1e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -136,7 +136,7 @@
     <string name="recentfile_summary">Son dosya adlarını hatırla</string>
     <string name="remember_keyfile_summary">Veritaban anahtar dosyaların yerini hatırlar</string>
     <string name="remember_keyfile_title">Anahtar dosya kaydet</string>
-    <string name="remove_from_filelist">Kaldır</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 veritabanı şifreleme algoritması kullanılmıştır.</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>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9034bcc7c..64d637cbb 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -115,7 +115,7 @@
     <string name="progress_title">Працює&#8230;</string>
     <string name="remember_keyfile_summary">Запам’ятати розташування файла ключа</string>
     <string name="remember_keyfile_title">Збережіть файл ключа</string>
-    <string name="remove_from_filelist">Вилучити</string>
+    <string name="content_description_remove_from_list">Вилучити</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Корінь</string>
     <string name="rounds">Циклів шифрування</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 89c55cc7b..222f32511 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -111,7 +111,7 @@
     <string name="progress_title">正在处理…</string>
     <string name="remember_keyfile_summary">记住密钥文件的位置</string>
     <string name="remember_keyfile_title">保存密钥文件</string>
-    <string name="remove_from_filelist">移除</string>
+    <string name="content_description_remove_from_list">移除</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">加密次数</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ff1409d9c..f14223b11 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -111,7 +111,7 @@
     <string name="progress_title">工作中…</string>
     <string name="remember_keyfile_summary">記住密鑰檔的位置</string>
     <string name="remember_keyfile_title">保存密鑰檔</string>
-    <string name="remove_from_filelist">移除</string>
+    <string name="content_description_remove_from_list">移除</string>
     <string name="encryption_rijndael">Rijndael加密(AES)</string>
     <string name="root">Root</string>
     <string name="rounds">加密次數</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 915c3dd5a..09cb06c8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,6 +63,8 @@
     <string name="content_description_password_length">Password length</string>
     <string name="content_description_add_field">Add field</string>
     <string name="content_description_remove_field">Remove field</string>
+    <string name="content_description_update_from_list">Update</string>
+    <string name="content_description_remove_from_list">Remove</string>
 
     <!--%1$s is either \"Username\" or \"Password\".-->
     <string name="select_to_copy">Select to copy %1$s to clipboard</string>
@@ -183,7 +185,6 @@
     <string name="recentfile_summary">Remember recent filenames</string>
     <string name="remember_keyfile_summary">Remembers the location of databases keyfiles</string>
     <string name="remember_keyfile_title">Save keyfile</string>
-    <string name="remove_from_filelist">Remove</string>
     <string name="root">Root</string>
     <string name="encryption_explanation">Database encryption algorithm used for all data.</string>
     <string name="kdf_explanation">To generate the key for the encryption algorithm, the master key is transformed using a randomly salted key derivation function.</string>