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 18d2c8db37..09b2ecd7ae 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_recoveryPasswordRestore),
+                contentDescription = stringResource(R.string.AccessibilityId_recoveryPasswordEnter),
                 placeholder = stringResource(R.string.recoveryPasswordEnter),
                 onChange = onChange,
                 onContinue = onContinue,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
index 0747c57502..1481695a3a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/pickname/PickDisplayName.kt
@@ -66,7 +66,7 @@ internal fun PickDisplayName(
             SessionOutlinedTextField(
                 text = state.displayName,
                 modifier = Modifier.fillMaxWidth(),
-                contentDescription = stringResource(R.string.AccessibilityId_enter_display_name),
+                contentDescription = stringResource(R.string.AccessibilityId_displayNameEnter),
                 placeholder = stringResource(R.string.displayNameEnter),
                 onChange = onChange,
                 onContinue = onContinue,
diff --git a/app/src/main/res/layout-sw400dp/activity_display_name.xml b/app/src/main/res/layout-sw400dp/activity_display_name.xml
index 5456791d32..e6d94a5e26 100644
--- a/app/src/main/res/layout-sw400dp/activity_display_name.xml
+++ b/app/src/main/res/layout-sw400dp/activity_display_name.xml
@@ -33,7 +33,7 @@
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/displayNameEditText"
-        android:contentDescription="@string/AccessibilityId_enter_display_name"
+        android:contentDescription="@string/AccessibilityId_displayNameEnter"
         android:layout_width="match_parent"
         android:layout_height="64dp"
         android:layout_marginLeft="@dimen/very_large_spacing"
diff --git a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml b/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
deleted file mode 100644
index 8a6b57d34c..0000000000
--- a/app/src/main/res/layout-sw400dp/activity_pn_mode.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/contentView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/very_large_font_size"
-            android:textStyle="bold"
-            android:textColor="?android:textColorPrimary"
-            android:contentDescription="@string/AccessibilityId_message_notifications"
-            android:text="@string/notificationsMessage" />
-
-        <TextView
-            android:id="@+id/messageNotificationExplanation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/large_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="?android:textColorPrimary"
-            android:text="@string/onboardingMessageNotificationExplanation" />
-
-        <org.thoughtcrime.securesms.util.PNModeView
-            android:contentDescription="@string/AccessibilityId_fast_mode_notifications_option"
-            android:id="@+id/fcmOptionView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/large_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="bold"
-                android:text="@string/notificationsFastMode" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:text="@string/notificationsFastModeDescriptionAndroid" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/small_font_size"
-                android:textColor="?colorAccent"
-                android:textStyle="bold"
-                android:text="@string/recommended" />
-
-        </org.thoughtcrime.securesms.util.PNModeView>
-
-        <org.thoughtcrime.securesms.util.PNModeView
-            android:contentDescription="@string/AccessibilityId_slow_mode_notifications_option"
-            android:id="@+id/backgroundPollingOptionView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="bold"
-                android:text="@string/notificationsSlowMode"
-                />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:text="@string/notificationsSlowModeDescription" />
-
-        </org.thoughtcrime.securesms.util.PNModeView>
-
-        <Button
-            style="@style/Widget.Session.Button.Common.ProminentFilled"
-            android:id="@+id/registerButton"
-            android:contentDescription="@string/AccessibilityId_continue_message_notifications"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/medium_button_height"
-            android:layout_marginLeft="@dimen/massive_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:layout_marginRight="@dimen/massive_spacing"
-            android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
-            android:text="@string/theContinue" />
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml b/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
deleted file mode 100644
index b38421a2a0..0000000000
--- a/app/src/main/res/layout-sw400dp/fragment_recovery_phrase.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/very_large_font_size"
-        android:textStyle="bold"
-        android:textColor="?android:textColorPrimary"
-        android:text="@string/sessionRecoveryPassword" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="7dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="?android:textColorPrimary"
-        android:text="@string/recoveryPasswordExplanation" />
-
-    <EditText
-        style="@style/SessionEditText"
-        android:id="@+id/mnemonicEditText"
-        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="12dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:paddingTop="0dp"
-        android:paddingBottom="0dp"
-        android:gravity="center_vertical"
-        android:inputType="textMultiLine"
-        android:maxLines="3"
-        android:hint="@string/recoveryPasswordEnter" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
-        android:id="@+id/continueButton"
-        android:contentDescription="@string/AccessibilityId_continue"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="@string/theContinue" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_display_name.xml b/app/src/main/res/layout/activity_display_name.xml
index 78ebdfec45..cf516d88dd 100644
--- a/app/src/main/res/layout/activity_display_name.xml
+++ b/app/src/main/res/layout/activity_display_name.xml
@@ -32,7 +32,7 @@
 
     <EditText
         style="@style/SmallSessionEditText"
-        android:contentDescription="@string/AccessibilityId_enter_display_name"
+        android:contentDescription="@string/AccessibilityId_displayNameEnter"
         android:id="@+id/displayNameEditText"
         android:layout_width="match_parent"
         android:layout_height="64dp"
diff --git a/app/src/main/res/layout/activity_pn_mode.xml b/app/src/main/res/layout/activity_pn_mode.xml
deleted file mode 100644
index 154e8481c0..0000000000
--- a/app/src/main/res/layout/activity_pn_mode.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <LinearLayout
-        android:id="@+id/contentView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/very_large_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/large_font_size"
-            android:textStyle="bold"
-            android:textColor="?android:textColorPrimary"
-            android:contentDescription="@string/AccessibilityId_message_notifications"
-            android:text="@string/notificationsMessage" />
-
-        <TextView
-            android:id="@+id/messageNotificationExplanation"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="?android:textColorPrimary"
-            android:text="@string/onboardingMessageNotificationExplanation" />
-
-        <org.thoughtcrime.securesms.util.PNModeView
-            android:contentDescription="@string/AccessibilityId_fast_mode_notifications_option"
-            android:id="@+id/fcmOptionView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@color/pn_option_border">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="bold"
-                android:text="@string/notificationsFastMode" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:text="@string/notificationsFastModeDescriptionAndroid" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/small_font_size"
-                android:textColor="?colorAccent"
-                android:textStyle="bold"
-                android:text="@string/recommended" />
-
-        </org.thoughtcrime.securesms.util.PNModeView>
-
-        <org.thoughtcrime.securesms.util.PNModeView
-            android:contentDescription="@string/AccessibilityId_slow_mode_notifications_option"
-            android:id="@+id/backgroundPollingOptionView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/very_large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/very_large_spacing"
-            android:padding="12dp"
-            android:orientation="vertical"
-            android:background="@drawable/pn_option_background">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/medium_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:textStyle="bold"
-                android:text="@string/notificationsSlowMode" />
-
-            <TextView
-                android:id="@+id/slowModeDescriptionTV"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/very_small_font_size"
-                android:textColor="?android:textColorPrimary"
-                android:text="@string/notificationsSlowModeDescription" />
-
-        </org.thoughtcrime.securesms.util.PNModeView>
-
-        <Button
-            style="@style/Widget.Session.Button.Common.ProminentFilled"
-            android:contentDescription="@string/AccessibilityId_continue_message_notifications"
-            android:id="@+id/registerButton"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/medium_button_height"
-            android:layout_marginLeft="@dimen/massive_spacing"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="@dimen/massive_spacing"
-            android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
-            android:text="@string/theContinue" />
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index eff3b159cd..caf4fbdaf3 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
-                    android:contentDescription="@string/AccessibilityId_enter_display_name"
+                    android:contentDescription="@string/AccessibilityId_displayNameEnter"
                     android:paddingTop="12dp"
                     android:paddingBottom="12dp"
                     android:visibility="invisible"
diff --git a/app/src/main/res/layout/fragment_recovery_phrase.xml b/app/src/main/res/layout/fragment_recovery_phrase.xml
deleted file mode 100644
index 37e38aa0e9..0000000000
--- a/app/src/main/res/layout/fragment_recovery_phrase.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/large_font_size"
-        android:textStyle="bold"
-        android:textColor="?android:textColorPrimary"
-        android:text="@string/sessionRecoveryPassword" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="4dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/small_font_size"
-        android:textColor="?android:textColorPrimary"
-        android:text="@string/recoveryPasswordExplanation" />
-
-    <EditText
-        style="@style/SmallSessionEditText"
-        android:id="@+id/mnemonicEditText"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginHorizontal="@dimen/very_large_spacing"
-        android:layout_marginTop="10dp"
-        android:contentDescription="@string/AccessibilityId_enter_your_recovery_phrase"
-        android:paddingTop="0dp"
-        android:paddingBottom="0dp"
-        android:gravity="center_vertical"
-        android:inputType="textMultiLine"
-        android:maxLines="3"
-        android:hint="@string/recoveryPasswordEnter" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
-        android:id="@+id/continueButton"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginHorizontal="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:contentDescription="@string/AccessibilityId_link_device"
-        android:text="@string/theContinue" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/content-descriptions/src/main/res/values/strings.xml b/content-descriptions/src/main/res/values/strings.xml
index aa96295571..4243f5cbf2 100644
--- a/content-descriptions/src/main/res/values/strings.xml
+++ b/content-descriptions/src/main/res/values/strings.xml
@@ -28,22 +28,14 @@
     <string name="AccessibilityId_messageNewDescriptionMobile">Help desk link</string>
     <string name="AccessibilityId_sessionInviteAFriend">Invite friend button</string>
     <!-- Landing Page -->
-    <string name="AccessibilityId_create_session_id">Create session ID</string>
-    <string name="AccessibilityId_link_a_device">Link a device</string>
-    <string name="AccessibilityId_link_device">Link Device</string>
-    <string name="AccessibilityId_restore_your_session">Restore Your Session</string>
     <!-- Session ID Page-->
     <string name="AccessibilityId_continue">Continue</string>
-    <string name="AccessibilityId_recovery_phrase_reminder">Recovery phrase reminder</string>
-    <string name="AccessibilityId_session_id">Session ID</string>
     <!-- Recovery phrase input -->
-    <string name="AccessibilityId_copy_session_id">Copy Session ID</string>
     <!--Restore by seed page-->
-    <string name="AccessibilityId_enter_your_recovery_phrase">Enter your recovery phrase</string>
     <!--Create Display Name    -->
-    <string name="AccessibilityId_enter_display_name">Enter display name</string>
+    <string name="AccessibilityId_displayNameEnter">Enter display name</string>
     <!--Message Notifications Options-->
-    <string name="AccessibilityId_continue_message_notifications">Continue with settings</string>
+    <string name="AccessibilityId_notificationsMessageContinue">Continue with settings</string>
     <string name="AccessibilityId_fast_mode_notifications_option">Fast mode notifications option</string>
     <string name="AccessibilityId_message_notifications">Message Notifications</string>
     <string name="AccessibilityId_slow_mode_notifications_option">Slow mode notifications option</string>