diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
index 3bf4aac554..90c48e1ab5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/home/StartConversation.kt
@@ -91,7 +91,7 @@ internal fun StartConversationScreen(
                     Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
                     QrImage(
                         string = accountId,
-                        Modifier.contentDescription(R.string.AccessibilityId_qr_code),
+                        Modifier.contentDescription(R.string.AccessibilityId_qrCode),
                         icon = R.drawable.session
                     )
                 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt
index 3a01572742..7f4eed9784 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/landing/Landing.kt
@@ -84,12 +84,12 @@ internal fun LandingScreen(
             buttons = listOf(
                 DialogButtonModel(
                     text = GetString(R.string.onboardingTos),
-                    contentDescription = GetString(R.string.AccessibilityId_terms_of_service_button),
+                    contentDescription = GetString(R.string.AccessibilityId_onboardingTos),
                     onClick = openTerms
                 ),
                 DialogButtonModel(
                     text = GetString(R.string.onboardingPrivacy),
-                    contentDescription = GetString(R.string.AccessibilityId_privacy_policy_button),
+                    contentDescription = GetString(R.string.AccessibilityId_onboardingPrivacy),
                     onClick = openPrivacyPolicy
                 )
             )
@@ -158,7 +158,7 @@ internal fun LandingScreen(
                 modifier = Modifier
                     .fillMaxWidth()
                     .align(Alignment.CenterHorizontally)
-                    .contentDescription(R.string.AccessibilityId_create_account_button),
+                    .contentDescription(R.string.AccessibilityId_onboardingAccountCreate),
                 onClick = createAccount
             )
             Spacer(modifier = Modifier.height(LocalDimensions.current.smallSpacing))
@@ -167,7 +167,7 @@ internal fun LandingScreen(
                 modifier = Modifier
                     .fillMaxWidth()
                     .align(Alignment.CenterHorizontally)
-                    .contentDescription(R.string.AccessibilityId_restore_account_button),
+                    .contentDescription(R.string.AccessibilityId_onboardingAccountExists),
                 onClick = loadAccount
             )
             BorderlessHtmlButton(
@@ -175,7 +175,7 @@ internal fun LandingScreen(
                 modifier = Modifier
                     .fillMaxWidth()
                     .align(Alignment.CenterHorizontally)
-                    .contentDescription(R.string.AccessibilityId_open_url),
+                    .contentDescription(R.string.AccessibilityId_urlOpenBrowser),
                 onClick = { isUrlDialogVisible = true }
             )
             Spacer(modifier = Modifier.height(LocalDimensions.current.xxsSpacing))
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt
index 8646bb0648..b822931dcc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/loadaccount/LoadAccount.kt
@@ -100,7 +100,7 @@ private fun RecoveryPassword(state: State, onChange: (String) -> Unit = {}, onCo
             SessionOutlinedTextField(
                 text = state.recoveryPhrase,
                 modifier = Modifier.fillMaxWidth(),
-                contentDescription = stringResource(R.string.AccessibilityId_recovery_phrase_input),
+                contentDescription = stringResource(R.string.AccessibilityId_recoveryPhrase),
                 placeholder = stringResource(R.string.recoveryPasswordEnter),
                 onChange = onChange,
                 onContinue = onContinue,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/Loading.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/Loading.kt
index 8c2e10e765..001562c7ff 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/Loading.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/loading/Loading.kt
@@ -20,7 +20,7 @@ internal fun LoadingScreen(progress: Float) {
         Spacer(modifier = Modifier.weight(1f))
         ProgressArc(
             progress,
-            modifier = Modifier.contentDescription(R.string.AccessibilityId_loading_animation)
+            modifier = Modifier.contentDescription(R.string.AccessibilityId_loadAccountProgressMessage)
         )
         Text(
             stringResource(R.string.waitOneMoment),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
index ff8d4eeff5..06e16fe7bd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/messagenotifications/MessageNotifications.kt
@@ -72,7 +72,7 @@ internal fun MessageNotificationsScreen(
         NotificationRadioButton(
             R.string.notificationsFastMode,
             R.string.notificationsFastModeDescriptionAndroid,
-            modifier = Modifier.contentDescription(R.string.AccessibilityId_fast_mode_notifications_button),
+            modifier = Modifier.contentDescription(R.string.AccessibilityId_notificationsFastMode),
             tag = R.string.recommended,
             checked = state.pushEnabled,
             onClick = { setEnabled(true) }
@@ -86,7 +86,7 @@ internal fun MessageNotificationsScreen(
         NotificationRadioButton(
             R.string.notificationsSlowMode,
             R.string.notificationsSlowModeDescription,
-            modifier = Modifier.contentDescription(R.string.AccessibilityId_slow_mode_notifications_button),
+            modifier = Modifier.contentDescription(R.string.AccessibilityId_notificationsSlowMode),
             checked = state.pushDisabled,
             onClick = { setEnabled(false) }
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt
index 06a932f787..5af51db7a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt
@@ -101,7 +101,7 @@ fun QrPage(string: String) {
             string = string,
             modifier = Modifier
                 .padding(top = LocalDimensions.current.mediumSpacing, bottom = LocalDimensions.current.xsSpacing)
-                .contentDescription(R.string.AccessibilityId_qr_code),
+                .contentDescription(R.string.AccessibilityId_qrCode),
             icon = R.drawable.session
         )
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index eacc0c8d03..3b17e162be 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -171,7 +171,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.settings_general, menu)
         if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            menu.findItem(R.id.action_qr_code)?.contentDescription = resources.getString(R.string.AccessibilityId_view_qr_code)
+            menu.findItem(R.id.action_qr_code)?.contentDescription = resources.getString(R.string.AccessibilityId_qrView)
         }
         return true
     }
@@ -523,7 +523,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                         LargeItemButton(
                             R.string.sessionRecoveryPassword,
                             R.drawable.ic_shield_outline,
-                            Modifier.contentDescription(R.string.AccessibilityId_recovery_password_menu_item)
+                            Modifier.contentDescription(R.string.AccessibilityId_sessionRecoveryPasswordMenuItem)
                         ) { show<RecoveryPasswordActivity>() }
                         Divider()
                     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt
index 5f59943432..74e0f9f145 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPassword.kt
@@ -50,7 +50,7 @@ internal fun RecoveryPasswordScreen(
     Column(
         verticalArrangement = Arrangement.spacedBy(LocalDimensions.current.smallSpacing),
         modifier = Modifier
-            .contentDescription(R.string.AccessibilityId_recovery_password)
+            .contentDescription(R.string.AccessibilityId_sessionRecoveryPassword)
             .verticalScroll(rememberScrollState())
             .padding(bottom = LocalDimensions.current.smallSpacing)
     ) {
@@ -99,7 +99,7 @@ private fun RecoveryPasswordCell(
                     seed,
                     modifier = Modifier
                         .padding(vertical = LocalDimensions.current.spacing)
-                        .contentDescription(R.string.AccessibilityId_qr_code),
+                        .contentDescription(R.string.AccessibilityId_qrCode),
                     contentPadding = 10.dp,
                     icon = R.drawable.session_shield
                 )
@@ -136,7 +136,7 @@ private fun RecoveryPassword(mnemonic: String) {
     Text(
         mnemonic,
         modifier = Modifier
-            .contentDescription(R.string.AccessibilityId_recovery_password_container)
+            .contentDescription(R.string.AccessibilityId_sessionRecoveryPasswordContainer)
             .padding(vertical = LocalDimensions.current.spacing)
             .border()
             .padding(LocalDimensions.current.spacing),
@@ -168,7 +168,7 @@ private fun HideRecoveryPasswordCell(onHide: () -> Unit = {}) {
                 modifier = Modifier
                     .wrapContentWidth()
                     .align(Alignment.CenterVertically)
-                    .contentDescription(R.string.AccessibilityId_hide_recovery_password_button),
+                    .contentDescription(R.string.AccessibilityId_recoveryPasswordHideRecoveryPassword),
                 color = LocalColors.current.danger,
                 onClick = onHide
             )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
index 67c774dbf8..d31071161b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/recoverypassword/RecoveryPasswordActivity.kt
@@ -46,7 +46,7 @@ class RecoveryPasswordActivity : BaseActionBarActivity() {
             cancelButton()
             dangerButton(
                 R.string.yes,
-                contentDescription = R.string.AccessibilityId_confirm_button
+                contentDescription = R.string.AccessibilityId_recoveryPasswordHidePermanentlyConfirm
             ) {
                 viewModel.permanentlyHidePassword()
                 finish()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/AlertDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/AlertDialog.kt
index ec2b3d040f..ac2cae27ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/AlertDialog.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/AlertDialog.kt
@@ -175,12 +175,12 @@ fun PreviewXCloseDialog(){
             buttons = listOf(
                 DialogButtonModel(
                     text = GetString(R.string.onboardingTos),
-                    contentDescription = GetString(R.string.AccessibilityId_terms_of_service_button),
+                    contentDescription = GetString(R.string.AccessibilityId_onboardingTos),
                     onClick = {}
                 ),
                 DialogButtonModel(
                     text = GetString(R.string.onboardingPrivacy),
-                    contentDescription = GetString(R.string.AccessibilityId_privacy_policy_button),
+                    contentDescription = GetString(R.string.AccessibilityId_onboardingPrivacy),
                     onClick = {}
                 )
             ),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
index 5834f2f859..a65b341a54 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
@@ -177,7 +177,7 @@ fun OutlineCopyButton(
     val interactionSource = remember { MutableInteractionSource() }
 
     Button(
-        modifier = modifier.contentDescription(R.string.AccessibilityId_copy_button),
+        modifier = modifier.contentDescription(R.string.AccessibilityId_copy),
         interactionSource = interactionSource,
         style = style,
         type = ButtonType.Outline(color),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt
index 5e09f78b65..58e1ff8533 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Text.kt
@@ -134,7 +134,7 @@ fun SessionOutlinedTextField(
             Text(
                 it,
                 modifier = Modifier.fillMaxWidth()
-                    .contentDescription(R.string.AccessibilityId_error_message),
+                    .contentDescription(R.string.AccessibilityId_theError),
                 textAlign = TextAlign.Center,
                 style = LocalType.current.base.bold(),
                 color = LocalColors.current.danger
diff --git a/app/src/main/res/layout/fragment_enter_public_key.xml b/app/src/main/res/layout/fragment_enter_public_key.xml
index dd8f0f18c4..5430372483 100644
--- a/app/src/main/res/layout/fragment_enter_public_key.xml
+++ b/app/src/main/res/layout/fragment_enter_public_key.xml
@@ -33,7 +33,7 @@
                 android:layout_height="64dp"
                 android:layout_marginHorizontal="@dimen/large_spacing"
                 android:layout_marginTop="@dimen/large_spacing"
-                android:contentDescription="@string/AccessibilityId_account_id_input"
+                android:contentDescription="@string/AccessibilityId_accountIdOrOnsEnter"
                 android:gravity="center_vertical"
                 android:hint="@string/accountIdOrOnsEnter"
                 android:imeOptions="actionDone"
diff --git a/app/src/main/res/menu/menu_conversation_copy_account_id.xml b/app/src/main/res/menu/menu_conversation_copy_account_id.xml
index eb0a3d9360..74412f5120 100644
--- a/app/src/main/res/menu/menu_conversation_copy_account_id.xml
+++ b/app/src/main/res/menu/menu_conversation_copy_account_id.xml
@@ -6,5 +6,5 @@
             android:title="@string/accountIdCopy"
             android:id="@+id/menu_copy_account_id"
             android:icon="@drawable/ic_content_copy_white_24dp"
-            android:contentDescription="@string/AccessibilityId_copy_account_id" />
+            android:contentDescription="@string/AccessibilityId_accountIdCopy" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/settings_general.xml b/app/src/main/res/menu/settings_general.xml
index 48100eddaa..ac51aba08b 100644
--- a/app/src/main/res/menu/settings_general.xml
+++ b/app/src/main/res/menu/settings_general.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/action_qr_code"
         android:title=""
-        android:contentDescription="@string/AccessibilityId_view_qr_code"
+        android:contentDescription="@string/AccessibilityId_qrView"
         android:icon="@drawable/ic_qr_code_24"
         app:showAsAction="always" />
 
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index afd3ff8720..19230ff92e 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -4,26 +4,26 @@
     <!-- NOTE: Only non-translated Accessibility IDs for automated testing exist in this file. -->
 
     <!-- Onboarding related -->
-    <string name="AccessibilityId_account_id_input">Account id input box</string>
-    <string name="AccessibilityId_confirm_button">Confirm button</string>
-    <string name="AccessibilityId_copy_account_id">Copy Account ID</string>
-    <string name="AccessibilityId_copy_button">Copy button</string>
-    <string name="AccessibilityId_error_message">Error message</string>
-    <string name="AccessibilityId_hide_recovery_password_button">Hide recovery password button</string>
-    <string name="AccessibilityId_qr_code">QR code</string>
-    <string name="AccessibilityId_recovery_password">Recovery password</string>
-    <string name="AccessibilityId_recovery_password_container">Recovery password container</string>
-    <string name="AccessibilityId_recovery_password_menu_item">Recovery password menu item</string>
-    <string name="AccessibilityId_view_qr_code">View QR code</string>
-    <string name="AccessibilityId_fast_mode_notifications_button">Fast mode notifications button</string>
-    <string name="AccessibilityId_slow_mode_notifications_button">Slow mode notifications button</string>
-    <string name="AccessibilityId_loading_animation">Loading animation</string>
-    <string name="AccessibilityId_create_account_button">Create account button</string>
-    <string name="AccessibilityId_restore_account_button">Restore your session button</string>
-    <string name="AccessibilityId_open_url">Open URL</string>
-    <string name="AccessibilityId_terms_of_service_button">Terms of service button</string>
-    <string name="AccessibilityId_privacy_policy_button">Privacy policy button</string>
-    <string name="AccessibilityId_recovery_phrase_input">Recovery phrase input</string>
+    <string name="AccessibilityId_accountIdOrOnsEnter">Account id input box</string>
+    <string name="AccessibilityId_recoveryPasswordHidePermanentlyConfirm">Confirm button</string>
+    <string name="AccessibilityId_accountIdCopy">Copy Account ID</string>
+    <string name="AccessibilityId_copy">Copy button</string>
+    <string name="AccessibilityId_theError">Error message</string>
+    <string name="AccessibilityId_recoveryPasswordHideRecoveryPassword">Hide recovery password button</string>
+    <string name="AccessibilityId_qrCode">QR code</string>
+    <string name="AccessibilityId_sessionRecoveryPassword">Recovery password</string>
+    <string name="AccessibilityId_sessionRecoveryPasswordContainer">Recovery password container</string>
+    <string name="AccessibilityId_sessionRecoveryPasswordMenuItem">Recovery password menu item</string>
+    <string name="AccessibilityId_qrView">View QR code</string>
+    <string name="AccessibilityId_notificationsFastMode">Fast mode notifications button</string>
+    <string name="AccessibilityId_notificationsSlowMode">Slow mode notifications button</string>
+    <string name="AccessibilityId_loadAccountProgressMessage">Loading animation</string>
+    <string name="AccessibilityId_onboardingAccountCreate">Create account button</string>
+    <string name="AccessibilityId_onboardingAccountExists">Restore your session button</string>
+    <string name="AccessibilityId_urlOpenBrowser">Open URL</string>
+    <string name="AccessibilityId_onboardingTos">Terms of service button</string>
+    <string name="AccessibilityId_onboardingPrivacy">Privacy policy button</string>
+    <string name="AccessibilityId_recoveryPhrase">Recovery phrase input</string>
     <string name="AccessibilityId_reveal_recovery_phrase_button">Reveal recovery phrase button</string>
     <string name="AccessibilityId_help_desk_link">Help desk link</string>
     <string name="AccessibilityId_invite_friend_button">Invite friend button</string>