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 61f92261b9..829e576340 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
@@ -58,14 +58,14 @@ internal fun StartConversationScreen(
                 ItemButton(
                     textId = R.string.groupCreate,
                     icon = R.drawable.ic_group,
-                    modifier = Modifier.contentDescription(R.string.AccessibilityId_create_group),
+                    modifier = Modifier.contentDescription(R.string.AccessibilityId_groupCreate),
                     onClick = delegate::onCreateGroupSelected
                 )
                 Divider(startIndent = LocalDimensions.current.dividerIndent)
                 ItemButton(
                     textId = R.string.communityJoin,
                     icon = R.drawable.ic_globe,
-                    modifier = Modifier.contentDescription(R.string.AccessibilityId_join_community),
+                    modifier = Modifier.contentDescription(R.string.AccessibilityId_communityJoin),
                     onClick = delegate::onJoinCommunitySelected
                 )
                 Divider(startIndent = LocalDimensions.current.dividerIndent)
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 3bfb478c48..7334ff61ba 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -166,7 +166,7 @@
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/newConversationButton"
-            android:contentDescription="@string/AccessibilityId_new_conversation_button"
+            android:contentDescription="@string/AccessibilityId_conversationsNew"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/activity_message_requests.xml b/app/src/main/res/layout/activity_message_requests.xml
index 0969d3859a..32e0e88044 100644
--- a/app/src/main/res/layout/activity_message_requests.xml
+++ b/app/src/main/res/layout/activity_message_requests.xml
@@ -39,7 +39,7 @@
             android:visibility="gone">
 
             <TextView
-                android:contentDescription="@string/AccessibilityId_empty_message_request_folder"
+                android:contentDescription="@string/AccessibilityId_messageRequestsNonePending"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/messageRequestsNonePending"
@@ -49,7 +49,7 @@
         </LinearLayout>
 
         <Button
-            android:contentDescription="@string/AccessibilityId_clear_all_message_requests"
+            android:contentDescription="@string/AccessibilityId_clearAll"
             android:id="@+id/clearAllMessageRequestsButton"
             style="@style/Widget.Session.Button.Common.DangerOutline"
             android:layout_width="196dp"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 50f4c4f709..336f29ce78 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -46,7 +46,7 @@
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
                     android:visibility="invisible"
-                    android:hint="@string/activity_settings_display_name_edit_text_hint"
+                    android:hint="@string/displayNameEnter"
                     android:imeOptions="actionDone"
                     android:inputType="textCapWords"
                     android:maxLines="1" />
diff --git a/app/src/main/res/layout/fragment_create_group.xml b/app/src/main/res/layout/fragment_create_group.xml
index e387684b4a..927ed1da34 100644
--- a/app/src/main/res/layout/fragment_create_group.xml
+++ b/app/src/main/res/layout/fragment_create_group.xml
@@ -105,7 +105,7 @@
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginVertical="@dimen/large_spacing"
-        android:contentDescription="@string/AccessibilityId_create_group"
+        android:contentDescription="@string/AccessibilityId_groupCreate"
         android:text="@string/create"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_conversation_home.xml b/app/src/main/res/layout/fragment_new_conversation_home.xml
deleted file mode 100644
index 0ed87cb9c0..0000000000
--- a/app/src/main/res/layout/fragment_new_conversation_home.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?conversation_menu_background_color">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraintLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/medium_spacing" >
-
-        <TextView
-            android:id="@+id/titleText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal|center_vertical"
-            android:paddingTop="@dimen/large_spacing"
-            android:paddingBottom="@dimen/very_large_spacing"
-            android:text="@string/conversationsNew"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/very_large_font_size"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/closeButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/small_spacing"
-            android:layout_marginStart="@dimen/large_spacing"
-            android:clickable="true"
-            android:contentDescription="@string/AccessibilityId_closeDialog"
-            android:focusable="true"
-            android:src="@drawable/ic_baseline_close_24"
-            android:background="?selectableItemBackgroundBorderless"
-            app:layout_constraintBottom_toTopOf="@id/title_divider"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/title_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="1dp"
-            android:background="?conversation_menu_border_color"
-            app:layout_constraintStart_toStartOf="@+id/titleText"
-            app:layout_constraintTop_toBottomOf="@+id/titleText" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toTopOf="@+id/createPrivateChatButton"
-            app:layout_constraintBottom_toBottomOf="@+id/joinCommunityButton"
-            android:background="?conversation_menu_cell_color"/>
-
-        <TextView
-            android:id="@+id/createPrivateChatButton"
-            android:contentDescription="@string/AccessibilityId_new_direct_message"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/setting_button_height"
-            android:drawablePadding="@dimen/large_spacing"
-            android:gravity="center_vertical"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:text="@string/messageNew"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/medium_font_size"
-            android:background="?selectableItemBackground"
-            app:drawableStartCompat="@drawable/ic_message"
-            app:layout_constraintBottom_toTopOf="@+id/new_message_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/title_divider" />
-
-        <View
-            android:id="@+id/new_message_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="@dimen/massive_spacing"
-            android:background="?conversation_menu_border_color"
-            app:layout_constraintStart_toStartOf="@+id/createPrivateChatButton"
-            app:layout_constraintTop_toBottomOf="@+id/createPrivateChatButton" />
-
-        <TextView
-            android:id="@+id/createClosedGroupButton"
-            android:contentDescription="@string/AccessibilityId_create_group"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/setting_button_height"
-            android:drawablePadding="@dimen/large_spacing"
-            android:gravity="center_vertical"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:text="@string/groupCreate"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/medium_font_size"
-            android:background="?selectableItemBackground"
-            app:drawableStartCompat="@drawable/ic_group"
-            app:layout_constraintBottom_toTopOf="@+id/create_group_divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/new_message_divider" />
-
-        <View
-            android:id="@+id/create_group_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginStart="@dimen/massive_spacing"
-            android:background="?conversation_menu_border_color"
-            app:layout_constraintStart_toStartOf="@+id/createClosedGroupButton"
-            app:layout_constraintTop_toBottomOf="@+id/createClosedGroupButton" />
-
-        <TextView
-            android:id="@+id/joinCommunityButton"
-            android:contentDescription="@string/AccessibilityId_join_community"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/setting_button_height"
-            android:drawablePadding="@dimen/large_spacing"
-            android:gravity="center_vertical"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:text="@string/communityJoin"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/medium_font_size"
-            android:background="?selectableItemBackground"
-            app:drawableStartCompat="@drawable/ic_globe"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/create_group_divider" />
-
-        <View
-            android:id="@+id/join_community_divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="1dp"
-            android:background="?conversation_menu_border_color"
-            app:layout_constraintStart_toStartOf="@+id/joinCommunityButton"
-            app:layout_constraintTop_toBottomOf="@+id/joinCommunityButton" />
-
-        <TextView
-            android:id="@+id/contactsText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingHorizontal="@dimen/large_spacing"
-            android:paddingTop="@dimen/medium_spacing"
-            android:paddingBottom="@dimen/small_spacing"
-            android:text="@string/contactContacts"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="@dimen/medium_font_size"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/join_community_divider" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/contactsRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/contactsText"
-            tools:itemCount="6"
-            tools:listitem="@layout/view_contact" />
-
-        <TextView
-            android:id="@+id/noContactsTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:text="@string/contactNone"
-            android:visibility="visible"
-            android:textSize="@dimen/small_font_size"
-            android:textColor="?android:textColorPrimary" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_message_request.xml b/app/src/main/res/layout/view_message_request.xml
index c85a91fbc9..3ab1f3aaee 100644
--- a/app/src/main/res/layout/view_message_request.xml
+++ b/app/src/main/res/layout/view_message_request.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:contentDescription="@string/AccessibilityId_message_request"
+    android:contentDescription="@string/AccessibilityId_messageRequestsNew"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/view_message_request_banner.xml b/app/src/main/res/layout/view_message_request_banner.xml
index 93e2568e7b..6c2cdb8b25 100644
--- a/app/src/main/res/layout/view_message_request_banner.xml
+++ b/app/src/main/res/layout/view_message_request_banner.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/conversation_unread_background"
-    android:contentDescription="@string/AccessibilityId_message_request_banner"
+    android:contentDescription="@string/AccessibilityId_sessionMessageRequests"
     android:gravity="center_vertical"
     android:orientation="horizontal"
     android:paddingStart="@dimen/accent_line_thickness"
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index be1ee1d803..9be3fdeeac 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -47,16 +47,15 @@
     <!--Settings Page -->
     <string name="AccessibilityId_conversationsBlockedContacts">Blocked contacts</string>
     <string name="AccessibilityId_shareAccountId">Account ID</string>
-    <string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
     <!--Message requests-->
-    <string name="AccessibilityId_clear_all_message_requests">Clear all</string>
-    <string name="AccessibilityId_empty_message_request_folder">No pending message requests</string>
-    <string name="AccessibilityId_message_request">Message request</string>
-    <string name="AccessibilityId_message_request_banner">Message requests banner</string>
+    <string name="AccessibilityId_clearAll">Clear all</string>
+    <string name="AccessibilityId_messageRequestsNonePending">No pending message requests</string>
+    <string name="AccessibilityId_messageRequestsNew">Message request</string>
+    <string name="AccessibilityId_sessionMessageRequests">Message requests banner</string>
     <!--New conversation pop up-->
-    <string name="AccessibilityId_create_group">Create group</string>
-    <string name="AccessibilityId_join_community">Join community button</string>
-    <string name="AccessibilityId_new_conversation_button">New conversation button</string>
+    <string name="AccessibilityId_groupCreate">Create group</string>
+    <string name="AccessibilityId_communityJoin">Join community button</string>
+    <string name="AccessibilityId_conversationsNew">New conversation button</string>
     <string name="AccessibilityId_new_direct_message">New direct message</string>
     <!-- Join community pop up -->
     <string name="AccessibilityId_community_input_box">Community input</string>