diff --git a/app/src/main/res/layout/groups_fragment.xml b/app/src/main/res/layout/groups_fragment.xml
index d6704ac3..dfdd93b2 100644
--- a/app/src/main/res/layout/groups_fragment.xml
+++ b/app/src/main/res/layout/groups_fragment.xml
@@ -89,6 +89,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/element_margin"
             android:layout_marginBottom="@dimen/element_margin"
+            android:contentDescription="@string/add_entry"
             android:onClick="@{() -> viewModel.onAddButtonClicked()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/note_editor_fragment.xml b/app/src/main/res/layout/note_editor_fragment.xml
index aba1d107..1f3b3be9 100644
--- a/app/src/main/res/layout/note_editor_fragment.xml
+++ b/app/src/main/res/layout/note_editor_fragment.xml
@@ -48,6 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/element_margin"
             android:layout_marginBottom="@dimen/element_margin"
+            android:contentDescription="@string/add_entry"
             android:onClick="@{() -> viewModel.onFabButtonClicked()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/note_fragment.xml b/app/src/main/res/layout/note_fragment.xml
index ba58d54e..d98f7f52 100644
--- a/app/src/main/res/layout/note_fragment.xml
+++ b/app/src/main/res/layout/note_fragment.xml
@@ -175,6 +175,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/element_margin"
             android:layout_marginBottom="@dimen/element_margin"
+            android:contentDescription="@string/add_entry"
             android:onClick="@{() -> viewModel.onFabButtonClicked()}"
             app:layout_constraintBottom_toTopOf="@id/bottomPanelLayout"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/unlock_fragment.xml b/app/src/main/res/layout/unlock_fragment.xml
index 86f472f4..4c8d4f1b 100644
--- a/app/src/main/res/layout/unlock_fragment.xml
+++ b/app/src/main/res/layout/unlock_fragment.xml
@@ -49,10 +49,10 @@
             android:layout_marginTop="@dimen/element_margin"
             app:layout_constraintTop_toBottomOf="@id/errorPanelView"
             app:onAddClicked="@{() -> viewModel.onAddKeyFileButtonClicked()}"
+            app:onEditorAction="@{(actionId) -> viewModel.onEditorAction(actionId)}"
             app:onRemoveClicked="@{() -> viewModel.onRemoveKeyFileButtonClicked()}"
             app:onUnlockClicked="@{() -> viewModel.onUnlockButtonClicked()}"
             app:onUnlockLongClicked="@{() -> viewModel.onUnlockButtonLongClicked()}"
-            app:onEditorAction="@{(actionId) -> viewModel.onEditorAction(actionId)}"
             app:screenState="@{viewModel.screenState}"
             app:screenStateHandler="@{viewModel.screenStateHandler}" />
 
@@ -90,6 +90,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/element_margin"
             android:layout_marginBottom="@dimen/element_margin"
+            android:contentDescription="@string/add_entry"
             android:onClick="@{() -> viewModel.onAddButtonClicked()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values/debug-strings.xml b/app/src/main/res/values/debug-strings.xml
index 28148e13..0d8e7d20 100644
--- a/app/src/main/res/values/debug-strings.xml
+++ b/app/src/main/res/values/debug-strings.xml
@@ -13,7 +13,6 @@
     <string name="database_with_dots" translatable="false">Database:</string>
     <string name="password_with_default" translatable="false">Password (default: abc123)</string>
     <string name="close" translatable="false">Close</string>
-    <string name="add_entry" translatable="false">Add entry</string>
     <string name="scenarios_with_dots" translatable="false">Scenarios:</string>
     <string name="view_test_diff" translatable="false">View test diff</string>
     <string name="hooks_with_dots" translatable="false">Hooks:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f0bcc304..4844c0e8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -180,6 +180,7 @@
     <string name="sync_error">Sync error</string>
     <string name="no_search_results">No search results</string>
     <string name="compare_with">Compare with</string>
+    <string name="add_entry">Add entry</string>
 
     <!-- Group editor screen -->
     <string name="new_group">New group</string>